Merge 0b3fe74 into e4d6d35

Author: YukiTsuchida

src/core/IInitiator.sol

@@ -8,7 +8,6 @@ interface IInitiator {
     error MessageTimeoutHeight(uint256 blockNumber, uint64 timeoutVersionHeight);
     error MessageTimeoutTimestamp(uint256 blockTimestamp, uint64 timeoutTimestamp);
     error TxIDAlreadyExists(bytes32 txIDHash);
-    error SelfXCCNotImplemented();
 
     event TxInitiated(bytes txID, address indexed proposer);
 

src/core/Initiator.sol

@@ -9,6 +9,9 @@ import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {MsgInitiateTx, MsgInitiateTxResponse, QuerySelfXCCResponse} from "../proto/cross/core/initiator/Initiator.sol";
 import {Account} from "../proto/cross/core/auth/Auth.sol";
 
+import {GoogleProtobufAny} from "@hyperledger-labs/yui-ibc-solidity/contracts/proto/GoogleProtobufAny.sol";
+import {ChannelInfo} from "../proto/cross/core/xcc/XCC.sol";
+
 abstract contract Initiator is IInitiator, TxAuthManagerBase, TxManagerBase {
     bytes32 public immutable CHAIN_ID_HASH;
 
@@ -62,7 +65,14 @@ abstract contract Initiator is IInitiator, TxAuthManagerBase, TxManagerBase {
     }
 
     function selfXCC() external view virtual override returns (QuerySelfXCCResponse.Data memory) {
-        revert IInitiator.SelfXCCNotImplemented();
+        ChannelInfo.Data memory selfXCC = ChannelInfo.Data({port: "", channel: ""});
+
+        string memory typeURL = "/cross.core.xcc.ChannelInfo";
+        bytes memory value = ChannelInfo.encode(selfXCC);
+
+        GoogleProtobufAny.Data memory anyXCC = GoogleProtobufAny.Data({type_url: typeURL, value: value});
+
+        return QuerySelfXCCResponse.Data({xcc: anyXCC});
     }
 
     function _getRequiredAccounts(MsgInitiateTx.Data calldata msg_) internal pure returns (Account.Data[] memory out) {

test/Initiator.t.sol

@@ -11,12 +11,14 @@ import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {
     MsgInitiateTx,
     MsgInitiateTxResponse,
-    ContractTransaction
+    ContractTransaction,
+    QuerySelfXCCResponse
 } from "../src/proto/cross/core/initiator/Initiator.sol";
 import {Account as AuthAccount, AuthType, TxAuthState} from "../src/proto/cross/core/auth/Auth.sol";
 import {GoogleProtobufAny} from "@hyperledger-labs/yui-ibc-solidity/contracts/proto/GoogleProtobufAny.sol";
 import {Tx} from "../src/proto/cross/core/tx/Tx.sol";
 import {IbcCoreClientV1Height} from "../src/proto/ibc/core/client/v1/client.sol";
+import {ChannelInfo} from "../src/proto/cross/core/xcc/XCC.sol";
 
 contract MockTxManager is TxManagerBase {
     mapping(bytes32 => bool) public txExists;
@@ -128,9 +130,14 @@ contract InitiatorTest is Test {
         assertEq(harness.CHAIN_ID_HASH(), expected, "CHAIN_ID_HASH mismatch");
     }
 
-    function test_selfXCC_RevertWhen_Always() public {
-        vm.expectRevert(IInitiator.SelfXCCNotImplemented.selector);
-        harness.selfXCC();
+    function test_selfXCC_ReturnsCorrectData() public view {
+        string memory expectedTypeURL = "/cross.core.xcc.ChannelInfo";
+        bytes memory expectedValue = ChannelInfo.encode(ChannelInfo.Data({port: "", channel: ""}));
+
+        QuerySelfXCCResponse.Data memory resp = harness.selfXCC();
+
+        assertEq(resp.xcc.type_url, expectedTypeURL, "type_url mismatch");
+        assertEq(resp.xcc.value, expectedValue, "value mismatch");
     }
 
     function test_initiateTx_SucceedsAsPendingWhenSignersNotMet() public {