Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ICS-3: Remove Crossing Hellos #786

Merged
merged 4 commits into from
Jul 13, 2022
Merged

ICS-3: Remove Crossing Hellos #786

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3748261
always generate new identifier to remove crossing hellos logic
AdityaSripal Jul 7, 2022
10c575e
update ack
AdityaSripal Jul 7, 2022
6e147ab
make sure ACK is in previous state INIT and version from counterparty…
AdityaSripal Jul 7, 2022
eb7027b
Update spec/core/ics-003-connection-semantics/README.md
AdityaSripal Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions spec/core/ics-003-connection-semantics/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ function connOpenInit(

```typescript
function connOpenTry(
previousIdentifier: Identifier,
counterpartyConnectionIdentifier: Identifier,
counterpartyPrefix: CommitmentPrefix,
counterpartyClientIdentifier: Identifier,
Expand All @@ -350,33 +349,23 @@ function connOpenTry(
proofConsensus: CommitmentProof,
proofHeight: Height,
consensusHeight: Height) {
if (previousIdentifier !== "") {
previous = provableStore.get(connectionPath(identifier))
abortTransactionUnless(
(previous !== null) &&
(previous.state === INIT &&
previous.counterpartyConnectionIdentifier === "" &&
previous.counterpartyPrefix === counterpartyPrefix &&
previous.clientIdentifier === clientIdentifier &&
previous.counterpartyClientIdentifier === counterpartyClientIdentifier &&
previous.delayPeriodTime === delayPeriodTime
previous.delayPeriodBlocks === delayPeriodBlocks))
identifier = previousIdentifier
} else {
// generate a new identifier if the passed identifier was the sentinel empty-string
identifier = generateIdentifier()
}
// generate a new identifier if the passed identifier was the sentinel empty-string
AdityaSripal marked this conversation as resolved.
Show resolved Hide resolved
identifier = generateIdentifier()

abortTransactionUnless(consensusHeight < getCurrentHeight())
expectedConsensusState = getConsensusState(consensusHeight)
expected = ConnectionEnd{INIT, "", getCommitmentPrefix(), counterpartyClientIdentifier,
clientIdentifier, counterpartyVersions, delayPeriodTime, delayPeriodBlocks}
versionsIntersection = intersection(counterpartyVersions, previous !== null ? previous.version : getCompatibleVersions())

versionsIntersection = intersection(counterpartyVersions, getCompatibleVersions())
version = pickVersion(versionsIntersection) // throws if there is no intersection

connection = ConnectionEnd{TRYOPEN, counterpartyConnectionIdentifier, counterpartyPrefix,
clientIdentifier, counterpartyClientIdentifier, version, delayPeriodTime, delayPeriodBlocks}
abortTransactionUnless(connection.verifyConnectionState(proofHeight, proofInit, counterpartyConnectionIdentifier, expected))
abortTransactionUnless(connection.verifyClientConsensusState(
proofHeight, proofConsensus, counterpartyClientIdentifier, consensusHeight, expectedConsensusState))

provableStore.set(connectionPath(identifier), connection)
addConnectionToClient(clientIdentifier, identifier)
}
Expand All @@ -395,9 +384,7 @@ function connOpenAck(
consensusHeight: Height) {
abortTransactionUnless(consensusHeight < getCurrentHeight())
connection = provableStore.get(connectionPath(identifier))
abortTransactionUnless(
(connection.state === INIT && connection.version.indexOf(version) !== -1)
|| (connection.state === TRYOPEN && connection.version === version))
abortTransactionUnless((connection.state === TRYOPEN && connection.version === version))
colin-axner marked this conversation as resolved.
Show resolved Hide resolved
expectedConsensusState = getConsensusState(consensusHeight)
expected = ConnectionEnd{TRYOPEN, identifier, getCommitmentPrefix(),
connection.counterpartyClientIdentifier, connection.clientIdentifier,
Expand Down