rename uch openChannel -> triggerChannelInit

open-ibc · Oct 23, 2024 · ded40ae · ded40ae
1 parent d2c9eae
commit ded40ae
Show file tree

Hide file tree

Showing 10 changed files with 183 additions and 183 deletions.
diff --git a/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go b/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go
diff --git a/bindings/go/universalchannelhandler/UniversalChannelHandler.go b/bindings/go/universalchannelhandler/UniversalChannelHandler.go
diff --git a/contracts/core/UniversalChannelHandler.sol b/contracts/core/UniversalChannelHandler.sol
@@ -59,7 +59,7 @@ contract UniversalChannelHandler is IbcReceiverBaseUpgradeable, FeeSender, UUPSU
 
     function onChanCloseConfirm(bytes32 channelId, string calldata, bytes32) external onlyIbcDispatcher {}
 
-    function openChannel(
+    function triggerChannelInit(
         string calldata version,
         ChannelOrder ordering,
         bool feeEnabled,

diff --git a/contracts/interfaces/IUniversalChannelHandler.sol b/contracts/interfaces/IUniversalChannelHandler.sol
@@ -23,7 +23,7 @@ import {ChannelOrder} from "../libs/Ibc.sol";
 
 interface IUniversalChannelHandler is IbcUniversalChannelMW {
     function registerMwStack(uint256 mwBitmap, address[] calldata mwAddrs) external;
-    function openChannel(
+    function triggerChannelInit(
         string calldata version,
         ChannelOrder ordering,
         bool feeEnabled,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@open-ibc/vibc-core-smart-contracts",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "main": "dist/index.js",
   "bin": {
     "verify-vibc-core-smart-contracts": "./dist/scripts/verify-contract-script.js",

diff --git a/src/evm/contracts/IUniversalChannelHandler.ts b/src/evm/contracts/IUniversalChannelHandler.ts
@@ -84,11 +84,11 @@ export interface IUniversalChannelHandlerInterface extends Interface {
       | "onChanOpenTry"
       | "onRecvPacket"
       | "onTimeoutPacket"
-      | "openChannel"
       | "registerMwStack"
       | "sendUniversalPacket"
       | "sendUniversalPacketWithFee"
       | "setDispatcher"
+      | "triggerChannelInit"
   ): FunctionFragment;
 
   encodeFunctionData(functionFragment: "MW_ID", values?: undefined): string;
@@ -132,10 +132,6 @@ export interface IUniversalChannelHandlerInterface extends Interface {
     functionFragment: "onTimeoutPacket",
     values: [IbcPacketStruct]
   ): string;
-  encodeFunctionData(
-    functionFragment: "openChannel",
-    values: [string, BigNumberish, boolean, string[], string]
-  ): string;
   encodeFunctionData(
     functionFragment: "registerMwStack",
     values: [BigNumberish, AddressLike[]]
@@ -159,6 +155,10 @@ export interface IUniversalChannelHandlerInterface extends Interface {
     functionFragment: "setDispatcher",
     values: [AddressLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "triggerChannelInit",
+    values: [string, BigNumberish, boolean, string[], string]
+  ): string;
 
   decodeFunctionResult(functionFragment: "MW_ID", data: BytesLike): Result;
   decodeFunctionResult(
@@ -198,10 +198,6 @@ export interface IUniversalChannelHandlerInterface extends Interface {
     functionFragment: "onTimeoutPacket",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "openChannel",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(
     functionFragment: "registerMwStack",
     data: BytesLike
@@ -218,6 +214,10 @@ export interface IUniversalChannelHandlerInterface extends Interface {
     functionFragment: "setDispatcher",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "triggerChannelInit",
+    data: BytesLike
+  ): Result;
 }
 
 export interface IUniversalChannelHandler extends BaseContract {
@@ -341,18 +341,6 @@ export interface IUniversalChannelHandler extends BaseContract {
     "nonpayable"
   >;
 
-  openChannel: TypedContractMethod<
-    [
-      version: string,
-      ordering: BigNumberish,
-      feeEnabled: boolean,
-      connectionHops: string[],
-      counterpartyPortIdentifier: string
-    ],
-    [void],
-    "nonpayable"
-  >;
-
   registerMwStack: TypedContractMethod<
     [mwBitmap: BigNumberish, mwAddrs: AddressLike[]],
     [void],
@@ -389,6 +377,18 @@ export interface IUniversalChannelHandler extends BaseContract {
     "nonpayable"
   >;
 
+  triggerChannelInit: TypedContractMethod<
+    [
+      version: string,
+      ordering: BigNumberish,
+      feeEnabled: boolean,
+      connectionHops: string[],
+      counterpartyPortIdentifier: string
+    ],
+    [void],
+    "nonpayable"
+  >;
+
   getFunction<T extends ContractMethod = ContractMethod>(
     key: string | FunctionFragment
   ): T;
@@ -466,19 +466,6 @@ export interface IUniversalChannelHandler extends BaseContract {
   getFunction(
     nameOrSignature: "onTimeoutPacket"
   ): TypedContractMethod<[packet: IbcPacketStruct], [void], "nonpayable">;
-  getFunction(
-    nameOrSignature: "openChannel"
-  ): TypedContractMethod<
-    [
-      version: string,
-      ordering: BigNumberish,
-      feeEnabled: boolean,
-      connectionHops: string[],
-      counterpartyPortIdentifier: string
-    ],
-    [void],
-    "nonpayable"
-  >;
   getFunction(
     nameOrSignature: "registerMwStack"
   ): TypedContractMethod<
@@ -515,6 +502,19 @@ export interface IUniversalChannelHandler extends BaseContract {
   getFunction(
     nameOrSignature: "setDispatcher"
   ): TypedContractMethod<[dispatcher: AddressLike], [void], "nonpayable">;
+  getFunction(
+    nameOrSignature: "triggerChannelInit"
+  ): TypedContractMethod<
+    [
+      version: string,
+      ordering: BigNumberish,
+      feeEnabled: boolean,
+      connectionHops: string[],
+      counterpartyPortIdentifier: string
+    ],
+    [void],
+    "nonpayable"
+  >;
 
   filters: {};
 }
diff --git a/src/evm/contracts/UniversalChannelHandler.ts b/src/evm/contracts/UniversalChannelHandler.ts
@@ -89,7 +89,6 @@ export interface UniversalChannelHandlerInterface extends Interface {
       | "onChanOpenTry"
       | "onRecvPacket"
       | "onTimeoutPacket"
-      | "openChannel"
       | "owner"
       | "pendingOwner"
       | "proxiableUUID"
@@ -98,6 +97,7 @@ export interface UniversalChannelHandlerInterface extends Interface {
       | "sendUniversalPacketWithFee"
       | "setDispatcher"
       | "transferOwnership"
+      | "triggerChannelInit"
       | "upgradeTo"
       | "upgradeToAndCall"
   ): FunctionFragment;
@@ -163,10 +163,6 @@ export interface UniversalChannelHandlerInterface extends Interface {
     functionFragment: "onTimeoutPacket",
     values: [IbcPacketStruct]
   ): string;
-  encodeFunctionData(
-    functionFragment: "openChannel",
-    values: [string, BigNumberish, boolean, string[], string]
-  ): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
   encodeFunctionData(
     functionFragment: "pendingOwner",
@@ -203,6 +199,10 @@ export interface UniversalChannelHandlerInterface extends Interface {
     functionFragment: "transferOwnership",
     values: [AddressLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "triggerChannelInit",
+    values: [string, BigNumberish, boolean, string[], string]
+  ): string;
   encodeFunctionData(
     functionFragment: "upgradeTo",
     values: [AddressLike]
@@ -256,10 +256,6 @@ export interface UniversalChannelHandlerInterface extends Interface {
     functionFragment: "onTimeoutPacket",
     data: BytesLike
   ): Result;
-  decodeFunctionResult(
-    functionFragment: "openChannel",
-    data: BytesLike
-  ): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "pendingOwner",
@@ -289,6 +285,10 @@ export interface UniversalChannelHandlerInterface extends Interface {
     functionFragment: "transferOwnership",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "triggerChannelInit",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "upgradeTo", data: BytesLike): Result;
   decodeFunctionResult(
     functionFragment: "upgradeToAndCall",
@@ -507,18 +507,6 @@ export interface UniversalChannelHandler extends BaseContract {
     "nonpayable"
   >;
 
-  openChannel: TypedContractMethod<
-    [
-      version: string,
-      ordering: BigNumberish,
-      feeEnabled: boolean,
-      connectionHops: string[],
-      counterpartyPortIdentifier: string
-    ],
-    [void],
-    "nonpayable"
-  >;
-
   owner: TypedContractMethod<[], [string], "view">;
 
   pendingOwner: TypedContractMethod<[], [string], "view">;
@@ -563,6 +551,18 @@ export interface UniversalChannelHandler extends BaseContract {
     "nonpayable"
   >;
 
+  triggerChannelInit: TypedContractMethod<
+    [
+      version: string,
+      ordering: BigNumberish,
+      feeEnabled: boolean,
+      connectionHops: string[],
+      counterpartyPortIdentifier: string
+    ],
+    [void],
+    "nonpayable"
+  >;
+
   upgradeTo: TypedContractMethod<
     [newImplementation: AddressLike],
     [void],
@@ -657,19 +657,6 @@ export interface UniversalChannelHandler extends BaseContract {
   getFunction(
     nameOrSignature: "onTimeoutPacket"
   ): TypedContractMethod<[packet: IbcPacketStruct], [void], "nonpayable">;
-  getFunction(
-    nameOrSignature: "openChannel"
-  ): TypedContractMethod<
-    [
-      version: string,
-      ordering: BigNumberish,
-      feeEnabled: boolean,
-      connectionHops: string[],
-      counterpartyPortIdentifier: string
-    ],
-    [void],
-    "nonpayable"
-  >;
   getFunction(
     nameOrSignature: "owner"
   ): TypedContractMethod<[], [string], "view">;
@@ -714,6 +701,19 @@ export interface UniversalChannelHandler extends BaseContract {
   getFunction(
     nameOrSignature: "transferOwnership"
   ): TypedContractMethod<[newOwner: AddressLike], [void], "nonpayable">;
+  getFunction(
+    nameOrSignature: "triggerChannelInit"
+  ): TypedContractMethod<
+    [
+      version: string,
+      ordering: BigNumberish,
+      feeEnabled: boolean,
+      connectionHops: string[],
+      counterpartyPortIdentifier: string
+    ],
+    [void],
+    "nonpayable"
+  >;
   getFunction(
     nameOrSignature: "upgradeTo"
   ): TypedContractMethod<