delete-txMsg

YukiTsuchida · YukiTsuchida · commit a76e726f3b32 · 2026-01-06T13:07:37.000+09:00
diff --git a/src/core/Authenticator.sol b/src/core/Authenticator.sol
@@ -36,9 +36,6 @@ abstract contract Authenticator is IAuthenticator, TxAuthManagerBase, TxManagerB
         Account.Data[] memory accounts = _buildLocalAccounts(msg_.signers);
 
         bool completed = _sign(txID, accounts);
-        if (completed) {
-            _runTxIfCompleted(txID);
-        }
 
         emit TxSigned(msg.sender, txID, AuthType.AuthMode.AUTH_MODE_LOCAL);
 
@@ -50,10 +47,7 @@ abstract contract Authenticator is IAuthenticator, TxAuthManagerBase, TxManagerB
 
         _verifySignatures(txID, msg_.signers);
 
-        bool completed = _sign(txID, msg_.signers);
-        if (completed) {
-            _runTxIfCompleted(txID);
-        }
+        _sign(txID, msg_.signers);
 
         emit TxSigned(msg.sender, txID, AuthType.AuthMode.AUTH_MODE_EXTENSION);
 
diff --git a/src/core/Coordinator.sol b/src/core/Coordinator.sol
@@ -3,15 +3,39 @@ 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 {
     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 {
+    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 txIDHash = sha256(MsgInitiateTx.encode(msg_));
+
+        if (!_isTxRecorded(txIDHash)) revert TxIDNotFound(txIDHash);
+
+        if (!_isCompletedAuth(txIDHash)) revert AuthNotCompleted(txIDHash);
+
+        _runTxIfCompleted(msg_);
+
+        emit TxExecuted(abi.encodePacked(txIDHash), msg.sender);
+    }
 
-abstract contract Coordinator is TxManagerBase, ICoordinator, ICrossError {
     function coordinatorState(QueryCoordinatorStateRequest.Data calldata req)
         external
         view
diff --git a/src/core/CrossStore.sol b/src/core/CrossStore.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;
diff --git a/src/core/DelegatedLogicHandler.sol b/src/core/DelegatedLogicHandler.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(MsgInitiateTx.Data calldata msg_) internal virtual override {
+        _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.runTxIfCompleted.selector, msg_));
     }
 
     function _isTxRecorded(bytes32 txID) internal view virtual override returns (bool) {
diff --git a/src/core/ICoordinator.sol b/src/core/ICoordinator.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
diff --git a/src/core/ICrossError.sol b/src/core/ICrossError.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);
diff --git a/src/core/ICrossEvent.sol b/src/core/ICrossEvent.sol
@@ -9,4 +9,5 @@ interface ICrossEvent {
     event OnAbort(bytes indexed txID, uint8 indexed txIndex);
     event TxSigned(address indexed signer, bytes32 indexed txID, AuthType.AuthMode method);
     event TxInitiated(bytes txID, address indexed proposer);
+    event TxExecuted(bytes txID, address indexed proposer);
 }
