Merge branch 'main' into zygis/admin-only-pause

Author: Zygimantass

.env.example

@@ -10,6 +10,9 @@ PRIVATE_KEY="PRIVATE-KEY"
 # Optional address of the sp1 verifier contract to use (if not set, the contract will be deployed)
 # Can be set to "mock" to use the mock verifier
 VERIFIER=mock
+# Optional rust log level (used by the relayer), will use info by default
+# Set to "debug" to get more detailed logs from the relayer process
+RUST_LOG=info
 
 # URL of the Tendermint RPC node
 TENDERMINT_RPC_URL=http://public-celestia-mocha4-consensus.numia.xyz/

.gitignore

@@ -22,6 +22,7 @@ broadcast/*/31337/
 # ide files
 .idea/
 *.iml
+CLAUDE.md
 
 # Rust
 target
@@ -32,3 +33,4 @@ bacon.toml
 # Config files and test artifacts
 programs/relayer/config.json
 scripts/genesis.json
+network_params.yaml

Cargo.lock

@@ -190,10 +190,10 @@ The following benchmarks are for a single packet transfer without aggregation.
 | **Contract** | **Method** | **Description** | **Gas (groth16)** | **Gas (plonk)** |
 |:---:|:---:|:---:|:---:|:---:|
 | `ICS26Router.sol` | `sendPacket` | Initiating an IBC transfer with an `ERC20`. | ~165,000 | ~165,000 |
-| `ICS26Router.sol` | `recvPacket` | Receiving _back_ an `ERC20` token. | ~518,643 | ~601,729 |
-| `ICS26Router.sol` | `recvPacket` | Receiving a _new_ Cosmos token for the first time. (Deploying an `ERC20` contract) | ~1,087,456 | ~1,171,586 |
-| `ICS26Router.sol` | `ackPacket` | Acknowledging an ICS20 packet. | ~393,398 | ~477,221 |
-| `ICS26Router.sol` | `timeoutPacket` | Timing out an ICS20 packet | ~466,007 | ~549,322 |
+| `ICS26Router.sol` | `recvPacket` | Receiving _back_ an `ERC20` token. | ~518,340 | ~602,020 |
+| `ICS26Router.sol` | `recvPacket` | Receiving a _new_ Cosmos token for the first time. (Deploying an `ERC20` contract) | ~1,087,699 | ~1,171,433 |
+| `ICS26Router.sol` | `ackPacket` | Acknowledging an ICS20 packet. | ~392,851 | ~476,578 |
+| `ICS26Router.sol` | `timeoutPacket` | Timing out an ICS20 packet | ~466,083 | ~550,208 |
 
 ### Aggregated Packet Benchmarks
 
@@ -202,8 +202,8 @@ Since there is no meaningful difference in gas costs between plonk and groth16 i
 
 | **ICS26Router Method** | **Description** | **Avg Gas (25 packets)** | **Avg Gas (50 packets)** | **Calldata size (25 packets)** | **Calldata size (50 packets)** |
 |:---:|:---:|:---:|:---:|:---:|:---:|
-| `multicall/recvPacket` | Receiving _back_ an `ERC20` token. | ~178,272 | ~165,240 | ~51,172B | ~100,772B |
-| `multicall/ackPacket` | Acknowledging an ICS20 packet. | ~92,269 | ~86,564 | ~53,572B | ~105,572B |
+| `multicall/recvPacket` | Receiving _back_ an `ERC20` token. | ~178,487 | ~172,258 | ~51,172B | ~100,772B |
+| `multicall/ackPacket` | Acknowledging an ICS20 packet. | ~91,722 | ~86,018 | ~53,572B | ~105,572B |
 
 Note: These gas benchmarks are with Groth16.
 

README.md

@@ -141,13 +141,13 @@
             "components": [
               {
                 "name": "revisionNumber",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               },
               {
                 "name": "revisionHeight",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               }
             ]
           }
@@ -901,13 +901,13 @@
             "components": [
               {
                 "name": "revisionNumber",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               },
               {
                 "name": "revisionHeight",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               }
             ]
           }
@@ -1203,13 +1203,13 @@
             "components": [
               {
                 "name": "revisionNumber",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               },
               {
                 "name": "revisionHeight",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               }
             ]
           }

abi/ICS26Router.json

@@ -152,13 +152,13 @@
         "components": [
           {
             "name": "revisionNumber",
-            "type": "uint32",
-            "internalType": "uint32"
+            "type": "uint64",
+            "internalType": "uint64"
           },
           {
             "name": "revisionHeight",
-            "type": "uint32",
-            "internalType": "uint32"
+            "type": "uint64",
+            "internalType": "uint64"
           }
         ]
       },
@@ -204,8 +204,8 @@
     "inputs": [
       {
         "name": "revisionHeight",
-        "type": "uint32",
-        "internalType": "uint32"
+        "type": "uint64",
+        "internalType": "uint64"
       }
     ],
     "outputs": [
@@ -302,13 +302,13 @@
             "components": [
               {
                 "name": "revisionNumber",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               },
               {
                 "name": "revisionHeight",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               }
             ]
           },
@@ -355,13 +355,13 @@
             "components": [
               {
                 "name": "revisionNumber",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               },
               {
                 "name": "revisionHeight",
-                "type": "uint32",
-                "internalType": "uint32"
+                "type": "uint64",
+                "internalType": "uint64"
               }
             ]
           },

abi/SP1ICS07Tendermint.json

@@ -33,5 +33,5 @@ interface ISP1ICS07Tendermint {
     /// @notice Returns the consensus state keccak256 hash at the given revision height.
     /// @param revisionHeight The revision height.
     /// @return The consensus state at the given revision height.
-    function getConsensusStateHash(uint32 revisionHeight) external view returns (bytes32);
+    function getConsensusStateHash(uint64 revisionHeight) external view returns (bytes32);
 }

abigen/ics26router/contract.go

@@ -41,7 +41,7 @@ contract SP1ICS07Tendermint is ISP1ICS07TendermintErrors, ISP1ICS07Tendermint, I
     IICS07TendermintMsgs.ClientState public clientState;
     /// @notice The mapping from height to consensus state keccak256 hashes.
     /// @dev Revision number need not be keyed as it is not allowed to change.
-    mapping(uint32 height => bytes32 hash) private _consensusStateHashes;
+    mapping(uint64 height => bytes32 hash) private _consensusStateHashes;
 
     /// @inheritdoc ISP1ICS07Tendermint
     uint16 public constant ALLOWED_SP1_CLOCK_DRIFT = 30 minutes;
@@ -85,7 +85,7 @@ contract SP1ICS07Tendermint is ISP1ICS07TendermintErrors, ISP1ICS07Tendermint, I
     }
 
     /// @inheritdoc ISP1ICS07Tendermint
-    function getConsensusStateHash(uint32 revisionHeight) public view returns (bytes32) {
+    function getConsensusStateHash(uint64 revisionHeight) public view returns (bytes32) {
         bytes32 hash = _consensusStateHashes[revisionHeight];
         require(hash != 0, ConsensusStateNotFound());
         return hash;
@@ -369,7 +369,7 @@ contract SP1ICS07Tendermint is ISP1ICS07TendermintErrors, ISP1ICS07Tendermint, I
     /// @param trustedConsensusState The trusted consensus state
     function _validateMembershipOutput(
         bytes32 outputCommitmentRoot,
-        uint32 proofHeight,
+        uint64 proofHeight,
         IICS07TendermintMsgs.ConsensusState memory trustedConsensusState
     )
         private
@@ -511,7 +511,7 @@ contract SP1ICS07Tendermint is ISP1ICS07TendermintErrors, ISP1ICS07Tendermint, I
     /// @param timestamp The timestamp of the trusted consensus state.
     /// @dev WARNING: Transient store is not reverted even if a message within a transaction reverts.
     /// @dev WARNING: This function must be called after all proof and validation checks.
-    function _cacheKvPairs(uint32 proofHeight, IMembershipMsgs.KVPair[] memory kvPairs, uint256 timestamp) private {
+    function _cacheKvPairs(uint64 proofHeight, IMembershipMsgs.KVPair[] memory kvPairs, uint256 timestamp) private {
         for (uint256 i = 0; i < kvPairs.length; i++) {
             bytes32 kvPairHash = keccak256(abi.encode(proofHeight, kvPairs[i]));
             kvPairHash.asUint256().tstore(timestamp);
@@ -523,7 +523,7 @@ contract SP1ICS07Tendermint is ISP1ICS07TendermintErrors, ISP1ICS07Tendermint, I
     /// @param kvPair The key-value pair.
     /// @return The timestamp of the cached key-value pair.
     function _getCachedKvPair(
-        uint32 proofHeight,
+        uint64 proofHeight,
         IMembershipMsgs.KVPair memory kvPair
     )
         private

abigen/sp1ics07tendermint/contract.go

@@ -17,7 +17,7 @@ interface IICS02ClientMsgs {
     /// @param revisionNumber The revision number of the counterparty chain
     /// @param revisionHeight The height of the counterparty chain
     struct Height {
-        uint32 revisionNumber;
-        uint32 revisionHeight;
+        uint64 revisionNumber;
+        uint64 revisionHeight;
     }
 }

contracts/light-clients/ISP1ICS07Tendermint.sol

@@ -22,7 +22,7 @@ import (
 
 const (
 	// ethereumPackageId is the package ID used by Kurtosis to find the Ethereum package we use for the testnet
-	ethereumPackageId = "github.com/ethpandaops/ethereum-package@4.4.0"
+	ethereumPackageId = "github.com/ethpandaops/ethereum-package@4.5.0"
 
 	faucetPrivateKey = "0x04b9f63ecf84210c5366c66d68fa1f5da1fa4f634fad6dfc86178e4d79ff9e59"
 )
@@ -32,14 +32,15 @@ var (
 		Participants: []kurtosisParticipant{
 			{
 				CLType:     "lodestar",
-				CLImage:    "chainsafe/lodestar:v1.24.0",
+				CLImage:    "ethpandaops/lodestar:devnet-5-1c2b5ed",
 				ELType:     "geth",
-				ELImage:    "ethereum/client-go:v1.14.6",
+				ELImage:    "ethpandaops/geth:prague-devnet-5-a193537",
 				ELLogLevel: "info",
 			},
 		},
 		NetworkParams: kurtosisNetworkConfigParams{
-			Preset: "minimal",
+			Preset:           "minimal",
+			ElectraForkEpoch: 1,
 		},
 		WaitForFinalization: true,
 	}
@@ -72,7 +73,8 @@ type kurtosisParticipant struct {
 }
 
 type kurtosisNetworkConfigParams struct {
-	Preset string `json:"preset"`
+	Preset           string `json:"preset"`
+	ElectraForkEpoch uint64 `json:"electra_fork_epoch"`
 }
 
 // SpinUpKurtosisPoS spins up a kurtosis enclave with Etheruem PoS testnet using github.com/ethpandaops/ethereum-package
@@ -136,7 +138,7 @@ func SpinUpKurtosisPoS(ctx context.Context) (EthKurtosisChain, error) {
 
 	// Wait for the chain to finalize
 	beaconAPIClient := ethereum.NewBeaconAPIClient(beaconRPC)
-	err = testutil.WaitForCondition(10*time.Minute, 5*time.Second, func() (bool, error) {
+	err = testutil.WaitForCondition(30*time.Minute, 5*time.Second, func() (bool, error) {
 		finalizedBlocksResp, err := beaconAPIClient.GetFinalizedBlocks()
 		fmt.Printf("Waiting for chain to finalize, finalizedBlockResp: %+v, err: %s\n", finalizedBlocksResp, err)
 		if err != nil {

contracts/light-clients/SP1ICS07Tendermint.sol

@@ -20,15 +20,16 @@ import (
 	"github.com/cosmos/solidity-ibc-eureka/abigen/ics26router"
 
 	"github.com/srdtrk/solidity-ibc-eureka/e2e/v8/testvalues"
+	"github.com/srdtrk/solidity-ibc-eureka/e2e/v8/types"
 	ethereumtypes "github.com/srdtrk/solidity-ibc-eureka/e2e/v8/types/ethereum"
 )
 
-func (s *TestSuite) CreateEthereumLightClient(ctx context.Context, cosmosChain *cosmos.CosmosChain, simdRelayerUser ibc.Wallet, ibcContractAddress string) {
+func (s *TestSuite) CreateEthereumLightClient(ctx context.Context, cosmosChain *cosmos.CosmosChain, simdRelayerUser ibc.Wallet, ibcContractAddress string, wasmFixtureGenerator *types.WasmFixtureGenerator) {
 	switch s.ethTestnetType {
 	case testvalues.EthTestnetTypePoW:
 		s.createDummyLightClient(ctx, cosmosChain, simdRelayerUser)
 	case testvalues.EthTestnetTypePoS:
-		s.createEthereumLightClient(ctx, cosmosChain, simdRelayerUser, ibcContractAddress)
+		s.createEthereumLightClient(ctx, cosmosChain, simdRelayerUser, ibcContractAddress, wasmFixtureGenerator)
 	default:
 		panic(fmt.Sprintf("Unrecognized Ethereum testnet type: %v", s.ethTestnetType))
 	}
@@ -39,6 +40,7 @@ func (s *TestSuite) createEthereumLightClient(
 	cosmosChain *cosmos.CosmosChain,
 	simdRelayerUser ibc.Wallet,
 	ibcContractAddress string,
+	wasmFixtureGenerator *types.WasmFixtureGenerator,
 ) {
 	eth := s.EthChain
 
@@ -134,6 +136,13 @@ func (s *TestSuite) createEthereumLightClient(
 	ethereumLightClientID, err := ibctesting.ParseClientIDFromEvents(res.Events)
 	s.Require().NoError(err)
 	s.Require().Equal(testvalues.FirstWasmClientID, ethereumLightClientID)
+
+	if wasmFixtureGenerator != nil {
+		wasmFixtureGenerator.AddFixtureStep("initial_state", ethereumtypes.InitialState{
+			ClientState:    ethClientState,
+			ConsensusState: ethConsensusState,
+		})
+	}
 }
 
 func (s *TestSuite) createDummyLightClient(ctx context.Context, cosmosChain *cosmos.CosmosChain, simdRelayerUser ibc.Wallet) {

contracts/msgs/IICS02ClientMsgs.sol

@@ -55,6 +55,10 @@ func (s Spec) ToForkParameters() ethereumtypes.ForkParameters {
 			Version: ethcommon.Bytes2Hex(s.DenebForkVersion[:]),
 			Epoch:   s.DenebForkEpoch,
 		},
+		Electra: ethereumtypes.Fork{
+			Version: ethcommon.Bytes2Hex(s.ElectraForkVersion[:]),
+			Epoch:   s.ElectraForkEpoch,
+		},
 	}
 }
 

e2e/interchaintestv8/chainconfig/kurtosis.go

@@ -24,6 +24,8 @@ type Spec struct {
 	CapellaForkEpoch     uint64         `json:"CAPELLA_FORK_EPOCH"`
 	DenebForkVersion     phase0.Version `json:"DENEB_FORK_VERSION"`
 	DenebForkEpoch       uint64         `json:"DENEB_FORK_EPOCH"`
+	ElectraForkVersion   phase0.Version `json:"ELECTRA_FORK_VERSION"`
+	ElectraForkEpoch     uint64         `json:"ELECTRA_FORK_EPOCH"`
 }
 
 type Bootstrap struct {