Skip to content

Commit 591e0a6

Browse files
gjermundgarabagjermundgaraba
authored
chore: update testnet deployment (#393)
1 parent cf3b2d8 commit 591e0a6

File tree

3 files changed

+97
-13
lines changed

3 files changed

+97
-13
lines changed

‎deployments/testnet-staging/11155111.json

+83-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"rpc_url": "https://sepolia.drpc.org",
33
"ics26Router": {
4-
"implementation": "0xEF47f51d032150A8Eaf345096bf59B783287a3b7",
4+
"implementation": "0x273B1789f0059E50d313F56FA612F22794Cd8f54",
55
"portCustomizer": "0xAe3E5CCaF3216de61090E68Cf5a191f3b75CaAd3",
66
"proxy": "0x718AbdD2f29A6aC1a34A3e20Dae378B5d3d2B0E9",
77
"timeLockAdmin": "0xAe3E5CCaF3216de61090E68Cf5a191f3b75CaAd3"
@@ -35,7 +35,87 @@
3535
},
3636
"1": {
3737
"clientId": "hub-devnet-sp1-g16-0",
38-
"implementation": "0xF662574E0c3aA73eCaF3AAAcd9B0f0cb8160B3e5",
38+
"implementation": "0x6fa5BaF1F679f48592dd3d9FF7e0B6992e2fc424",
39+
"verifier": "0xfa12c6159Ce398b6B486AC841Cf30b5bF91aBa33",
40+
"counterpartyClientId": "08-wasm-4",
41+
"merklePrefix": [
42+
"ibc",
43+
""
44+
],
45+
"trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000db3000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010657572656b612d6875622d6465762d3500000000000000000000000000000000",
46+
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000067cc8a1b848d241644170a69dce00e147c786cd298a10488cbd18800645a67cc96b191aab525297d33ed51d1708320418a4839cee34fffccda89629d53c843ac9243f69d",
47+
"updateClientVkey": "0x0070a56918612966dcaf5b88a770e80da5ccd99d8524e3450df9927687576829",
48+
"membershipVkey": "0x008fea06bdc306786dbf2c07c9d8657ed19dcde31c83522b75957a17be802d62",
49+
"ucAndMembershipVkey": "0x00886b5b925c129094c5d9354ee5a13484e34ee7393c8eba1bc3ba4b5cdb8c14",
50+
"misbehaviourVkey": "0x000e1a9c2163445551834af245691be8da2904381df4381afa7e5454080b3dfc"
51+
},
52+
"2": {
53+
"clientId": "ledger-testnet-0",
54+
"implementation": "0xe1Dc43670C42a0bB64abdfE0e7196ce74f061318",
55+
"verifier": "0x52D2b9c86a4ea72631aBFe21143398FAD067469D",
56+
"counterpartyClientId": "08-wasm-0",
57+
"merklePrefix": [
58+
"ibc",
59+
""
60+
],
61+
"trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004139000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000002a3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086c6f63616c6e6574000000000000000000000000000000000000000000000000",
62+
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000067ce043cbf06f68df40f72174f305550c83f8be4094a9b22811299fcc6e130ceaf79404916e6896df067df36cfac5511375e249a4ed9b73392e115413a9d9b259f44e382",
63+
"updateClientVkey": "0x007fc9e6b74e2b072d2529fa7615c0eb91b38b1e364f5de5398fc1dbd4bd6409",
64+
"membershipVkey": "0x00bb87e99e31bb4e1d37e5b7bc270a28fa0d51f38d5064e7c40e253503715bfd",
65+
"ucAndMembershipVkey": "0x009d6c521a1d97a60947dff3dc76f000f815d05ecb9427d0b7e97d9d30008962",
66+
"misbehaviourVkey": "0x001667ed324955520dca4bc72ea0e39fec88796972d8f8fd0b6d07891b0e240f"
67+
},
68+
"3": {
69+
"clientId": "hub-testnet-sp1-4",
70+
"implementation": "0x78d1E47676afb208767E477bE208e64908dd8B7f",
71+
"verifier": "0xa600ecDa9cb6c26ca3eF5255cE14266E0e49591E",
72+
"counterpartyClientId": "08-wasm-255",
73+
"merklePrefix": [
74+
"ibc",
75+
""
76+
],
77+
"trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a60768000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000870726f7669646572000000000000000000000000000000000000000000000000",
78+
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000067d0877df79e10401f264efe8ea672439db5b5808a740de1f1e54132c0ac4d9ee4b16415734d1fefac2f710555aa7c1f95099eb8923b63ea24a3800e63455aa55c880116",
79+
"updateClientVkey": "0x0091b7766cc8267041695229bc125c29a96a8d2ec016a57c6a87a4f1c52c088f",
80+
"membershipVkey": "0x00bb87e99e31bb4e1d37e5b7bc270a28fa0d51f38d5064e7c40e253503715bfd",
81+
"ucAndMembershipVkey": "0x00987cfc3ada54abcd8d7a0ff5299ba7acfa1d4e7cf1bba8054edaa1e4b1ee5c",
82+
"misbehaviourVkey": "0x006ebe640f81926f9c51ccf622717a2fd53a1c7ed034818b99b0bbaacb98fe61"
83+
},
84+
"4": {
85+
"clientId": "client-0",
86+
"implementation": "0x78d1E47676afb208767E477bE208e64908dd8B7f",
87+
"verifier": "0xa600ecDa9cb6c26ca3eF5255cE14266E0e49591E",
88+
"counterpartyClientId": "08-wasm-255",
89+
"merklePrefix": [
90+
"ibc",
91+
""
92+
],
93+
"trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a60768000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000870726f7669646572000000000000000000000000000000000000000000000000",
94+
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000067d0877df79e10401f264efe8ea672439db5b5808a740de1f1e54132c0ac4d9ee4b16415734d1fefac2f710555aa7c1f95099eb8923b63ea24a3800e63455aa55c880116",
95+
"updateClientVkey": "0x0091b7766cc8267041695229bc125c29a96a8d2ec016a57c6a87a4f1c52c088f",
96+
"membershipVkey": "0x00bb87e99e31bb4e1d37e5b7bc270a28fa0d51f38d5064e7c40e253503715bfd",
97+
"ucAndMembershipVkey": "0x00987cfc3ada54abcd8d7a0ff5299ba7acfa1d4e7cf1bba8054edaa1e4b1ee5c",
98+
"misbehaviourVkey": "0x006ebe640f81926f9c51ccf622717a2fd53a1c7ed034818b99b0bbaacb98fe61"
99+
},
100+
"5": {
101+
"clientId": "client-1",
102+
"implementation": "0xe1Dc43670C42a0bB64abdfE0e7196ce74f061318",
103+
"verifier": "0x52D2b9c86a4ea72631aBFe21143398FAD067469D",
104+
"counterpartyClientId": "08-wasm-0",
105+
"merklePrefix": [
106+
"ibc",
107+
""
108+
],
109+
"trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004139000000000000000000000000000000000000000000000000000000000001c200000000000000000000000000000000000000000000000000000000000002a3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000086c6f63616c6e6574000000000000000000000000000000000000000000000000",
110+
"trustedConsensusState": "0000000000000000000000000000000000000000000000000000000067ce043cbf06f68df40f72174f305550c83f8be4094a9b22811299fcc6e130ceaf79404916e6896df067df36cfac5511375e249a4ed9b73392e115413a9d9b259f44e382",
111+
"updateClientVkey": "0x007fc9e6b74e2b072d2529fa7615c0eb91b38b1e364f5de5398fc1dbd4bd6409",
112+
"membershipVkey": "0x00bb87e99e31bb4e1d37e5b7bc270a28fa0d51f38d5064e7c40e253503715bfd",
113+
"ucAndMembershipVkey": "0x009d6c521a1d97a60947dff3dc76f000f815d05ecb9427d0b7e97d9d30008962",
114+
"misbehaviourVkey": "0x001667ed324955520dca4bc72ea0e39fec88796972d8f8fd0b6d07891b0e240f"
115+
},
116+
"6": {
117+
"clientId": "client-2",
118+
"implementation": "0x6fa5BaF1F679f48592dd3d9FF7e0B6992e2fc424",
39119
"verifier": "0xfa12c6159Ce398b6B486AC841Cf30b5bF91aBa33",
40120
"counterpartyClientId": "08-wasm-4",
41121
"merklePrefix": [
@@ -50,4 +130,4 @@
50130
"misbehaviourVkey": "0x000e1a9c2163445551834af245691be8da2904381df4381afa7e5454080b3dfc"
51131
}
52132
}
53-
}
133+
}

