voyager progress (#3199)

unionlabs · Nov 5, 2024 · b7f8e9e · b7f8e9e
2 parents 6b284b9 + 7fbbe33
commit b7f8e9e
Show file tree

Hide file tree

Showing 45 changed files with 1,078 additions and 684 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dictionary.txt b/dictionary.txt
@@ -314,6 +314,7 @@ autocli
 autocliv
 autocorrect
 autoplay
+autoref
 autotests
 awkroot
 axelar
@@ -1166,7 +1167,6 @@ smallvec
 smoothstep
 snapshotter
 snapshottypes
-soketto
 solomachine
 sonner
 spearbit

diff --git a/evm/contracts/Multicall.sol b/evm/contracts/Multicall.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.27;
 
 struct Call3 {
     address target;
-    bool allowFailure;
+    // bool allowFailure;
     bytes callData;
 }
 
@@ -25,33 +25,33 @@ contract Multicall {
             calli = calls[i];
             (result.success, result.returnData) =
                 calli.target.call(calli.callData);
-            assembly {
-                // Revert if the call fails and failure is not allowed
-                // `allowFailure := calldataload(add(calli, 0x20))` and `success := mload(result)`
-                if iszero(or(calldataload(add(calli, 0x20)), mload(result))) {
-                    // set "Error(string)" signature: bytes32(bytes4(keccak256("Error(string)")))
-                    mstore(
-                        0x00,
-                        0x08c379a000000000000000000000000000000000000000000000000000000000
-                    )
-                    // set data offset
-                    mstore(
-                        0x04,
-                        0x0000000000000000000000000000000000000000000000000000000000000020
-                    )
-                    // set length of revert string
-                    mstore(
-                        0x24,
-                        0x0000000000000000000000000000000000000000000000000000000000000017
-                    )
-                    // set revert string: bytes32(abi.encodePacked("Multicall3: call failed"))
-                    mstore(
-                        0x44,
-                        0x4d756c746963616c6c333a2063616c6c206661696c6564000000000000000000
-                    )
-                    revert(0x00, 0x64)
-                }
-            }
+            // assembly {
+            //     // Revert if the call fails and failure is not allowed
+            //     // `allowFailure := calldataload(add(calli, 0x20))` and `success := mload(result)`
+            //     if iszero(or(calldataload(add(calli, 0x20)), mload(result))) {
+            //         // set "Error(string)" signature: bytes32(bytes4(keccak256("Error(string)")))
+            //         mstore(
+            //             0x00,
+            //             0x08c379a000000000000000000000000000000000000000000000000000000000
+            //         )
+            //         // set data offset
+            //         mstore(
+            //             0x04,
+            //             0x0000000000000000000000000000000000000000000000000000000000000020
+            //         )
+            //         // set length of revert string
+            //         mstore(
+            //             0x24,
+            //             0x0000000000000000000000000000000000000000000000000000000000000017
+            //         )
+            //         // set revert string: bytes32(abi.encodePacked("Multicall3: call failed"))
+            //         mstore(
+            //             0x44,
+            //             0x4d756c746963616c6c333a2063616c6c206661696c6564000000000000000000
+            //         )
+            //         revert(0x00, 0x64)
+            //     }
+            // }
             unchecked {
                 ++i;
             }

diff --git a/flake.nix b/flake.nix
@@ -223,7 +223,7 @@
         ./site/site.nix
         ./lib/near/near.nix
         ./typescript-sdk/typescript-sdk.nix
-        # ./light-clients/ethereum-light-client/ethereum-light-client.nix
+        ./light-clients/ethereum-light-client/ethereum-light-client.nix
         ./light-clients/cometbls-light-client/cometbls-light-client.nix
         ./light-clients/tendermint-light-client/tendermint-light-client.nix
         # ./light-clients/scroll-light-client/scroll-light-client.nix

diff --git a/hubble/src/indexer/tm/create_client_tracker.rs b/hubble/src/indexer/tm/create_client_tracker.rs
@@ -76,8 +76,7 @@ pub fn schedule_create_client_checker(
                             let client_type = parse_wasm_client_type(wasm_blob).unwrap();
 
                             let counterparty_chain_id = match client_type.unwrap() {
-                                WasmClientType::EthereumMinimal
-                                | WasmClientType::EthereumMainnet => {
+                                WasmClientType::Ethereum => {
                                     let cs = match ethereum_light_client_types::ClientState::decode_as::<Proto>(&cs.data) {
                                         Ok(cs) => cs,
                                         // We changed the format of berachain client states, but union-testnet-8 still contains an old configuration which we need to ignore.

diff --git a/lib/cometbft-types/src/abci/response_query.rs b/lib/cometbft-types/src/abci/response_query.rs
@@ -10,10 +10,12 @@ pub struct QueryResponse {
     pub log: String,
     /// nondeterministic
     pub info: String,
+    #[serde(with = "::serde_utils::string")]
     pub index: i64,
     pub key: Option<Bytes<Base64>>,
     pub value: Option<Bytes<Base64>>,
     pub proof_ops: Option<ProofOps>,
+    #[serde(with = "::serde_utils::string")]
     pub height: BoundedI64<0, { i64::MAX }>,
     pub codespace: String,
 }