fix proposeAppVersion to always set false initially to AppInfo.consumed

Signed-off-by: Masanori Yoshida <[email protected]>
datachainlab · Oct 8, 2024 · 4316b5e · 4316b5e
1 parent b21d1fb
commit 4316b5e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/contracts/IBCContractUpgradableModule.sol b/contracts/IBCContractUpgradableModule.sol
@@ -44,12 +44,12 @@ abstract contract IBCContractUpgradableModuleBase is
     /**
      * @dev See {IIBCContractUpgradableModule-proposeAppVersion}
      */
-    function proposeAppVersion(string calldata version, AppInfo calldata appInfo_)
+    function proposeAppVersion(string calldata version, address implementation, bytes calldata initialCalldata)
         external
         override(IIBCContractUpgradableModule)
         onlyContractUpgrader
     {
-        if (appInfo_.implementation == address(0)) {
+        if (implementation == address(0)) {
             revert IBCContractUpgradableModuleAppInfoProposedWithZeroImpl();
         }
 
@@ -58,7 +58,11 @@ abstract contract IBCContractUpgradableModuleBase is
             revert IBCContractUpgradableModuleAppInfoIsAlreadySet();
         }
 
-        appInfos[version] = appInfo_;
+        appInfos[version] = AppInfo({
+            implementation: implementation,
+            initialCalldata: initialCalldata,
+            consumed: false
+        });
     }
 
     /**

diff --git a/contracts/IIBCContractUpgradableModule.sol b/contracts/IIBCContractUpgradableModule.sol
@@ -40,7 +40,7 @@ interface IIBCContractUpgradableModule {
      *         To upgrade the IBC module contract along with a channel upgrade, the upgrader must
      *         call this function before calling `channelUpgradeInit` or `channelUpgradeTry` of the IBC handler.
      */
-    function proposeAppVersion(string calldata version, AppInfo calldata appInfo) external;
+    function proposeAppVersion(string calldata version, address implementation, bytes calldata initialCalldata) external;
 
 }
 
diff --git a/pkg/contract/iibccontractupgradablemodule/iibccontractupgradablemodule.go b/pkg/contract/iibccontractupgradablemodule/iibccontractupgradablemodule.go
diff --git a/pkg/relay/ethereum/upgrade.go b/pkg/relay/ethereum/upgrade.go
@@ -136,10 +136,8 @@ func (c *Chain) ProposeAppVersion(
 	tx, err := mockApp.ProposeAppVersion(
 		txOpts,
 		version,
-		iibccontractupgradablemodule.IIBCContractUpgradableModuleAppInfo{
-			Implementation:  implementation,
-			InitialCalldata: initialCalldata,
-		},
+		implementation,
+		initialCalldata,
 	)
 
 	return processSendTxResult(ctx, logger, c, tx, err)