‎justfile

+5-2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ genesis-sp1-ics07: build-sp1-programs
150150
@echo "Generating the genesis file..."
151151
RUST_LOG=info cargo run --bin operator --release -- genesis -o scripts/genesis.json
152152

153+
# Deploy scripts. If these fail to land due to gas price fluctuations, try again with a higher gas price:
154+
# adding something like `--legacy --with-gas-price 100gwei` -- depending on the current gas prices.
155+
156+
153157
# Deploy the SP1ICS07Tendermint contract to the Eth Sepolia testnet if the `.env` file is present
154158
deploy-sp1-ics07: genesis-sp1-ics07
155159
@echo "Deploying the SP1ICS07Tendermint contract"
@@ -169,8 +173,7 @@ deploy-ics20: build-contracts
169173
# Deploy the SP1ICS07Tendermint contract using environment variables
170174
deploy-light-client: build-contracts
171175
@echo "Deploying the SP1ICS07Tendermint contract with RPC_URL=$RPC_URL"
172-
forge script scripts/deployments/DeploySP1ICS07Tendermint.sol --rpc-url $RPC_URL --private-key $PRIVATE_KEY -vvv --broadcast --legacy --with-gas-price 2gwei
173-
176+
forge script scripts/deployments/DeploySP1ICS07Tendermint.sol --rpc-url $RPC_URL --private-key $PRIVATE_KEY -vvv --broadcast
174177