diff --git a/src/core/ITxManager.sol b/src/core/ITxManager.sol
@@ -10,7 +10,7 @@ import {IIBCHandler} from "@hyperledger-labs/yui-ibc-solidity/contracts/core/25-
 interface ITxManager {
     function initialize(IIBCHandler handler, IContractModule module) external;
     function createTx(bytes32 txID, MsgInitiateTx.Data calldata src) external;
-    function runTxIfCompleted(bytes32 txID) external;
+    function runTxIfCompleted(MsgInitiateTx.Data calldata msg_) external;
     function isTxRecorded(bytes32 txID) external view returns (bool);
     function getCoordinatorState(bytes32 txID) external view returns (CoordinatorState.Data memory);
     function handlePacket(Packet calldata packet) external returns (bytes memory acknowledgement);
diff --git a/src/core/Initiator.sol b/src/core/Initiator.sol
@@ -58,7 +58,6 @@ abstract contract Initiator is IInitiator, TxAuthManagerBase, TxManagerBase, Ree
         emit TxInitiated(txID, msg.sender);
 
         if (completed) {
-            _runTxIfCompleted(txIDHash);
             return MsgInitiateTxResponse.Data({
                 txID: txID, status: MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED
             });
diff --git a/src/core/TxAtomicSimple.sol b/src/core/TxAtomicSimple.sol
@@ -49,7 +49,7 @@ abstract contract TxAtomicSimple is
     uint8 private constant TX_INDEX_COORDINATOR = 0;
     uint8 private constant TX_INDEX_PARTICIPANT = 1;
 
-    function _runTx(bytes32 txID, MsgInitiateTx.Data storage msg_) internal virtual override {
+    function _runTx(bytes32 txID, MsgInitiateTx.Data calldata msg_) internal virtual override {
         if (msg_.commit_protocol == Tx.CommitProtocol.COMMIT_PROTOCOL_SIMPLE) {
             _runSimpleProtocol(txID, msg_);
         } else if (msg_.commit_protocol == Tx.CommitProtocol.COMMIT_PROTOCOL_TPC) {
@@ -59,7 +59,7 @@ abstract contract TxAtomicSimple is
         }
     }
 
-    function _runSimpleProtocol(bytes32 txID, MsgInitiateTx.Data storage msg_) internal {
+    function _runSimpleProtocol(bytes32 txID, MsgInitiateTx.Data calldata msg_) internal {
         CoordStorage storage coordStorage = _getCoordStorage();
         TxStorage storage txStorage = _getTxStorage();
 
@@ -82,8 +82,8 @@ abstract contract TxAtomicSimple is
 
         // --- 2. Setup Transaction & XCC ---
 
-        ContractTransaction.Data storage tx0 = msg_.contract_transactions[TX_INDEX_COORDINATOR];
-        ContractTransaction.Data storage tx1 = msg_.contract_transactions[TX_INDEX_PARTICIPANT];
+        ContractTransaction.Data calldata tx0 = msg_.contract_transactions[TX_INDEX_COORDINATOR];
+        ContractTransaction.Data calldata tx1 = msg_.contract_transactions[TX_INDEX_PARTICIPANT];
 
         // Simple protocol does not support links
         if (tx0.links.length > 0 || tx1.links.length > 0) {
@@ -418,11 +418,10 @@ abstract contract TxAtomicSimple is
             revert ModuleNotInitialized();
         }
 
-        MsgInitiateTx.Data storage msg_ = txStorage.txMsg[txID];
-        ContractTransaction.Data storage coordTx = msg_.contract_transactions[TX_INDEX_COORDINATOR];
+        Account.Data[] storage txCoordSigners = txStorage.txCoordSigners[txID];
 
         CrossContext memory ctx =
-            CrossContext({txID: abi.encodePacked(txID), txIndex: TX_INDEX_COORDINATOR, signers: coordTx.signers});
+            CrossContext({txID: abi.encodePacked(txID), txIndex: TX_INDEX_COORDINATOR, signers: txCoordSigners});
 
         if (isCommittable) {
             // Commit
diff --git a/src/core/TxManager.sol b/src/core/TxManager.sol
@@ -35,8 +35,8 @@ contract TxManager is
         _createTx(txID, src);
     }
 
-    function runTxIfCompleted(bytes32 txID) external override nonReentrant {
-        _runTxIfCompleted(txID);
+    function runTxIfCompleted(MsgInitiateTx.Data calldata msg_) external override nonReentrant {
+        _runTxIfCompleted(msg_);
     }
 
     function isTxRecorded(bytes32 txID) external view override returns (bool) {
@@ -64,16 +64,21 @@ contract TxManager is
         if (t.txStatus[txID] != MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_UNKNOWN) {
             revert TxAlreadyExists(txID);
         }
-        _deepStoreMsg(t, txID, src);
+
+        if (src.contract_transactions.length > 0) {
+            _storeCoordSigners(t, txID, src.contract_transactions[0].signers);
+        }
+
         t.txStatus[txID] = MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_PENDING;
     }
 
-    function _runTxIfCompleted(bytes32 txID) internal virtual override {
+    function _runTxIfCompleted(MsgInitiateTx.Data calldata msg_) internal virtual override {
+        bytes32 txIDHash = sha256(MsgInitiateTx.encode(msg_));
         CrossStore.TxStorage storage t = _getTxStorage();
-        if (!_isTxRecorded(txID)) return;
-        if (t.txStatus[txID] == MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED) return;
-        t.txStatus[txID] = MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED;
-        _runTx(txID, t.txMsg[txID]);
+        if (!_isTxRecorded(txIDHash)) return;
+        if (t.txStatus[txIDHash] == MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED) return;
+        t.txStatus[txIDHash] = MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED;
+        _runTx(txIDHash, msg_);
     }
 
     function _isTxRecorded(bytes32 txID) internal view virtual override returns (bool) {
@@ -89,38 +94,11 @@ contract TxManager is
         return s.states[txID];
     }
 
-    function _deepStoreMsg(CrossStore.TxStorage storage t, bytes32 txID, MsgInitiateTx.Data calldata src) private {
-        MsgInitiateTx.Data storage dst = t.txMsg[txID];
-        dst.chain_id = src.chain_id;
-        dst.nonce = src.nonce;
-        dst.commit_protocol = src.commit_protocol;
-        dst.timeout_height = src.timeout_height;
-        dst.timeout_timestamp = src.timeout_timestamp;
-        _copyAccounts(src.signers, dst.signers);
-        _copyContractTxs(src.contract_transactions, dst.contract_transactions);
-    }
-
-    function _copyAccounts(Account.Data[] calldata src, Account.Data[] storage dst) private {
-        while (dst.length > 0) dst.pop();
-        for (uint256 i = 0; i < src.length; ++i) {
-            dst.push(src[i]);
-        }
-    }
-
-    function _copyContractTxs(ContractTransaction.Data[] calldata src, ContractTransaction.Data[] storage dst) private {
+    function _storeCoordSigners(CrossStore.TxStorage storage t, bytes32 txID, Account.Data[] calldata signers) private {
+        Account.Data[] storage dst = t.txCoordSigners[txID];
         while (dst.length > 0) dst.pop();
-        for (uint256 i = 0; i < src.length; ++i) {
-            dst.push();
-            ContractTransaction.Data storage d = dst[i];
-            ContractTransaction.Data calldata s = src[i];
-            d.cross_chain_channel = s.cross_chain_channel;
-            _copyAccounts(s.signers, d.signers);
-            d.call_info = s.call_info;
-            d.return_value = s.return_value;
-            while (d.links.length > 0) d.links.pop();
-            for (uint256 j = 0; j < s.links.length; ++j) {
-                d.links.push(s.links[j]);
-            }
+        for (uint256 i = 0; i < signers.length; ++i) {
+            dst.push(signers[i]);
         }
     }
 
diff --git a/src/core/TxManagerBase.sol b/src/core/TxManagerBase.sol
@@ -4,9 +4,11 @@ pragma solidity ^0.8.20;
 import {MsgInitiateTx} from "../proto/cross/core/initiator/Initiator.sol";
 import {CoordinatorState} from "../proto/cross/core/atomic/simple/AtomicSimple.sol";
 
+import {MsgInitiateTx} from "../proto/cross/core/initiator/Initiator.sol";
+
 abstract contract TxManagerBase {
     function _createTx(bytes32 txID, MsgInitiateTx.Data calldata src) internal virtual;
-    function _runTxIfCompleted(bytes32 txID) internal virtual;
+    function _runTxIfCompleted(MsgInitiateTx.Data calldata msg_) internal virtual;
     function _isTxRecorded(bytes32 txID) internal view virtual returns (bool);
     function _getCoordinatorState(bytes32 txID) internal view virtual returns (CoordinatorState.Data memory);
 }
diff --git a/src/core/TxRunnerBase.sol b/src/core/TxRunnerBase.sol
@@ -4,5 +4,5 @@ pragma solidity ^0.8.20;
 import {MsgInitiateTx} from "../proto/cross/core/initiator/Initiator.sol";
 
 abstract contract TxRunnerBase {
-    function _runTx(bytes32 txID, MsgInitiateTx.Data storage msg_) internal virtual;
+    function _runTx(bytes32 txID, MsgInitiateTx.Data calldata msg_) internal virtual;
 }
diff --git a/test/Authenticator.t.sol b/test/Authenticator.t.sol
@@ -38,7 +38,8 @@ contract MockTxManager is TxManagerBase {
         override
     {}
 
-    function _runTxIfCompleted(bytes32 txID) internal virtual override {
+    function _runTxIfCompleted(MsgInitiateTx.Data calldata msg_) internal virtual override {
+        bytes32 txID = sha256(MsgInitiateTx.encode(msg_));
         lastRunTxID = txID;
         ++runTxCount;
     }
diff --git a/test/Coordinator.t.sol b/test/Coordinator.t.sol
@@ -5,6 +5,7 @@ pragma solidity ^0.8.20;
 import "forge-std/src/Test.sol";
 import "../src/core/Coordinator.sol";
 import "../src/core/TxManagerBase.sol";
+import "../src/core/TxAuthManagerBase.sol";
 import {ICrossError} from "../src/core/ICrossError.sol";
 import {
     QueryCoordinatorStateRequest,
@@ -31,14 +32,38 @@ contract MockTxManager is TxManagerBase, ICrossError {
     }
 
     function _createTx(bytes32, MsgInitiateTx.Data calldata) internal virtual override {}
-    function _runTxIfCompleted(bytes32) internal virtual override {}
+    function _runTxIfCompleted(MsgInitiateTx.Data calldata) internal virtual override {}
 
     function _isTxRecorded(bytes32) internal view virtual override returns (bool) {
         return false;
     }
 }
 
-contract CoordinatorHarness is Coordinator, MockTxManager {}
+contract MockTxAuthManager is TxAuthManagerBase {
+    mapping(bytes32 => bool) internal completedAuths;
+
+    function setCompletedAuth(bytes32 txID, bool completed) public {
+        completedAuths[txID] = completed;
+    }
+
+    function _initAuthState(bytes32, Account.Data[] memory) internal virtual override {}
+
+    function _sign(bytes32, Account.Data[] memory) internal virtual override returns (bool) {
+        return true;
+    }
+
+    function _getAuthState(bytes32) internal view virtual override returns (TxAuthState.Data memory) {
+        TxAuthState.Data memory state;
+        return state;
+    }
+    function _verifySignatures(bytes32, Account.Data[] calldata) internal virtual override {}
+
+    function _isCompletedAuth(bytes32 txID) internal view virtual override returns (bool) {
+        return completedAuths[txID];
+    }
+}
+
+contract CoordinatorHarness is Coordinator, MockTxManager, MockTxAuthManager {}
 
 contract CoordinatorTest is Test, ICrossError {
     CoordinatorHarness private harness;
diff --git a/test/DelegatedLogicHandler.t.sol b/test/DelegatedLogicHandler.t.sol
@@ -96,7 +96,8 @@ contract MockTxManager is ITxManager, MockStore {
         txStorage.nonce[txID] = src.nonce;
     }
 
-    function runTxIfCompleted(bytes32 txID) external override {
+    function runTxIfCompleted(MsgInitiateTx.Data calldata msg_) external override {
+        bytes32 txID = sha256(MsgInitiateTx.encode(msg_));
         txStorage.status[txID] = MsgInitiateTxResponse.InitiateTxStatus.INITIATE_TX_STATUS_VERIFIED;
         txStorage.nonce[txID] = 1;
     }
@@ -183,8 +184,8 @@ contract DelegatedLogicHandlerHarness is DelegatedLogicHandler, MockStore {
         _createTx(txID, src);
     }
 
-    function exposed_runTxIfCompleted(bytes32 txID) public {
-        _runTxIfCompleted(txID);
+    function exposed_runTxIfCompleted(MsgInitiateTx.Data calldata msg_) public {
+        _runTxIfCompleted(msg_);
     }
 
     function exposed_isTxRecorded(bytes32 txID) public returns (bool) {
@@ -357,7 +358,7 @@ contract DelegatedLogicHandlerTest is Test, ICrossError {
     }
 
     function test_runTxIfCompleted_DelegatesToTxManager() public {
-        harness.exposed_runTxIfCompleted(txID);
+        harness.exposed_runTxIfCompleted(txMsg);
 
         assertEq(
             uint256(harness.readTx_status(txID)),
diff --git a/test/Initiator.t.sol b/test/Initiator.t.sol
@@ -35,7 +35,8 @@ contract MockTxManager is TxManagerBase {
         ++createTxCount;
     }
 
-    function _runTxIfCompleted(bytes32 txID) internal virtual override {
+    function _runTxIfCompleted(MsgInitiateTx.Data calldata msg_) internal virtual override {
+        bytes32 txID = sha256(MsgInitiateTx.encode(msg_));
         lastRuntxID = txID;
         ++runTxCount;
     }
diff --git a/test/TxAtomicSimple.t.sol b/test/TxAtomicSimple.t.sol
diff --git a/test/TxManager.t.sol b/test/TxManager.t.sol

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ abstract contract CrossStore {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`struct TxStorage {`
`33`		`- mapping(bytes32 => MsgInitiateTx.Data) txMsg;`
	`33`	`+ mapping(bytes32 => Account.Data[]) txCoordSigners;`
`34`	`34`	`mapping(bytes32 => MsgInitiateTxResponse.InitiateTxStatus) txStatus;`
`35`	`35`	`mapping(bytes32 => mapping(uint256 => ContractTransactionState.Data)) states;`
`36`	`36`	`IContractModule contractModule;`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ abstract contract DelegatedLogicHandler is TxAuthManagerBase, TxManagerBase, Pac`
`100`	`100`	`_delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.createTx.selector, txID, src));`
`101`	`101`	`}`
`102`	`102`
`103`		`- function _runTxIfCompleted(bytes32 txID) internal virtual override {`
`104`		`- _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.runTxIfCompleted.selector, txID));`
	`103`	`+ function _runTxIfCompleted(MsgInitiateTx.Data calldata msg_) internal virtual override {`
	`104`	`+ _delegateWithData(TX_MANAGER, abi.encodeWithSelector(ITxManager.runTxIfCompleted.selector, msg_));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`function _isTxRecorded(bytes32 txID) internal view virtual override returns (bool) {`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ interface ICrossEvent {`
`9`	`9`	`event OnAbort(bytes indexed txID, uint8 indexed txIndex);`
`10`	`10`	`event TxSigned(address indexed signer, bytes32 indexed txID, AuthType.AuthMode method);`
`11`	`11`	`event TxInitiated(bytes txID, address indexed proposer);`
	`12`	`+ event TxExecuted(bytes txID, address indexed proposer);`
`12`	`13`	`}`