Revert "fix: execute cosmos message during evm session (#123)" (#145)

* Revert "fix: execute cosmos message during evm session (#123)"

This reverts commit 43d4784.

* keep bug fix

* use same sol version

x/evm/contracts/counter/Counter.sol

@@ -9,7 +9,7 @@ contract Counter is IIBCAsyncCallback {
     uint256 public count;
 
     event increased(uint256 oldCount, uint256 newCount);
-    event execute_reverted(bool reverted);
+    event callback_received(uint64 callback_id, bool success);
     event recursive_called(uint64 n);
 
     constructor() payable {}
@@ -47,19 +47,27 @@ contract Counter is IIBCAsyncCallback {
         return COSMOS_CONTRACT.query_cosmos(path, req);
     }
 
-    function execute_cosmos(
+    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(
         string memory exec_msg,
-        bool try_catch
+        bool allow_failure,
+        uint64 callback_id
     ) external {
-        if (try_catch) {
-            try COSMOS_CONTRACT.execute_cosmos(exec_msg) {
-                emit execute_reverted(false);
-            } catch {
-                emit execute_reverted(true);
-            }
-        } else {
-            COSMOS_CONTRACT.execute_cosmos(exec_msg);
-        }
+        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);
     }
 
     function get_blockhash(uint64 n) external view returns (bytes32) {

x/evm/contracts/erc165/ERC165.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (utils/introspection/ERC165.sol)
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.25;
 
 import {IERC165} from "../i_erc165/IERC165.sol";
 

x/evm/contracts/erc721/ERC721.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/ERC721.sol)
 
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.25;
 
 import {IERC721, IERC721Metadata, IERC721Errors, IERC721Receiver} from "../i_erc721/IERC721.sol";
 import {IERC165, ERC165} from "../erc165/ERC165.sol";

x/evm/contracts/i_cosmos/ICosmos.sol

@@ -44,6 +44,7 @@ interface ICosmos {
     ) external returns (address erc20_address);
 
     // record a cosmos message to be executed after the current message execution.
+    // - if execution fails, whole transaction will be reverted.
     //
     // `msg` format (json string):
     // {
@@ -60,6 +61,36 @@ 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)