diff --git a/integration_tests/contracts/contracts/TestICA.sol b/integration_tests/contracts/contracts/TestICA.sol index d5ddacb8cc..0946ba4446 100644 --- a/integration_tests/contracts/contracts/TestICA.sol +++ b/integration_tests/contracts/contracts/TestICA.sol @@ -106,7 +106,7 @@ contract TestICA { return statusMap[packetSrcChannel][seq]; } - function onPacketResultCallback(uint64 seq, bool ack, string calldata packetSrcChannel, string calldata packetDstChannel) external payable returns (bool) { + function onPacketResultCallback(string calldata packetSrcChannel, uint64 seq, bool ack) external payable returns (bool) { // To prevent called by arbitrary user require(msg.sender == module_address); Status status = Status.FAIL; diff --git a/x/cronos/events/bindings/cosmos/precompile/icacallback/i_ica_callback.abigen.go b/x/cronos/events/bindings/cosmos/precompile/icacallback/i_ica_callback.abigen.go index 96bead5978..6b82977f80 100644 --- a/x/cronos/events/bindings/cosmos/precompile/icacallback/i_ica_callback.abigen.go +++ b/x/cronos/events/bindings/cosmos/precompile/icacallback/i_ica_callback.abigen.go @@ -30,7 +30,7 @@ var ( // ICACallbackMetaData contains all meta data concerning the ICACallback contract. var ICACallbackMetaData = &bind.MetaData{ - ABI: "[{\"inputs\":[{\"internalType\":\"uint64\",\"name\":\"seq\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"ack\",\"type\":\"bool\"},{\"internalType\":\"string\",\"name\":\"packetSrcChannel\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"packetDstChannel\",\"type\":\"string\"}],\"name\":\"onPacketResultCallback\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"payable\",\"type\":\"function\"}]", + ABI: "[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"packetSrcChannel\",\"type\":\"string\"},{\"internalType\":\"uint64\",\"name\":\"seq\",\"type\":\"uint64\"},{\"internalType\":\"bool\",\"name\":\"ack\",\"type\":\"bool\"}],\"name\":\"onPacketResultCallback\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"payable\",\"type\":\"function\"}]", } // ICACallbackABI is the input ABI used to generate the binding from. @@ -179,23 +179,23 @@ func (_ICACallback *ICACallbackTransactorRaw) Transact(opts *bind.TransactOpts, return _ICACallback.Contract.contract.Transact(opts, method, params...) } -// OnPacketResultCallback is a paid mutator transaction binding the contract method 0x45eb23e3. +// OnPacketResultCallback is a paid mutator transaction binding the contract method 0xd2712162. // -// Solidity: function onPacketResultCallback(uint64 seq, bool ack, string packetSrcChannel, string packetDstChannel) payable returns(bool) -func (_ICACallback *ICACallbackTransactor) OnPacketResultCallback(opts *bind.TransactOpts, seq uint64, ack bool, packetSrcChannel string, packetDstChannel string) (*types.Transaction, error) { - return _ICACallback.contract.Transact(opts, "onPacketResultCallback", seq, ack, packetSrcChannel, packetDstChannel) +// Solidity: function onPacketResultCallback(string packetSrcChannel, uint64 seq, bool ack) payable returns(bool) +func (_ICACallback *ICACallbackTransactor) OnPacketResultCallback(opts *bind.TransactOpts, packetSrcChannel string, seq uint64, ack bool) (*types.Transaction, error) { + return _ICACallback.contract.Transact(opts, "onPacketResultCallback", packetSrcChannel, seq, ack) } -// OnPacketResultCallback is a paid mutator transaction binding the contract method 0x45eb23e3. +// OnPacketResultCallback is a paid mutator transaction binding the contract method 0xd2712162. // -// Solidity: function onPacketResultCallback(uint64 seq, bool ack, string packetSrcChannel, string packetDstChannel) payable returns(bool) -func (_ICACallback *ICACallbackSession) OnPacketResultCallback(seq uint64, ack bool, packetSrcChannel string, packetDstChannel string) (*types.Transaction, error) { - return _ICACallback.Contract.OnPacketResultCallback(&_ICACallback.TransactOpts, seq, ack, packetSrcChannel, packetDstChannel) +// Solidity: function onPacketResultCallback(string packetSrcChannel, uint64 seq, bool ack) payable returns(bool) +func (_ICACallback *ICACallbackSession) OnPacketResultCallback(packetSrcChannel string, seq uint64, ack bool) (*types.Transaction, error) { + return _ICACallback.Contract.OnPacketResultCallback(&_ICACallback.TransactOpts, packetSrcChannel, seq, ack) } -// OnPacketResultCallback is a paid mutator transaction binding the contract method 0x45eb23e3. +// OnPacketResultCallback is a paid mutator transaction binding the contract method 0xd2712162. // -// Solidity: function onPacketResultCallback(uint64 seq, bool ack, string packetSrcChannel, string packetDstChannel) payable returns(bool) -func (_ICACallback *ICACallbackTransactorSession) OnPacketResultCallback(seq uint64, ack bool, packetSrcChannel string, packetDstChannel string) (*types.Transaction, error) { - return _ICACallback.Contract.OnPacketResultCallback(&_ICACallback.TransactOpts, seq, ack, packetSrcChannel, packetDstChannel) +// Solidity: function onPacketResultCallback(string packetSrcChannel, uint64 seq, bool ack) payable returns(bool) +func (_ICACallback *ICACallbackTransactorSession) OnPacketResultCallback(packetSrcChannel string, seq uint64, ack bool) (*types.Transaction, error) { + return _ICACallback.Contract.OnPacketResultCallback(&_ICACallback.TransactOpts, packetSrcChannel, seq, ack) } diff --git a/x/cronos/events/bindings/src/ICACallback.sol b/x/cronos/events/bindings/src/ICACallback.sol index 99ea67fcf1..89aea3ff7f 100644 --- a/x/cronos/events/bindings/src/ICACallback.sol +++ b/x/cronos/events/bindings/src/ICACallback.sol @@ -2,5 +2,5 @@ pragma solidity ^0.8.4; interface IICACallback { - function onPacketResultCallback(uint64 seq, bool ack, string calldata packetSrcChannel, string calldata packetDstChannel) external payable returns (bool); + function onPacketResultCallback(string calldata packetSrcChannel, uint64 seq, bool ack) external payable returns (bool); } diff --git a/x/cronos/keeper/keeper.go b/x/cronos/keeper/keeper.go index 9ab43f7fa6..08fd65b5db 100644 --- a/x/cronos/keeper/keeper.go +++ b/x/cronos/keeper/keeper.go @@ -292,7 +292,7 @@ func (k Keeper) onPacketResult( packetSenderAddress string, ) error { contractAddr := common.HexToAddress(contractAddress) - data, err := cronosprecompiles.OnPacketResultCallback(packet.Sequence, acknowledgement, packet.SourceChannel, packet.DestinationChannel) + data, err := cronosprecompiles.OnPacketResultCallback(packet.SourceChannel, packet.Sequence, acknowledgement) if err != nil { return err }