Merge pull request #56 from siburu/fix-proposeAppVersion

siburu · web-flow · commit c5ad4ff4bafc · 2024-10-16T11:28:22.000+09:00
Fix proposeAppVersion to always set false initially to AppVersion.consumed
diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@ This provides the ethereum chain module of [yui-relayer](https://github.com/hype
 
 ## Compatibility
 
-This module is compatible with [ibc-solidity v0.3.23](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.23).
+This module is compatible with [ibc-solidity v0.3.39](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.39).
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/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "author": "Datachain, Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.35",
+    "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.39",
     "@openzeppelin/contracts-upgradeable": "^5.0.2"
   }
 }
diff --git a/pkg/contract/ibchandler/ibchandler.go b/pkg/contract/ibchandler/ibchandler.go
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)
diff --git a/yui-ibc-solidity b/yui-ibc-solidity
@@ -1 +1 @@
-Subproject commit cd49bc000d99b498026706ed028a89123a8e05a2
+Subproject commit 0e83dc7aadf71380dae6e346492e148685510663

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ This provides the ethereum chain module of [yui-relayer](https://github.com/hype`
`4`	`4`
`5`	`5`	`## Compatibility`
`6`	`6`
`7`		`-This module is compatible with [ibc-solidity v0.3.23](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.23).`
	`7`	`+This module is compatible with [ibc-solidity v0.3.39](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.39).`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ abstract contract IBCContractUpgradableModuleBase is`
`44`	`44`	`/**`
`45`	`45`	`* @dev See {IIBCContractUpgradableModule-proposeAppVersion}`
`46`	`46`	`*/`
`47`		`- function proposeAppVersion(string calldata version, AppInfo calldata appInfo_)`
	`47`	`+ function proposeAppVersion(string calldata version, address implementation, bytes calldata initialCalldata)`
`48`	`48`	`external`
`49`	`49`	`override(IIBCContractUpgradableModule)`
`50`	`50`	`onlyContractUpgrader`
`51`	`51`	`{`
`52`		`- if (appInfo_.implementation == address(0)) {`
	`52`	`+ if (implementation == address(0)) {`
`53`	`53`	`revert IBCContractUpgradableModuleAppInfoProposedWithZeroImpl();`
`54`	`54`	`}`
`55`	`55`
`@@ -58,7 +58,11 @@ abstract contract IBCContractUpgradableModuleBase is`
`58`	`58`	`revert IBCContractUpgradableModuleAppInfoIsAlreadySet();`
`59`	`59`	`}`
`60`	`60`
`61`		`- appInfos[version] = appInfo_;`
	`61`	`+ appInfos[version] = AppInfo({`
	`62`	`+ implementation: implementation,`
	`63`	`+ initialCalldata: initialCalldata,`
	`64`	`+ consumed: false`
	`65`	`+ });`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ interface IIBCContractUpgradableModule {`
`40`	`40`	`* To upgrade the IBC module contract along with a channel upgrade, the upgrader must`
`41`	`41`	* call this function before calling `channelUpgradeInit` or `channelUpgradeTry` of the IBC handler.
`42`	`42`	`*/`
`43`		`- function proposeAppVersion(string calldata version, AppInfo calldata appInfo) external;`
	`43`	`+ function proposeAppVersion(string calldata version, address implementation, bytes calldata initialCalldata) external;`
`44`	`44`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"author": "Datachain, Inc.",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"dependencies": {`
`7`		`- "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.35",`
	`7`	`+ "@hyperledger-labs/yui-ibc-solidity": "git+https://github.com/hyperledger-labs/yui-ibc-solidity.git#semver:v0.3.39",`
`8`	`8`	`"@openzeppelin/contracts-upgradeable": "^5.0.2"`
`9`	`9`	`}`
`10`	`10`	`}`