Merge pull request #54 from ComposableFi/vmarkushin/proofs

Ethereum Merkle proofs verification
ComposableFi · Sep 28, 2023 · 0f9cd62 · 0f9cd62
2 parents 8e3d8f0 + b2ca07d
commit 0f9cd62
Show file tree

Hide file tree

Showing 25 changed files with 835 additions and 245 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,5 +85,5 @@ scripts/eth-bridge/consensus/genesis.ssz
 scripts/eth-bridge/consensus/beacondata
 scripts/eth-bridge/consensus/validatordata
 
-hyperspace/ethereum/yui-ibc-solidity
+#hyperspace/ethereum/yui-ibc-solidity
 hyperspace/ethereum/composable-centauri
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config/centauri-local.toml b/config/centauri-local.toml
@@ -5,15 +5,15 @@ grpc_url = "http://127.0.0.1:9090/"
 websocket_url = "ws://127.0.0.1:26657/websocket"
 chain_id = "centauri-testnet-1"
 client_id = "07-tendermint-0"
-connection_id = "connection-18"
+connection_id = "connection-0"
 account_prefix = "centauri"
 fee_denom = "stake"
 fee_amount = "4000"
 gas_limit = 9223372036854775806
 store_prefix = "ibc"
 max_tx_size = 200000
 wasm_code_id = "4c7504846b7c35e1b7dfc62f9347fcb98fec95aecede9822a745ce14d6973ced"
-channel_whitelist = [["channel-8", "transfer"]]
+channel_whitelist = [["channel-8", "transfer"], ["channel-0", "transfer"]]
 mnemonic = "sense state fringe stool behind explain area quit ugly affair develop thumb clinic weasel choice atom gesture spare sea renew penalty second upon peace"
 skip_optional_client_updates = true
 max_packets_to_process = 200
diff --git a/config/ethereum-local.toml b/config/ethereum-local.toml
@@ -5,13 +5,13 @@ beacon_rpc_url = "http://localhost:3500/"
 private_key_path = "hyperspace/ethereum/keys/0x73db010c3275eb7a92e5c38770316248f4c644ee"
 max_block_weight = 1
 name = "ethereum_client"
-client_id = "08-wasm-22"
+client_id = "08-wasm-0"
 connection_id = "connection-0"
-channel_whitelist = [["channel-0", "transfer"]]
+channel_whitelist = [["channel-0", "transfer"], ["channel-0", "transfer"]]
 commitment_prefix = "6962632f"
-diamond_address = "0x4a976e25cde9d022007f7f02889901b382038237"
-tendermint_address = "0xa6915519ec2cbc4e7eea7912673c885fc1f156ca"
-bank_address = "0x87b47d11cdc84e3c3cb70b34dde1235c0862b68e"
-diamond_facets = [["IBCClient", "0x10b57a97dad42b87185f39fc653939c89abda030"], ["IBCConnection", "0x163f4a54af24d13151f231fb74ef5cbc642d05a7"], ["IBCChannelHandshake", "0x5078d1a1240bcbca0f67ba25f07c66b85ab86d37"], ["IBCPacket", "0xc0a2f84324ddf94f4d5af8b507ffefb9016fcdaa"], ["IBCQuerier", "0x98f6789f22e1066dcd128ca99a859acf4821f834"], ["DiamondCutFacet", "0xc1e3b960d3db95ea5a4f2b7c91ba28b2222d5484"], ["DiamondLoupeFacet", "0x4dccf8ac3a04b9d7f294047ebc6481ed9d8fbab6"], ["OwnershipFacet", "0x0fce292ea5fbf749d8ef31412dbc8ac5841ba66d"]]
+diamond_address = "0xd0017ae5068faa14eaa547ba1c47fdc7afdf1230"
+tendermint_address = "0x56378f9b88f341b1913a2fc6ac2bcbaa1b9a9f9f"
+bank_address = "0x4976bb932815783f092dd0e3cca567d5502be46e"
+diamond_facets = [["IBCClient", "0xb7198a3674e37433579be45aa9dd09f5ab4b314a"], ["IBCConnection", "0xb26397cfa7e111e844086bdd3da5080f9de65cb7"], ["IBCChannelHandshake", "0xfbf766071d0fdee42b78ab029b97194543b6d7a5"], ["IBCPacket", "0x844d2447e6c00cf6a5fbe9ad5eebebe31e40368e"], ["IBCQuerier", "0x992966599e81b9d4a3ef92172b9fa162d2e50d5b"], ["DiamondCutFacet", "0x3bf46cf159422e1791d20d45683b21f34ecae4be"], ["DiamondLoupeFacet", "0xb16af4cfc553ae0a8f43e812e22dc6caabdf5e63"], ["OwnershipFacet", "0x4f6e145fbaf72be9ea283f5793e70a1c594d5ceb"]]
 client_type = "07-tendermint"
 jwt_secret_path = "/Users/vmark/work/eth-pos-devnet/execution/jwtsecret"
diff --git a/hyperspace/core/Cargo.toml b/hyperspace/core/Cargo.toml
@@ -57,7 +57,7 @@ sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polka
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" }
 sp-beefy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" }
 subxt = { git = "https://github.com/paritytech/subxt",  rev = "2a4da618a033bb82f768e4ef67b093b371f8b492", features = ["substrate-compat"] }
-subxt-generated = { path = "../../utils/subxt/generated", optional = true }
+#subxt-generated = { path = "../../utils/subxt/generated", optional = true }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
 prost = { version = "0.11", default-features = false }

diff --git a/hyperspace/ethereum/scripts/generate_abi.sh b/hyperspace/ethereum/scripts/generate_abi.sh
diff --git a/hyperspace/ethereum/src/abi/ibc-connection-abi.json b/hyperspace/ethereum/src/abi/ibc-connection-abi.json
@@ -527,5 +527,18 @@
     ],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getCommitmentPrefix",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
   }
 ]