Update ICS 2, 3, 7 for hybrid delay period

spec/client/ics-007-tendermint-client/README.md

@@ -217,6 +217,7 @@ function checkValidityAndUpdateState(
     consensusState = ConsensusState{header.timestamp, header.validatorSet, header.commitmentRoot}
     set("clients/{identifier}/consensusStates/{header.height}", consensusState)
     set("clients/{identifier}/processedTimes/{header.height}", currentTimestamp())
+    set("clients/{identifier}/processedHeights/{header.height}", currentHeight())
     // save the client
     set("clients/{identifier}", clientState)
 }
@@ -348,7 +349,8 @@ function verifyChannelState(
 function verifyPacketData(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -362,8 +364,12 @@ function verifyPacketData(
     assert(clientState.frozenHeight === null || clientState.frozenHeight > height)
     // fetch the processed time
     processedTime = get("clients/{identifier}/processedTimes/{height}")
+    // fetch the processed height
+    processedHeight = get("clients/{identifier}/processedHeights/{height}")
     // assert that enough time has elapsed
-    assert(currentTimestamp() >= processedTime + delayPeriod)
+    assert(currentTimestamp() >= processedTime + delayPeriodTime)
+    // assert that enough blocks have elapsed
+    assert(currentHeight() >= processedHeight + delayPeriodBlocks)
     // fetch the previously verified commitment root & verify membership
     root = get("clients/{identifier}/consensusStates/{height}")
     // verify that the provided commitment has been stored
@@ -373,7 +379,8 @@ function verifyPacketData(
 function verifyPacketAcknowledgement(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -387,8 +394,12 @@ function verifyPacketAcknowledgement(
     assert(clientState.frozenHeight === null || clientState.frozenHeight > height)
     // fetch the processed time
     processedTime = get("clients/{identifier}/processedTimes/{height}")
+    // fetch the processed height
+    processedHeight = get("clients/{identifier}/processedHeights/{height}")
     // assert that enough time has elapsed
-    assert(currentTimestamp() >= processedTime + delayPeriod)
+    assert(currentTimestamp() >= processedTime + delayPeriodTime)
+    // assert that enough blocks have elapsed
+    assert(currentHeight() >= processedHeight + delayPeriodBlocks)
     // fetch the previously verified commitment root & verify membership
     root = get("clients/{identifier}/consensusStates/{height}")
     // verify that the provided acknowledgement has been stored
@@ -398,7 +409,8 @@ function verifyPacketAcknowledgement(
 function verifyPacketReceiptAbsence(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -411,8 +423,12 @@ function verifyPacketReceiptAbsence(
     assert(clientState.frozenHeight === null || clientState.frozenHeight > height)
     // fetch the processed time
     processedTime = get("clients/{identifier}/processedTimes/{height}")
+    // fetch the processed height
+    processedHeight = get("clients/{identifier}/processedHeights/{height}")
     // assert that enough time has elapsed
-    assert(currentTimestamp() >= processedTime + delayPeriod)
+    assert(currentTimestamp() >= processedTime + delayPeriodTime)
+    // assert that enough blocks have elapsed
+    assert(currentHeight() >= processedHeight + delayPeriodBlocks)
     // fetch the previously verified commitment root & verify membership
     root = get("clients/{identifier}/consensusStates/{height}")
     // verify that no acknowledgement has been stored
@@ -422,7 +438,8 @@ function verifyPacketReceiptAbsence(
 function verifyNextSequenceRecv(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -435,8 +452,12 @@ function verifyNextSequenceRecv(
     assert(clientState.frozenHeight === null || clientState.frozenHeight > height)
     // fetch the processed time
     processedTime = get("clients/{identifier}/processedTimes/{height}")
+    // fetch the processed height
+    processedHeight = get("clients/{identifier}/processedHeights/{height}")
     // assert that enough time has elapsed
-    assert(currentTimestamp() >= processedTime + delayPeriod)
+    assert(currentTimestamp() >= processedTime + delayPeriodTime)
+    // assert that enough blocks have elapsed
+    assert(currentHeight() >= processedHeight + delayPeriodBlocks)
     // fetch the previously verified commitment root & verify membership
     root = get("clients/{identifier}/consensusStates/{height}")
     // verify that the nextSequenceRecv is as claimed

spec/core/ics-002-client-semantics/README.md

@@ -318,7 +318,8 @@ at a particular finalised height (necessarily associated with a particular commi
 Client types must define functions to authenticate internal state of the state machine which the client tracks.
 Internal implementation details may differ (for example, a loopback client could simply read directly from the state and require no proofs).
 
-- The `delayPeriod` is passed to packet-related verification functions in order to allow packets to specify a period which must pass after a header is verified before the packet is allowed to be processed.
+- The `delayPeriodTime` is passed to packet-related verification functions in order to allow packets to specify a period of time which must pass after a header is verified before the packet is allowed to be processed.
+- The `delayPeriodBlocks` is passed to packet-related verification functions in order to allow packets to specify a period of blocks which must pass after a header is verified before the packet is allowed to be processed.
 
 ##### Required functions
 
@@ -368,7 +369,8 @@ type verifyChannelState = (
 type verifyPacketData = (
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -384,7 +386,8 @@ type verifyPacketData = (
 type verifyPacketAcknowledgement = (
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -400,7 +403,8 @@ type verifyPacketAcknowledgement = (
 type verifyPacketReceiptAbsence = (
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -415,7 +419,8 @@ type verifyPacketReceiptAbsence = (
 type verifyNextSequenceRecv = (
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -776,7 +781,8 @@ function verifyChannelState(
 function verifyPacketData(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -791,7 +797,8 @@ function verifyPacketData(
 function verifyPacketAcknowledgement(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,
@@ -807,7 +814,8 @@ function verifyPacketReceiptAbsence(
   clientState: ClientState,
   height: Height,
   prefix: CommitmentPrefix,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   proof: CommitmentProof,
   portIdentifier: Identifier,
   channelIdentifier: Identifier,
@@ -820,7 +828,8 @@ function verifyPacketReceiptAbsence(
 function verifyNextSequenceRecv(
   clientState: ClientState,
   height: Height,
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   prefix: CommitmentPrefix,
   proof: CommitmentProof,
   portIdentifier: Identifier,

spec/core/ics-003-connection-semantics/README.md

@@ -82,7 +82,8 @@ interface ConnectionEnd {
   clientIdentifier: Identifier
   counterpartyClientIdentifier: Identifier
   version: string | []string
-  delayPeriod: uint64
+  delayPeriodTime: uint64
+  delayPeriodBlocks: uint64
 }
 ```
 
@@ -95,7 +96,8 @@ interface ConnectionEnd {
 - The `counterpartyClientIdentifier` field identifies the client on the counterparty chain associated with this connection.
 - The `version` field is an opaque string which can be utilised to determine encodings or protocols for channels or packets utilising this connection.
   If not specified, a default `version` of `""` should be used.
-- The `delayPeriod` indicates a period that must elapse after validation of a header before a packet, acknowledgement, proof of receipt, or timeout can be processed.
+- The `delayPeriodTime` indicates a period in time that must elapse after validation of a header before a packet, acknowledgement, proof of receipt, or timeout can be processed.
+- The `delayPeriodBlocks` indicates a period in blocks that must elapse after validation of a header before a packet, acknowledgement, proof of receipt, or timeout can be processed.
 
 ### Store paths
 
@@ -175,7 +177,7 @@ function verifyPacketData(
   sequence: Height,
   data: bytes) {
     client = queryClient(connection.clientIdentifier)
-    return client.verifyPacketData(connection, height, connection.delayPeriod, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, data)
+    return client.verifyPacketData(connection, height, connection.delayPeriodTime, connection.delayPeriodBlocks, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, data)
 }
 
 function verifyPacketAcknowledgement(
@@ -187,7 +189,7 @@ function verifyPacketAcknowledgement(
   sequence: uint64,
   acknowledgement: bytes) {
     client = queryClient(connection.clientIdentifier)
-    return client.verifyPacketAcknowledgement(connection, height, connection.delayPeriod, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, acknowledgement)
+    return client.verifyPacketAcknowledgement(connection, height, connection.delayPeriodTime, connection.delayPeriodBlocks, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, acknowledgement)
 }
 
 function verifyPacketReceiptAbsence(
@@ -198,7 +200,7 @@ function verifyPacketReceiptAbsence(
   channelIdentifier: Identifier,
   sequence: uint64) {
     client = queryClient(connection.clientIdentifier)
-    return client.verifyPacketReceiptAbsence(connection, height, connection.delayPeriod, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier)
+    return client.verifyPacketReceiptAbsence(connection, height, connection.delayPeriodTime, connection.delayPeriodBlocks, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier)
 }
 
 function verifyNextSequenceRecv(
@@ -209,7 +211,7 @@ function verifyNextSequenceRecv(
   channelIdentifier: Identifier,
   nextSequenceRecv: uint64) {
     client = queryClient(connection.clientIdentifier)
-    return client.verifyNextSequenceRecv(connection, height, connection.delayPeriod, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, nextSequenceRecv)
+    return client.verifyNextSequenceRecv(connection, height, connection.delayPeriodTime, connection.delayPeriodBlocks, connection.counterpartyPrefix, proof, portIdentifier, channelIdentifier, nextSequenceRecv)
 }
 
 function getTimestampAtHeight(
@@ -299,7 +301,8 @@ function connOpenInit(
   clientIdentifier: Identifier,
   counterpartyClientIdentifier: Identifier,
   version: string,
-  delayPeriod: uint64) {
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64) {
     identifier = generateIdentifier()
     abortTransactionUnless(provableStore.get(connectionPath(identifier)) == null)
     state = INIT
@@ -311,7 +314,7 @@ function connOpenInit(
       versions = getCompatibleVersions()
     }
     connection = ConnectionEnd{state, "", counterpartyPrefix,
-      clientIdentifier, counterpartyClientIdentifier, versions, delayPeriod}
+      clientIdentifier, counterpartyClientIdentifier, versions, delayPeriodTime, delayPeriodBlocks}
     provableStore.set(connectionPath(identifier), connection)
     addConnectionToClient(clientIdentifier, identifier)
 }
@@ -327,7 +330,8 @@ function connOpenTry(
   counterpartyClientIdentifier: Identifier,
   clientIdentifier: Identifier,
   counterpartyVersions: string[],
-  delayPeriod: uint64,
+  delayPeriodTime: uint64,
+  delayPeriodBlocks: uint64,
   proofInit: CommitmentProof,
   proofConsensus: CommitmentProof,
   proofHeight: Height,
@@ -341,7 +345,8 @@ function connOpenTry(
          previous.counterpartyPrefix === counterpartyPrefix &&
          previous.clientIdentifier === clientIdentifier &&
          previous.counterpartyClientIdentifier === counterpartyClientIdentifier &&
-         previous.delayPeriod === delayPeriod))
+         previous.delayPeriodTime === delayPeriodTime
+         previous.delayPeriodBlocks === delayPeriodBlocks))
       identifier = previousIdentifier
     } else {
       // generate a new identifier if the passed identifier was the sentinel empty-string
@@ -350,11 +355,11 @@ function connOpenTry(
     abortTransactionUnless(consensusHeight < getCurrentHeight())
     expectedConsensusState = getConsensusState(consensusHeight)
     expected = ConnectionEnd{INIT, "", getCommitmentPrefix(), counterpartyClientIdentifier,
-                             clientIdentifier, counterpartyVersions, delayPeriod}
+                             clientIdentifier, counterpartyVersions, delayPeriodTime, delayPeriodBlocks}
     versionsIntersection = intersection(counterpartyVersions, previous !== null ? previous.version : getCompatibleVersions())
     version = pickVersion(versionsIntersection) // throws if there is no intersection
     connection = ConnectionEnd{TRYOPEN, counterpartyConnectionIdentifier, counterpartyPrefix,
-                               clientIdentifier, counterpartyClientIdentifier, version, delayPeriod}
+                               clientIdentifier, counterpartyClientIdentifier, version, delayPeriodTime, delayPeriodBlocks}
     abortTransactionUnless(connection.verifyConnectionState(proofHeight, proofInit, counterpartyConnectionIdentifier, expected))
     abortTransactionUnless(connection.verifyClientConsensusState(
       proofHeight, proofConsensus, counterpartyClientIdentifier, consensusHeight, expectedConsensusState))
@@ -382,7 +387,7 @@ function connOpenAck(
     expectedConsensusState = getConsensusState(consensusHeight)
     expected = ConnectionEnd{TRYOPEN, identifier, getCommitmentPrefix(),
                              connection.counterpartyClientIdentifier, connection.clientIdentifier,
-                             version, connection.delayPeriod}
+                             version, connection.delayPeriodTime, connection.delayPeriodBlocks}
     abortTransactionUnless(connection.verifyConnectionState(proofHeight, proofTry, counterpartyIdentifier, expected))
     abortTransactionUnless(connection.verifyClientConsensusState(
       proofHeight, proofConsensus, connection.counterpartyClientIdentifier, consensusHeight, expectedConsensusState))
@@ -403,7 +408,7 @@ function connOpenConfirm(
     connection = provableStore.get(connectionPath(identifier))
     abortTransactionUnless(connection.state === TRYOPEN)
     expected = ConnectionEnd{OPEN, identifier, getCommitmentPrefix(), connection.counterpartyClientIdentifier,
-                             connection.clientIdentifier, connection.version, connection.delayPeriod}
+                             connection.clientIdentifier, connection.version, connection.delayPeriodTime, connection.delayPeriodBlocks}
     abortTransactionUnless(connection.verifyConnectionState(proofHeight, proofAck, connection.counterpartyConnectionIdentifier, expected))
     connection.state = OPEN
     provableStore.set(connectionPath(identifier), connection)