Merge pull request #51 from datachainlab/delete-txMsg

Author: YukiTsuchida

package.json

@@ -11,7 +11,7 @@
     "fmt:sol": "forge fmt",
     "coverage:sol": "forge coverage --report lcov --ir-minimum",
     "snapshot": "forge snapshot",
-    "snapshot:diff": "forge snapshot --diff --diff-sort absolute-desc"
+    "snapshot:diff": "forge snapshot --diff"
   },
   "dependencies": {
     "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#v0.3.40",

pkg/contract/crosssimplemodule/crosssimplemodule.go

@@ -37,7 +37,7 @@ abstract contract Authenticator is IAuthenticator, TxAuthManagerBase, TxManagerB
 
         bool completed = _sign(txID, accounts);
         if (completed) {
-            _runTxIfCompleted(txID);
+            emit TxAuthCompleted(txID);
         }
 
         emit TxSigned(msg.sender, txID, AuthType.AuthMode.AUTH_MODE_LOCAL);
@@ -52,7 +52,7 @@ abstract contract Authenticator is IAuthenticator, TxAuthManagerBase, TxManagerB
 
         bool completed = _sign(txID, msg_.signers);
         if (completed) {
-            _runTxIfCompleted(txID);
+            emit TxAuthCompleted(txID);
         }
 
         emit TxSigned(msg.sender, txID, AuthType.AuthMode.AUTH_MODE_EXTENSION);

pkg/contract/txauthmanager/txauthmanager.go

@@ -3,15 +3,41 @@ pragma solidity ^0.8.20;
 
 import {ICoordinator} from "./ICoordinator.sol";
 import {TxManagerBase} from "./TxManagerBase.sol";
+import {TxAuthManagerBase} from "./TxAuthManagerBase.sol";
 import {ICrossError} from "./ICrossError.sol";
+import {ICrossEvent} from "./ICrossEvent.sol";
+import {TxIDUtils} from "./TxIDUtils.sol";
 
 import {
     QueryCoordinatorStateRequest,
     QueryCoordinatorStateResponse,
     CoordinatorState
 } from "../proto/cross/core/atomic/simple/AtomicSimple.sol";
+import {MsgInitiateTx} from "../proto/cross/core/initiator/Initiator.sol";
+
+abstract contract Coordinator is ICoordinator, TxAuthManagerBase, TxManagerBase, ICrossError, ICrossEvent {
+    using TxIDUtils for MsgInitiateTx.Data;
+
+    function executeTx(MsgInitiateTx.Data calldata msg_) external override {
+        uint64 rh = msg_.timeout_height.revision_height;
+        if (rh != 0 && (block.number + 1 > uint256(rh))) {
+            revert MessageTimeoutHeight(block.number, rh);
+        }
+        // slither-disable-next-line timestamp
+        if (msg_.timeout_timestamp > 0 && (block.timestamp + 1 > msg_.timeout_timestamp)) {
+            revert MessageTimeoutTimestamp(block.timestamp, msg_.timeout_timestamp);
+        }
+
+        bytes32 txID = msg_.computeTxId();
+
+        if (!_isTxRecorded(txID)) revert TxIDNotFound(txID);
+
+        if (!_isCompletedAuth(txID)) revert AuthNotCompleted(txID);
+        _runTxIfCompleted(txID, msg_);
+
+        emit TxExecuted(abi.encodePacked(txID), msg.sender);
+    }
 
-abstract contract Coordinator is TxManagerBase, ICoordinator, ICrossError {
     function coordinatorState(QueryCoordinatorStateRequest.Data calldata req)
         external
         view

pkg/contract/txmanager/txmanager.go

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IAuthExtensionVerifier} from "./IAuthExtensionVerifier.sol";
 import {IContractModule} from "./IContractModule.sol";
-import {MsgInitiateTx, MsgInitiateTxResponse} from "../proto/cross/core/initiator/Initiator.sol";
+import {MsgInitiateTxResponse} from "../proto/cross/core/initiator/Initiator.sol";
 import {Account} from "../proto/cross/core/auth/Auth.sol";
 import {CoordinatorState, ContractTransactionState} from "../proto/cross/core/atomic/simple/AtomicSimple.sol";
 import {IIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-handler/IIBCHandler.sol";
@@ -30,7 +30,7 @@ abstract contract CrossStore {
     }
 
     struct TxStorage {
-        mapping(bytes32 => MsgInitiateTx.Data) txMsg;
+        mapping(bytes32 => Account.Data[]) txCoordSigners;
         mapping(bytes32 => MsgInitiateTxResponse.InitiateTxStatus) txStatus;
         mapping(bytes32 => mapping(uint256 => ContractTransactionState.Data)) states;
         IContractModule contractModule;

src/core/Authenticator.sol

@@ -100,8 +100,8 @@ abstract contract DelegatedLogicHandler is TxAuthManagerBase, TxManagerBase, Pac
         _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.createTx.selector, txID, src));
     }
 
-    function _runTxIfCompleted(bytes32 txID) internal virtual override {
-        _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.runTxIfCompleted.selector, txID));
+    function _runTxIfCompleted(bytes32 txID, MsgInitiateTx.Data calldata msg_) internal virtual override {
+        _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.runTxIfCompleted.selector, txID, msg_));
     }
 
     function _isTxRecorded(bytes32 txID) internal view virtual override returns (bool) {

src/core/Coordinator.sol

@@ -5,8 +5,11 @@ import {
     QueryCoordinatorStateRequest,
     QueryCoordinatorStateResponse
 } from "../proto/cross/core/atomic/simple/AtomicSimple.sol";
+import {MsgInitiateTx} from "../proto/cross/core/initiator/Initiator.sol";
 
 interface ICoordinator {
+    function executeTx(MsgInitiateTx.Data calldata msg_) external;
+
     function coordinatorState(QueryCoordinatorStateRequest.Data calldata req)
         external
         view

src/core/CrossStore.sol

@@ -9,12 +9,14 @@ interface ICrossError {
     error MessageTimeoutHeight(uint256 blockNumber, uint64 timeoutVersionHeight);
     error MessageTimeoutTimestamp(uint256 blockTimestamp, uint64 timeoutTimestamp);
     error TxIDAlreadyExists(bytes32 txIDHash);
+    error TxIDNotFound(bytes32 txIDHash);
     error AuthStateAlreadyInitialized(bytes32 txID);
     error IDNotFound(bytes32 txID);
     error InvalidTxIDLength();
     error InvalidSignersLength();
     error SignerMustEqualSender();
     error AuthAlreadyCompleted(bytes32 txID);
+    error AuthNotCompleted(bytes32 txID);
     error TxAlreadyExists(bytes32 txID);
     error TxAlreadyVerified(bytes32 txID);
     error CoordinatorStateNotFound(bytes32 txID);