175178
# Generate the fixtures for the Solidity tests using the e2e tests
176179
generate-fixtures-solidity: clean install-operator install-relayer

‎scripts/deployments/DeploySP1ICS07Tendermint.sol

+9-8
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@ contract DeploySP1ICS07TendermintScript is DeploySP1ICS07Tendermint, Script {
8282

8383
(bool success, address verifierAddr) = Strings.tryParseAddress(deployment.verifier);
8484

85+
IICS02Client router = IICS02Client(ics26RouterDeployment.proxy);
86+
87+
vm.assertEq(
88+
address(router.getClient(deployment.clientId)),
89+
deployment.implementation,
90+
"address of clientId in ics26Router doesn't match implementation address"
91+
);
92+
8593
vm.assertTrue(
8694
success,
8795
string.concat(
@@ -94,7 +102,7 @@ contract DeploySP1ICS07TendermintScript is DeploySP1ICS07Tendermint, Script {
94102
);
95103

96104
vm.assertEq(
97-
address(ics07Tendermint.VERIFIER()),
105+
actualVerifierAddress,
98106
verifierAddr,
99107
"verifier address doesn't match"
100108
);
@@ -122,13 +130,6 @@ contract DeploySP1ICS07TendermintScript is DeploySP1ICS07Tendermint, Script {
122130
"ucAndMembershipVkey doesn't match"
123131
);
124132

125-
IICS02Client router = IICS02Client(ics26RouterDeployment.proxy);
126-
127-
vm.assertEq(
128-
address(router.getClient(deployment.clientId)),
129-
deployment.implementation,
130-
"address of clientId in ics26Router doesn't match implementation address"
131-
);
132133

133134
IICS02ClientMsgs.CounterpartyInfo memory counterparty = router.getCounterparty(deployment.clientId);
134135

0 commit comments

Comments
 (0)