Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ibc-solidity to v0.3.38 #55

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.38](https://github.com/hyperledger-labs/yui-ibc-solidity/releases/tag/v0.3.38).
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.38",
"@openzeppelin/contracts-upgradeable": "^5.0.2"
}
}
273 changes: 272 additions & 1 deletion pkg/contract/ibchandler/ibchandler.go

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/relay/ethereum/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ func proposeAppVersionCmd(ctx *config.Context) *cobra.Command {
return ethChain.ProposeAppVersion(
cmd.Context(),
ethChain.pathEnd.PortID,
ethChain.pathEnd.ChannelID,
version,
implementation,
initialCalldata,
Expand Down
4 changes: 3 additions & 1 deletion pkg/relay/ethereum/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,21 @@ func (c *Chain) AllowTransitionToFlushComplete(
func (c *Chain) ProposeAppVersion(
ctx context.Context,
portID string,
channelID string,
version string,
implementation common.Address,
initialCalldata []byte,
) error {
logger := c.GetChainLogger()
logger = &log.RelayLogger{Logger: logger.With(
logAttrPortID, portID,
logAttrChannelID, channelID,
logAttrVersion, version,
logAttrImplementation, implementation.Hex(),
logAttrInitialCalldata, hex.EncodeToString(initialCalldata),
)}

appAddr, err := c.ibcHandler.GetIBCModuleByPort(c.CallOpts(ctx, 0), portID)
appAddr, err := c.ibcHandler.GetIBCModuleByChannel(c.CallOpts(ctx, 0), portID, channelID)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion yui-ibc-solidity
Submodule yui-ibc-solidity updated 48 files
+58 −54 .gas-snapshot
+6 −0 .github/workflows/test.yml
+3 −0 .gitmodules
+9 −4 Makefile
+2 −0 contracts/apps/20-transfer/ICS20Bank.sol
+78 −35 contracts/apps/20-transfer/ICS20Lib.sol
+4 −4 contracts/apps/20-transfer/ICS20Transfer.sol
+21 −6 contracts/apps/commons/IBCAppBase.sol
+4 −4 contracts/apps/mock/IBCMockApp.sol
+185 −0 contracts/apps/mock/IBCMockAppFactory.sol
+18 −16 contracts/core/02-client/IBCClientLib.sol
+11 −13 contracts/core/04-channel/IBCChannelHandshake.sol
+3 −2 contracts/core/04-channel/IBCChannelPacketSendRecv.sol
+8 −6 contracts/core/04-channel/IBCChannelUpgrade.sol
+13 −4 contracts/core/24-host/IBCHostConfigurator.sol
+14 −16 contracts/core/24-host/IBCHostLib.sol
+3 −3 contracts/core/24-host/IIBCHostConfigurator.sol
+6 −1 contracts/core/24-host/IIBCHostErrors.sol
+9 −0 contracts/core/25-handler/IBCClientConnectionChannelHandler.sol
+1 −0 contracts/core/25-handler/IBCHandler.sol
+2 −2 contracts/core/25-handler/IBCQuerier.sol
+2 −0 contracts/core/25-handler/IIBCHandler.sol
+2 −2 contracts/core/25-handler/IIBCQuerier.sol
+2 −2 contracts/core/25-handler/OwnableIBCHandler.sol
+83 −0 contracts/core/25-handler/OwnableUpgradeableIBCHandler.sol
+49 −14 contracts/core/26-router/IBCModuleManager.sol
+39 −28 contracts/core/26-router/IIBCModule.sol
+14 −0 contracts/core/26-router/IIBCModuleManager.sol
+105 −0 docs/adr/adr-002.md
+274 −0 docs/adr/adr-003.md
+73 −21 docs/architecture.md
+ docs/img/architecture-01.png
+4 −0 foundry.toml
+1,712 −18 package-lock.json
+4 −2 package.json
+272 −1 pkg/contract/ibchandler/ibchandler.go
+33 −33 pkg/contract/ibcmockapp/ibcmockapp.go
+33 −33 pkg/contract/ics20transferbank/ics20transferbank.go
+13 −7 pkg/testing/chains.go
+22 −4 pkg/testing/config.go
+1 −0 tests/foundry/lib/openzeppelin-foundry-upgrades
+44 −0 tests/foundry/src/ContractUpgrade.t.sol
+28 −6 tests/foundry/src/Deploy.s.sol
+155 −0 tests/foundry/src/IBCMockAppFactory.t.sol
+1 −1 tests/foundry/src/ICS04Handshake.t.sol
+16 −0 tests/foundry/src/ICS20.t.sol
+38 −0 tests/foundry/src/helpers/TestableOwnableUpgradeableIBCHandlerV1.sol
+41 −0 tests/foundry/src/helpers/TestableOwnableUpgradeableIBCHandlerV2.sol