execute cosmos message during evm session

initia-labs · Nov 27, 2024 · d787121 · d787121
1 parent 873b1fd
commit d787121
Show file tree

Hide file tree

Showing 19 changed files with 184 additions and 707 deletions.
diff --git a/x/evm/contracts/counter/Counter.go b/x/evm/contracts/counter/Counter.go
diff --git a/x/evm/contracts/counter/Counter.sol b/x/evm/contracts/counter/Counter.sol
@@ -47,27 +47,19 @@ contract Counter is IIBCAsyncCallback {
         return COSMOS_CONTRACT.query_cosmos(path, req);
     }
 
-    function execute_cosmos(string memory exec_msg, bool call_revert) external {
-        COSMOS_CONTRACT.execute_cosmos(exec_msg);
-
-        if (call_revert) {
-            revert("revert reason dummy value for test");
-        }
-    }
-
-    function execute_cosmos_with_options(
+    function execute_cosmos(
         string memory exec_msg,
-        bool allow_failure,
-        uint64 callback_id
+        bool try_catch
     ) external {
-        COSMOS_CONTRACT.execute_cosmos_with_options(
-            exec_msg,
-            ICosmos.Options(allow_failure, callback_id)
-        );
-    }
-
-    function callback(uint64 callback_id, bool success) external {
-        emit callback_received(callback_id, success);
+        if (try_catch) {
+            try COSMOS_CONTRACT.execute_cosmos(exec_msg) {
+                // do nothing
+            } catch {
+                // do nothing
+            }
+        } else {
+            COSMOS_CONTRACT.execute_cosmos(exec_msg);
+        }
     }
 
     function get_blockhash(uint64 n) external view returns (bytes32) {

diff --git a/x/evm/contracts/erc20/ERC20.go b/x/evm/contracts/erc20/ERC20.go
diff --git a/x/evm/contracts/erc20_acl/ERC20ACL.go b/x/evm/contracts/erc20_acl/ERC20ACL.go
diff --git a/x/evm/contracts/erc20_factory/ERC20Factory.go b/x/evm/contracts/erc20_factory/ERC20Factory.go
diff --git a/x/evm/contracts/erc20_wrapper/ERC20Wrapper.go b/x/evm/contracts/erc20_wrapper/ERC20Wrapper.go
diff --git a/x/evm/contracts/i_cosmos/ICosmos.go b/x/evm/contracts/i_cosmos/ICosmos.go
diff --git a/x/evm/contracts/i_cosmos/ICosmos.sol b/x/evm/contracts/i_cosmos/ICosmos.sol
@@ -61,36 +61,6 @@ interface ICosmos {
     //
     function execute_cosmos(string memory msg) external returns (bool dummy);
 
-    // @args
-    // - `allow_failure`: if `true`, the transaction will not be reverted even if the execution fails.
-    // - `callback_id`: the callback id to be called after the execution. `0` means no callback.
-    struct Options {
-        bool allow_failure;
-        uint64 callback_id;
-    }
-
-    // record a cosmos message to be executed after the current message execution.
-    //
-    // `msg` format (json string):
-    // {
-    //    "@type": "/cosmos.bank.v1beta1.MsgSend",
-    //    "from_address": "init13vhzmdmzsqlxkdzvygue9zjtpzedz7j87c62q4",
-    //    "to_address": "init1enjh88u7c9s08fgdu28wj6umz94cetjy0hpcxf",
-    //    "amount": [
-    //        {
-    //            "denom": "stake",
-    //            "amount": "100"
-    //        }
-    //    ]
-    // }
-    //
-    // `callback` function signature in the caller contract (see ICosmosCallback.sol):
-    // - function callback(uint64 callback_id, bool success) external;
-    function execute_cosmos_with_options(
-        string memory msg,
-        Options memory options
-    ) external returns (bool dummy);
-
     // query a whitelisted cosmos queries.
     //
     // example)