fix call ica

crypto-org-chain · Sep 22, 2023 · 32d9db6 · 32d9db6
1 parent d4bee9b
commit 32d9db6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/integration_tests/contracts/contracts/ICA.sol b/integration_tests/contracts/contracts/ICA.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+interface IICAModule {
+    event SubmitMsgsResult(string seq);
+    function registerAccount(string calldata connectionID, string calldata version) external payable returns (bool);
+    function queryAccount(string calldata connectionID, address addr) external view returns (string memory);
+    function submitMsgs(string calldata connectionID, string calldata data, uint256 timeout) external payable returns (uint64);
+}
diff --git a/integration_tests/contracts/contracts/TestICA.sol b/integration_tests/contracts/contracts/TestICA.sol
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >0.6.6;
+pragma solidity ^0.8.4;
+
+import {IICAModule} from "./ICA.sol";
 
 contract TestICA {
     address constant icaContract = 0x0000000000000000000000000000000000000066;
+    IICAModule ica = IICAModule(icaContract);
 
     function encodeRegister(string memory connectionID) internal view returns (bytes memory) {
         return abi.encodeWithSignature(
@@ -12,9 +15,7 @@ contract TestICA {
     }
 
     function callRegister(string memory connectionID) public returns (bool) {
-        (bool result, ) = icaContract.call(encodeRegister(connectionID));
-        require(result, "call failed");
-        return true;
+        return ica.registerAccount(connectionID, "");
     }
 
     function delegateRegister(string memory connectionID) public returns (bool) {
@@ -37,9 +38,7 @@ contract TestICA {
     }
 
     function callQueryAccount(string memory connectionID, address addr) public returns (string memory) {
-        (bool result, bytes memory data) = icaContract.call(encodeQueryAccount(connectionID, addr));
-        require(result, "call failed");
-        return abi.decode(data, (string));
+        return ica.queryAccount(connectionID, addr);
     }
 
     function delegateQueryAccount(string memory connectionID, address addr) public returns (string memory) {
@@ -62,9 +61,7 @@ contract TestICA {
     }
 
     function callSubmitMsgs(string memory connectionID, string memory data) public returns (uint64) {
-        (bool result, bytes memory data) = icaContract.call(encodeSubmitMsgs(connectionID, data));
-        require(result, "call failed");
-        return abi.decode(data, (uint64));
+        return ica.submitMsgs(connectionID, data, 300000000000);
     }
 
     function delegateSubmitMsgs(string memory connectionID, string memory data) public returns (uint64) {

diff --git a/integration_tests/test_ica_precompile.py b/integration_tests/test_ica_precompile.py
@@ -129,14 +129,14 @@ def submit_msgs(msgs, seq):
     assert tcontract.functions.staticQueryAccount(connid, addr).call() == ica_address
 
     tx = tcontract.functions.callRegister(connid).build_transaction(data)
-    assert send_transaction(w3, tx, keys).status == 0
+    assert send_transaction(w3, tx, keys).status == 1
     tx = tcontract.functions.delegateRegister(connid).build_transaction(data)
     assert send_transaction(w3, tx, keys).status == 0
     tx = tcontract.functions.staticRegister(connid).build_transaction(data)
     assert send_transaction(w3, tx, keys).status == 0
 
     tx = tcontract.functions.callSubmitMsgs(connid, "").build_transaction(data)
-    assert send_transaction(w3, tx, keys).status == 0
+    assert send_transaction(w3, tx, keys).status == 1
     tx = tcontract.functions.delegateSubmitMsgs(connid, "").build_transaction(data)
     assert send_transaction(w3, tx, keys).status == 0
     tx = tcontract.functions.staticSubmitMsgs(connid, "").build_transaction(data)