From 04c1a61928d1e2e937bc3a0871d35a809731ecc7 Mon Sep 17 00:00:00 2001 From: mvpoyatt Date: Mon, 23 Sep 2024 10:23:09 -0400 Subject: [PATCH] Ran new build and squashed commits --- bindings/go/earth/Earth.go | 8 +-- .../IUniversalChannelHandler.go | 8 +-- bindings/go/mars/Mars.go | 8 +-- bindings/go/mars/PanickingMars.go | 34 +++++++++---- bindings/go/mars/RevertingBytesMars.go | 34 +++++++++---- bindings/go/mars/RevertingEmptyMars.go | 34 +++++++++---- .../mars/RevertingStringCloseChannelMars.go | 8 +-- bindings/go/mars/RevertingStringMars.go | 34 +++++++++---- bindings/go/moon/Moon.go | 8 +-- .../UniversalChannelHandler.go | 8 +-- contracts/base/GeneralMiddleware.sol | 4 +- contracts/core/Dispatcher.sol | 6 ++- contracts/core/UniversalChannelHandler.sol | 2 +- contracts/examples/Earth.sol | 5 +- contracts/examples/Mars.sol | 42 ++++++++++++--- contracts/examples/Pluto.sol | 51 +++++++++++++++++++ contracts/interfaces/IbcMiddleware.sol | 4 +- contracts/interfaces/IbcReceiver.sol | 3 +- package.json | 2 +- src/evm/contracts/Earth.ts | 14 ++++- src/evm/contracts/IUniversalChannelHandler.ts | 14 ++++- src/evm/contracts/Mars.sol/Mars.ts | 14 ++++- src/evm/contracts/Mars.sol/PanickingMars.ts | 14 ++++- .../contracts/Mars.sol/RevertingBytesMars.ts | 14 ++++- .../contracts/Mars.sol/RevertingEmptyMars.ts | 14 ++++- .../RevertingStringCloseChannelMars.ts | 14 ++++- .../contracts/Mars.sol/RevertingStringMars.ts | 14 ++++- src/evm/contracts/Moon.ts | 14 ++++- src/evm/contracts/UniversalChannelHandler.ts | 14 ++++- .../factories/Dispatcher__factory.ts | 2 +- src/evm/contracts/factories/Earth__factory.ts | 7 ++- .../IUniversalChannelHandler__factory.ts | 5 ++ .../factories/Mars.sol/Mars__factory.ts | 7 ++- .../Mars.sol/PanickingMars__factory.ts | 7 ++- .../Mars.sol/RevertingBytesMars__factory.ts | 7 ++- .../Mars.sol/RevertingEmptyMars__factory.ts | 7 ++- ...evertingStringCloseChannelMars__factory.ts | 7 ++- .../Mars.sol/RevertingStringMars__factory.ts | 7 ++- src/evm/contracts/factories/Moon__factory.ts | 7 ++- .../UniversalChannelHandler__factory.ts | 7 ++- test/Dispatcher/Dispatcher.t.sol | 30 +++++++++++ test/mocks/GasUsingMars.sol | 4 +- 42 files changed, 435 insertions(+), 112 deletions(-) create mode 100644 contracts/examples/Pluto.sol diff --git a/bindings/go/earth/Earth.go b/bindings/go/earth/Earth.go index 7884af2b..c499aae1 100644 --- a/bindings/go/earth/Earth.go +++ b/bindings/go/earth/Earth.go @@ -45,7 +45,7 @@ type UniversalPacket struct { // EarthMetaData contains all meta data concerning the Earth contract. var EarthMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_middleware\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"authorizeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"authorizedChannelIds\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"generateAckPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"srcPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"destPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"message\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"destPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"message\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onRecvUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onUniversalAcknowledgement\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"uch\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"updateUch\",\"inputs\":[{\"name\":\"_newUch\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"CallerNotUCH\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"InvalidUCHAddress\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"ackAddressMismatch\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"ackDataTooShort\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"invalidChannelId\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"unauthorizedChannel\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_middleware\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"authorizeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"authorizedChannelIds\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"generateAckPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"srcPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"destPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"message\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"destPortAddr\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"message\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onRecvUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onUniversalAcknowledgement\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structUniversalPacket\",\"components\":[{\"name\":\"srcPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"uch\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"updateUch\",\"inputs\":[{\"name\":\"_newUch\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"CallerNotUCH\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"InvalidUCHAddress\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"ackAddressMismatch\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"ackDataTooShort\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"invalidChannelId\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"unauthorizedChannel\",\"inputs\":[]}]", } // EarthABI is the input ABI used to generate the binding from. @@ -523,21 +523,21 @@ func (_Earth *EarthTransactorSession) GreetWithFee(destPortAddr common.Address, // OnRecvUniversalPacket is a paid mutator transaction binding the contract method 0x5b761585. // -// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Earth *EarthTransactor) OnRecvUniversalPacket(opts *bind.TransactOpts, channelId [32]byte, packet UniversalPacket) (*types.Transaction, error) { return _Earth.contract.Transact(opts, "onRecvUniversalPacket", channelId, packet) } // OnRecvUniversalPacket is a paid mutator transaction binding the contract method 0x5b761585. // -// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Earth *EarthSession) OnRecvUniversalPacket(channelId [32]byte, packet UniversalPacket) (*types.Transaction, error) { return _Earth.Contract.OnRecvUniversalPacket(&_Earth.TransactOpts, channelId, packet) } // OnRecvUniversalPacket is a paid mutator transaction binding the contract method 0x5b761585. // -// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvUniversalPacket(bytes32 channelId, (bytes32,uint256,bytes32,bytes) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Earth *EarthTransactorSession) OnRecvUniversalPacket(channelId [32]byte, packet UniversalPacket) (*types.Transaction, error) { return _Earth.Contract.OnRecvUniversalPacket(&_Earth.TransactOpts, channelId, packet) } diff --git a/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go b/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go index 06d0659e..80d22d54 100644 --- a/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go +++ b/bindings/go/iuniversalchannelhandler/IUniversalChannelHandler.go @@ -59,7 +59,7 @@ type IbcPacket struct { // IUniversalChannelHandlerMetaData contains all meta data concerning the IUniversalChannelHandler contract. var IUniversalChannelHandlerMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"function\",\"name\":\"MW_ID\",\"inputs\":[],\"outputs\":[{\"name\":\"MWID\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"closeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channel\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"counterpartyChannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartychannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"order\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"counterpartychannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"openChannel\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"registerMwStack\",\"inputs\":[{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"mwAddrs\",\"type\":\"address[]\",\"internalType\":\"address[]\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacketWithFee\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"setDispatcher\",\"inputs\":[{\"name\":\"dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"error\",\"name\":\"MwBitmpaCannotBeZero\",\"inputs\":[]}]", + ABI: "[{\"type\":\"function\",\"name\":\"MW_ID\",\"inputs\":[],\"outputs\":[{\"name\":\"MWID\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"closeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"channel\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"counterpartyChannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartychannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"order\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"counterpartychannelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"openChannel\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"registerMwStack\",\"inputs\":[{\"name\":\"mwBitmap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"mwAddrs\",\"type\":\"address[]\",\"internalType\":\"address[]\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacketWithFee\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"setDispatcher\",\"inputs\":[{\"name\":\"dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"error\",\"name\":\"MwBitmpaCannotBeZero\",\"inputs\":[]}]", } // IUniversalChannelHandlerABI is the input ABI used to generate the binding from. @@ -419,21 +419,21 @@ func (_IUniversalChannelHandler *IUniversalChannelHandlerTransactorSession) OnCh // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_IUniversalChannelHandler *IUniversalChannelHandlerTransactor) OnRecvPacket(opts *bind.TransactOpts, packet IbcPacket) (*types.Transaction, error) { return _IUniversalChannelHandler.contract.Transact(opts, "onRecvPacket", packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_IUniversalChannelHandler *IUniversalChannelHandlerSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _IUniversalChannelHandler.Contract.OnRecvPacket(&_IUniversalChannelHandler.TransactOpts, packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_IUniversalChannelHandler *IUniversalChannelHandlerTransactorSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _IUniversalChannelHandler.Contract.OnRecvPacket(&_IUniversalChannelHandler.TransactOpts, packet) } diff --git a/bindings/go/mars/Mars.go b/bindings/go/mars/Mars.go index 947a8e9a..6b18504b 100644 --- a/bindings/go/mars/Mars.go +++ b/bindings/go/mars/Mars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // MarsMetaData contains all meta data concerning the Mars contract. var MarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // MarsABI is the input ABI used to generate the binding from. @@ -677,21 +677,21 @@ func (_Mars *MarsTransactorSession) OnChanOpenTry(arg0 uint8, arg1 []string, cha // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Mars *MarsTransactor) OnRecvPacket(opts *bind.TransactOpts, packet IbcPacket) (*types.Transaction, error) { return _Mars.contract.Transact(opts, "onRecvPacket", packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Mars *MarsSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _Mars.Contract.OnRecvPacket(&_Mars.TransactOpts, packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Mars *MarsTransactorSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _Mars.Contract.OnRecvPacket(&_Mars.TransactOpts, packet) } diff --git a/bindings/go/mars/PanickingMars.go b/bindings/go/mars/PanickingMars.go index aab03689..fdbe7af4 100644 --- a/bindings/go/mars/PanickingMars.go +++ b/bindings/go/mars/PanickingMars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // PanickingMarsMetaData contains all meta data concerning the PanickingMars contract. var PanickingMarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // PanickingMarsABI is the input ABI used to generate the binding from. @@ -317,32 +317,46 @@ func (_PanickingMars *PanickingMarsCallerSession) Dispatcher() (common.Address, // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_PanickingMars *PanickingMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_PanickingMars *PanickingMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { var out []interface{} err := _PanickingMars.contract.Call(opts, &out, "onRecvPacket", arg0) + outstruct := new(struct { + Ack AckPacket + SkipAck bool + }) if err != nil { - return *new(AckPacket), err + return *outstruct, err } - out0 := *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.Ack = *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.SkipAck = *abi.ConvertType(out[1], new(bool)).(*bool) - return out0, err + return *outstruct, err } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_PanickingMars *PanickingMarsSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_PanickingMars *PanickingMarsSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _PanickingMars.Contract.OnRecvPacket(&_PanickingMars.CallOpts, arg0) } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_PanickingMars *PanickingMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_PanickingMars *PanickingMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _PanickingMars.Contract.OnRecvPacket(&_PanickingMars.CallOpts, arg0) } diff --git a/bindings/go/mars/RevertingBytesMars.go b/bindings/go/mars/RevertingBytesMars.go index c26de00a..3bc96da0 100644 --- a/bindings/go/mars/RevertingBytesMars.go +++ b/bindings/go/mars/RevertingBytesMars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // RevertingBytesMarsMetaData contains all meta data concerning the RevertingBytesMars contract. var RevertingBytesMarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"OnRecvPacketRevert\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"OnTimeoutPacket\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"OnRecvPacketRevert\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"OnTimeoutPacket\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // RevertingBytesMarsABI is the input ABI used to generate the binding from. @@ -317,32 +317,46 @@ func (_RevertingBytesMars *RevertingBytesMarsCallerSession) Dispatcher() (common // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingBytesMars *RevertingBytesMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingBytesMars *RevertingBytesMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { var out []interface{} err := _RevertingBytesMars.contract.Call(opts, &out, "onRecvPacket", arg0) + outstruct := new(struct { + Ack AckPacket + SkipAck bool + }) if err != nil { - return *new(AckPacket), err + return *outstruct, err } - out0 := *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.Ack = *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.SkipAck = *abi.ConvertType(out[1], new(bool)).(*bool) - return out0, err + return *outstruct, err } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingBytesMars *RevertingBytesMarsSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingBytesMars *RevertingBytesMarsSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingBytesMars.Contract.OnRecvPacket(&_RevertingBytesMars.CallOpts, arg0) } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingBytesMars *RevertingBytesMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingBytesMars *RevertingBytesMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingBytesMars.Contract.OnRecvPacket(&_RevertingBytesMars.CallOpts, arg0) } diff --git a/bindings/go/mars/RevertingEmptyMars.go b/bindings/go/mars/RevertingEmptyMars.go index d258361c..3715ea8e 100644 --- a/bindings/go/mars/RevertingEmptyMars.go +++ b/bindings/go/mars/RevertingEmptyMars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // RevertingEmptyMarsMetaData contains all meta data concerning the RevertingEmptyMars contract. var RevertingEmptyMarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // RevertingEmptyMarsABI is the input ABI used to generate the binding from. @@ -317,32 +317,46 @@ func (_RevertingEmptyMars *RevertingEmptyMarsCallerSession) Dispatcher() (common // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingEmptyMars *RevertingEmptyMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingEmptyMars *RevertingEmptyMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { var out []interface{} err := _RevertingEmptyMars.contract.Call(opts, &out, "onRecvPacket", arg0) + outstruct := new(struct { + Ack AckPacket + SkipAck bool + }) if err != nil { - return *new(AckPacket), err + return *outstruct, err } - out0 := *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.Ack = *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.SkipAck = *abi.ConvertType(out[1], new(bool)).(*bool) - return out0, err + return *outstruct, err } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingEmptyMars *RevertingEmptyMarsSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingEmptyMars *RevertingEmptyMarsSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingEmptyMars.Contract.OnRecvPacket(&_RevertingEmptyMars.CallOpts, arg0) } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingEmptyMars *RevertingEmptyMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingEmptyMars *RevertingEmptyMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingEmptyMars.Contract.OnRecvPacket(&_RevertingEmptyMars.CallOpts, arg0) } diff --git a/bindings/go/mars/RevertingStringCloseChannelMars.go b/bindings/go/mars/RevertingStringCloseChannelMars.go index 4446014b..99b9e9c5 100644 --- a/bindings/go/mars/RevertingStringCloseChannelMars.go +++ b/bindings/go/mars/RevertingStringCloseChannelMars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // RevertingStringCloseChannelMarsMetaData contains all meta data concerning the RevertingStringCloseChannelMars contract. var RevertingStringCloseChannelMarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // RevertingStringCloseChannelMarsABI is the input ABI used to generate the binding from. @@ -685,21 +685,21 @@ func (_RevertingStringCloseChannelMars *RevertingStringCloseChannelMarsTransacto // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_RevertingStringCloseChannelMars *RevertingStringCloseChannelMarsTransactor) OnRecvPacket(opts *bind.TransactOpts, packet IbcPacket) (*types.Transaction, error) { return _RevertingStringCloseChannelMars.contract.Transact(opts, "onRecvPacket", packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_RevertingStringCloseChannelMars *RevertingStringCloseChannelMarsSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _RevertingStringCloseChannelMars.Contract.OnRecvPacket(&_RevertingStringCloseChannelMars.TransactOpts, packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_RevertingStringCloseChannelMars *RevertingStringCloseChannelMarsTransactorSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _RevertingStringCloseChannelMars.Contract.OnRecvPacket(&_RevertingStringCloseChannelMars.TransactOpts, packet) } diff --git a/bindings/go/mars/RevertingStringMars.go b/bindings/go/mars/RevertingStringMars.go index c01b831f..da54b1bf 100644 --- a/bindings/go/mars/RevertingStringMars.go +++ b/bindings/go/mars/RevertingStringMars.go @@ -59,7 +59,7 @@ type IbcPacket struct { // RevertingStringMarsMetaData contains all meta data concerning the RevertingStringMars contract. var RevertingStringMarsMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // RevertingStringMarsABI is the input ABI used to generate the binding from. @@ -375,32 +375,46 @@ func (_RevertingStringMars *RevertingStringMarsCallerSession) OnChanOpenAck(arg0 // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingStringMars *RevertingStringMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingStringMars *RevertingStringMarsCaller) OnRecvPacket(opts *bind.CallOpts, arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { var out []interface{} err := _RevertingStringMars.contract.Call(opts, &out, "onRecvPacket", arg0) + outstruct := new(struct { + Ack AckPacket + SkipAck bool + }) if err != nil { - return *new(AckPacket), err + return *outstruct, err } - out0 := *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.Ack = *abi.ConvertType(out[0], new(AckPacket)).(*AckPacket) + outstruct.SkipAck = *abi.ConvertType(out[1], new(bool)).(*bool) - return out0, err + return *outstruct, err } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingStringMars *RevertingStringMarsSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingStringMars *RevertingStringMarsSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingStringMars.Contract.OnRecvPacket(&_RevertingStringMars.CallOpts, arg0) } // OnRecvPacket is a free data retrieval call binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack) -func (_RevertingStringMars *RevertingStringMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (AckPacket, error) { +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) ) view returns((bool,bytes) ack, bool skipAck) +func (_RevertingStringMars *RevertingStringMarsCallerSession) OnRecvPacket(arg0 IbcPacket) (struct { + Ack AckPacket + SkipAck bool +}, error) { return _RevertingStringMars.Contract.OnRecvPacket(&_RevertingStringMars.CallOpts, arg0) } diff --git a/bindings/go/moon/Moon.go b/bindings/go/moon/Moon.go index 76e37024..aba66429 100644 --- a/bindings/go/moon/Moon.go +++ b/bindings/go/moon/Moon.go @@ -59,7 +59,7 @@ type IbcPacket struct { // MoonMetaData contains all meta data concerning the Moon contract. var MoonMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"ackPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"connectedChannels\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"greet\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"greetWithFee\",\"inputs\":[{\"name\":\"message\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"recvedPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"supportedVersions\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"timeoutPackets\",\"inputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelClose\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInit\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"triggerChannelInitWithFee\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortId\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // MoonABI is the input ABI used to generate the binding from. @@ -677,21 +677,21 @@ func (_Moon *MoonTransactorSession) OnChanOpenTry(arg0 uint8, arg1 []string, cha // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Moon *MoonTransactor) OnRecvPacket(opts *bind.TransactOpts, packet IbcPacket) (*types.Transaction, error) { return _Moon.contract.Transact(opts, "onRecvPacket", packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Moon *MoonSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _Moon.Contract.OnRecvPacket(&_Moon.TransactOpts, packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_Moon *MoonTransactorSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _Moon.Contract.OnRecvPacket(&_Moon.TransactOpts, packet) } diff --git a/bindings/go/universalchannelhandler/UniversalChannelHandler.go b/bindings/go/universalchannelhandler/UniversalChannelHandler.go index 6a6370a4..f7ccd734 100644 --- a/bindings/go/universalchannelhandler/UniversalChannelHandler.go +++ b/bindings/go/universalchannelhandler/UniversalChannelHandler.go @@ -59,7 +59,7 @@ type IbcPacket struct { // UniversalChannelHandlerMetaData contains all meta data concerning the UniversalChannelHandler contract. var UniversalChannelHandlerMetaData = &bind.MetaData{ - ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"MW_ID\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"acceptOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"closeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"openChannel\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"pendingOwner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"proxiableUUID\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacketWithFee\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"setDispatcher\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"upgradeTo\",\"inputs\":[{\"name\":\"newImplementation\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"upgradeToAndCall\",\"inputs\":[{\"name\":\"newImplementation\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"AdminChanged\",\"inputs\":[{\"name\":\"previousAdmin\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"},{\"name\":\"newAdmin\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"BeaconUpgraded\",\"inputs\":[{\"name\":\"beacon\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferStarted\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"UCHPacketSent\",\"inputs\":[{\"name\":\"source\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"},{\"name\":\"destination\",\"type\":\"bytes32\",\"indexed\":false,\"internalType\":\"bytes32\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Upgraded\",\"inputs\":[{\"name\":\"implementation\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"MwBitmpaCannotBeZero\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"invalidAddress\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", + ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"receive\",\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"MW_ID\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"acceptOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"closeChannel\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"dispatcher\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onAcknowledgementPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"ack\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanCloseInit\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenAck\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onChanOpenConfirm\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onChanOpenTry\",\"inputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"counterpartyVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[{\"name\":\"selectedVersion\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"onRecvPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[{\"name\":\"ackPacket\",\"type\":\"tuple\",\"internalType\":\"structAckPacket\",\"components\":[{\"name\":\"success\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]},{\"name\":\"skipAck\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"onTimeoutPacket\",\"inputs\":[{\"name\":\"packet\",\"type\":\"tuple\",\"internalType\":\"structIbcPacket\",\"components\":[{\"name\":\"src\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"dest\",\"type\":\"tuple\",\"internalType\":\"structIbcEndpoint\",\"components\":[{\"name\":\"portId\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutHeight\",\"type\":\"tuple\",\"internalType\":\"structHeight\",\"components\":[{\"name\":\"revision_number\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"revision_height\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"openChannel\",\"inputs\":[{\"name\":\"version\",\"type\":\"string\",\"internalType\":\"string\"},{\"name\":\"ordering\",\"type\":\"uint8\",\"internalType\":\"enumChannelOrder\"},{\"name\":\"feeEnabled\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"connectionHops\",\"type\":\"string[]\",\"internalType\":\"string[]\"},{\"name\":\"counterpartyPortIdentifier\",\"type\":\"string\",\"internalType\":\"string\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"pendingOwner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"proxiableUUID\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacket\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"sendUniversalPacketWithFee\",\"inputs\":[{\"name\":\"channelId\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"destPortAddr\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"appData\",\"type\":\"bytes\",\"internalType\":\"bytes\"},{\"name\":\"timeoutTimestamp\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"gasLimits\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"},{\"name\":\"gasPrices\",\"type\":\"uint256[2]\",\"internalType\":\"uint256[2]\"}],\"outputs\":[{\"name\":\"sequence\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"setDispatcher\",\"inputs\":[{\"name\":\"_dispatcher\",\"type\":\"address\",\"internalType\":\"contractIbcDispatcher\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"upgradeTo\",\"inputs\":[{\"name\":\"newImplementation\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"upgradeToAndCall\",\"inputs\":[{\"name\":\"newImplementation\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"data\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"event\",\"name\":\"AdminChanged\",\"inputs\":[{\"name\":\"previousAdmin\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"},{\"name\":\"newAdmin\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"BeaconUpgraded\",\"inputs\":[{\"name\":\"beacon\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferStarted\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"UCHPacketSent\",\"inputs\":[{\"name\":\"source\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"},{\"name\":\"destination\",\"type\":\"bytes32\",\"indexed\":false,\"internalType\":\"bytes32\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Upgraded\",\"inputs\":[{\"name\":\"implementation\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ChannelNotFound\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"MwBitmpaCannotBeZero\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"UnsupportedVersion\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"invalidAddress\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"notIbcDispatcher\",\"inputs\":[]}]", } // UniversalChannelHandlerABI is the input ABI used to generate the binding from. @@ -603,21 +603,21 @@ func (_UniversalChannelHandler *UniversalChannelHandlerTransactorSession) OnChan // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_UniversalChannelHandler *UniversalChannelHandlerTransactor) OnRecvPacket(opts *bind.TransactOpts, packet IbcPacket) (*types.Transaction, error) { return _UniversalChannelHandler.contract.Transact(opts, "onRecvPacket", packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_UniversalChannelHandler *UniversalChannelHandlerSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _UniversalChannelHandler.Contract.OnRecvPacket(&_UniversalChannelHandler.TransactOpts, packet) } // OnRecvPacket is a paid mutator transaction binding the contract method 0x4dcc0aa6. // -// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket) +// Solidity: function onRecvPacket(((string,bytes32),(string,bytes32),uint64,bytes,(uint64,uint64),uint64) packet) returns((bool,bytes) ackPacket, bool skipAck) func (_UniversalChannelHandler *UniversalChannelHandlerTransactorSession) OnRecvPacket(packet IbcPacket) (*types.Transaction, error) { return _UniversalChannelHandler.Contract.OnRecvPacket(&_UniversalChannelHandler.TransactOpts, packet) } diff --git a/contracts/base/GeneralMiddleware.sol b/contracts/base/GeneralMiddleware.sol index 1259411e..286e2ee8 100644 --- a/contracts/base/GeneralMiddleware.sol +++ b/contracts/base/GeneralMiddleware.sol @@ -98,7 +98,7 @@ contract GeneralMiddleware is IbcMwUser, IbcMiddleware, IbcMwEventsEmitter, IbcM uint256 mwIndex, // bytes calldata appData, address[] calldata mwAddrs - ) external onlyIbcMw returns (AckPacket memory ackPacket) { + ) external onlyIbcMw returns (AckPacket memory ackPacket, bool skipAck) { // extra MW custom logic here to process packet, eg. emit MW events, mutate state, etc. // implementer can emit custom data fields suitable for their use cases. // Here we use MW_ID as the custom MW data field. @@ -180,7 +180,7 @@ contract GeneralMiddleware is IbcMwUser, IbcMiddleware, IbcMwEventsEmitter, IbcM external override onlyIbcMw - returns (AckPacket memory ackPacket) + returns (AckPacket memory ackPacket, bool skipAck) {} function onUniversalAcknowledgement(bytes32 channelId, UniversalPacket memory packet, AckPacket calldata ack) diff --git a/contracts/core/Dispatcher.sol b/contracts/core/Dispatcher.sol index cce3085e..d8afbcf8 100644 --- a/contracts/core/Dispatcher.sol +++ b/contracts/core/Dispatcher.sol @@ -612,11 +612,15 @@ contract Dispatcher is Ownable2StepUpgradeable, UUPSUpgradeable, ReentrancyGuard } AckPacket memory ack; + bool skipAck; // Not timeout yet, then do normal handling (bool success, bytes memory data) = _callIfContract(receiver, abi.encodeWithSelector(IbcPacketReceiver.onRecvPacket.selector, packet)); if (success) { - (ack) = abi.decode(data, (AckPacket)); + (ack, skipAck) = abi.decode(data, (AckPacket, bool)); + if (skipAck) { + return; + } } else { ack = AckPacket(false, data); } diff --git a/contracts/core/UniversalChannelHandler.sol b/contracts/core/UniversalChannelHandler.sol index 23f4a760..a5865b64 100644 --- a/contracts/core/UniversalChannelHandler.sol +++ b/contracts/core/UniversalChannelHandler.sol @@ -136,7 +136,7 @@ contract UniversalChannelHandler is IbcReceiverBaseUpgradeable, FeeSender, UUPSU external override onlyIbcDispatcher - returns (AckPacket memory ackPacket) + returns (AckPacket memory ackPacket, bool skipAck) { UniversalPacket memory ucPacket = IbcUtils.fromUniversalPacketBytes(packet.data); // no other middleware stack registered for this packet. Deliver packet to dApp directly. diff --git a/contracts/examples/Earth.sol b/contracts/examples/Earth.sol index f755c423..d2c8c0b5 100644 --- a/contracts/examples/Earth.sol +++ b/contracts/examples/Earth.sol @@ -101,6 +101,7 @@ contract Earth is IbcUniversalPacketReceiverBase { * @param channelId The channel ID. * @param packet The universal packet. * @return ackPacket The acknowledgement packet. + * @return skipAck Whether to skip the writeAck event. * @dev It's recommended to always validate the authorized channel of any packet or channel using the * onlyAuthorizedChannel modifier. */ @@ -108,10 +109,10 @@ contract Earth is IbcUniversalPacketReceiverBase { external onlyUCH onlyAuthorizedChannel(channelId) - returns (AckPacket memory ackPacket) + returns (AckPacket memory ackPacket, bool skipAck) { recvedPackets.push(UcPacketWithChannel(channelId, packet)); - return this.generateAckPacket(channelId, IbcUtils.toAddress(packet.srcPortAddr), packet.appData); + return (this.generateAckPacket(channelId, IbcUtils.toAddress(packet.srcPortAddr), packet.appData), false); } /** diff --git a/contracts/examples/Mars.sol b/contracts/examples/Mars.sol index ddd98fe5..69bf53f0 100644 --- a/contracts/examples/Mars.sol +++ b/contracts/examples/Mars.sol @@ -76,18 +76,19 @@ contract Mars is IbcReceiverBase, IbcReceiver, FeeSender { * @notice Callback for receiving a packet; triggered when a counterparty sends an an IBC packet * @param packet The IBC packet received * @return ackPacket The acknowledgement packet generated in response + * @return skipAck Whether to skip the writeAck event. * @dev Make sure to validate packet's source and destiation channels and ports. */ function onRecvPacket(IbcPacket memory packet) external virtual onlyIbcDispatcher - returns (AckPacket memory ackPacket) + returns (AckPacket memory ackPacket, bool skipAck) { recvedPackets.push(packet); // solhint-disable-next-line quotes - return AckPacket(true, abi.encodePacked('{ "account": "account", "reply": "got the message" }')); + return (AckPacket(true, abi.encodePacked('{ "account": "account", "reply": "got the message" }')), false); } /** @@ -243,10 +244,17 @@ contract RevertingStringMars is Mars { constructor(IbcDispatcher _dispatcher) Mars(_dispatcher) {} // solhint-disable-next-line - function onRecvPacket(IbcPacket memory) external view override onlyIbcDispatcher returns (AckPacket memory ack) { + function onRecvPacket(IbcPacket memory) + external + view + override + onlyIbcDispatcher + returns (AckPacket memory ack, bool skipAck) + { // solhint-disable-next-line require(false, "on recv packet is reverting"); ack = AckPacket(false, ""); + skipAck = false; } // solhint-disable-next-line @@ -280,8 +288,15 @@ contract RevertingBytesMars is Mars { constructor(IbcDispatcher _dispatcher) Mars(_dispatcher) {} - function onRecvPacket(IbcPacket memory) external view override onlyIbcDispatcher returns (AckPacket memory ack) { + function onRecvPacket(IbcPacket memory) + external + view + override + onlyIbcDispatcher + returns (AckPacket memory ack, bool skipAck) + { ack = AckPacket(false, ""); + skipAck = false; revert OnRecvPacketRevert(); } @@ -294,18 +309,33 @@ contract RevertingBytesMars is Mars { contract RevertingEmptyMars is Mars { constructor(IbcDispatcher _dispatcher) Mars(_dispatcher) {} - function onRecvPacket(IbcPacket memory) external view override onlyIbcDispatcher returns (AckPacket memory ack) { + function onRecvPacket(IbcPacket memory) + external + view + override + onlyIbcDispatcher + returns (AckPacket memory ack, bool skipAck) + { // solhint-disable-next-line require(false); + // Set values to avoid compiler warning ack = AckPacket(false, ""); + skipAck = false; } } contract PanickingMars is Mars { constructor(IbcDispatcher _dispatcher) Mars(_dispatcher) {} - function onRecvPacket(IbcPacket memory) external view override onlyIbcDispatcher returns (AckPacket memory ack) { + function onRecvPacket(IbcPacket memory) + external + view + override + onlyIbcDispatcher + returns (AckPacket memory ack, bool skipAck) + { assert(false); ack = AckPacket(false, ""); + skipAck = false; } } diff --git a/contracts/examples/Pluto.sol b/contracts/examples/Pluto.sol new file mode 100644 index 00000000..8be6b755 --- /dev/null +++ b/contracts/examples/Pluto.sol @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright 2024, Polymer Labs + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +pragma solidity ^0.8.9; + +import {AckPacket} from "../libs/Ibc.sol"; +import {Mars} from "./Mars.sol"; +import {IbcPacket} from "../interfaces/IbcReceiver.sol"; +import {IbcDispatcher} from "../interfaces/IbcDispatcher.sol"; + +/** + * @title Pluto + * @notice Pluto is a simple IBC receiver contract that receives packets without sending acks. + * @dev This contract is used for only testing IBC functionality and as an example for dapp developers + * on how to integrate with the vibc protocol. + */ +contract Pluto is Mars { + constructor(IbcDispatcher _dispatcher) Mars(_dispatcher) {} + + /** + * @notice Callback for receiving a packet; triggered when a counterparty sends an an IBC packet + * @param packet The IBC packet received + * @return ackPacket The acknowledgement packet generated in response + * @dev Make sure to validate packet's source and destiation channels and ports. + */ + function onRecvPacket(IbcPacket memory packet) + external + override + onlyIbcDispatcher + returns (AckPacket memory ackPacket, bool skipAck) + { + recvedPackets.push(packet); + + // solhint-disable-next-line quotes + return (AckPacket(true, abi.encodePacked('{ "account": "account", "reply": "got the message" }')), true); + } +} diff --git a/contracts/interfaces/IbcMiddleware.sol b/contracts/interfaces/IbcMiddleware.sol index e8da1aaf..c87cd4c7 100644 --- a/contracts/interfaces/IbcMiddleware.sol +++ b/contracts/interfaces/IbcMiddleware.sol @@ -73,7 +73,7 @@ interface IbcMwPacketReceiver { // Each mw in the stack must increment mwIndex by 1 before calling the next MW. uint256 mwIndex, address[] calldata mwAddrs - ) external returns (AckPacket memory ackPacket); + ) external returns (AckPacket memory ackPacket, bool skipAck); function onRecvMWAck( bytes32 channelId, @@ -103,7 +103,7 @@ interface IbcUniversalPacketReceiver { function onRecvUniversalPacket(bytes32 channelId, UniversalPacket calldata ucPacket) external - returns (AckPacket memory ackPacket); + returns (AckPacket memory ackPacket, bool skipAck); function onUniversalAcknowledgement(bytes32 channelId, UniversalPacket memory packet, AckPacket calldata ack) external; diff --git a/contracts/interfaces/IbcReceiver.sol b/contracts/interfaces/IbcReceiver.sol index 38acf959..57a94b4b 100644 --- a/contracts/interfaces/IbcReceiver.sol +++ b/contracts/interfaces/IbcReceiver.sol @@ -81,9 +81,10 @@ interface IbcPacketReceiver { * @notice Callback for receiving a packet; triggered when a counterparty sends an an IBC packet * @param packet The IBC packet received * @return ackPacket The acknowledgement packet generated in response + * @return skipAck Whether to skip sending an acknowledgement packet * @dev Make sure to validate packet's source and destiation channels and ports. */ - function onRecvPacket(IbcPacket calldata packet) external returns (AckPacket memory ackPacket); + function onRecvPacket(IbcPacket calldata packet) external returns (AckPacket memory ackPacket, bool skipAck); /** * @notice Callback for acknowledging a packet; triggered on reciept of an IBC packet by the counterparty diff --git a/package.json b/package.json index af6a3d28..3d20a1e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@open-ibc/vibc-core-smart-contracts", - "version": "3.1.0", + "version": "4.0.0", "main": "dist/index.js", "bin": { "verify-vibc-core-smart-contracts": "./dist/scripts/verify-contract-script.js", diff --git a/src/evm/contracts/Earth.ts b/src/evm/contracts/Earth.ts index c141c3f6..d38a48c9 100644 --- a/src/evm/contracts/Earth.ts +++ b/src/evm/contracts/Earth.ts @@ -301,7 +301,12 @@ export interface Earth extends BaseContract { onRecvUniversalPacket: TypedContractMethod< [channelId: BytesLike, packet: UniversalPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -413,7 +418,12 @@ export interface Earth extends BaseContract { nameOrSignature: "onRecvUniversalPacket" ): TypedContractMethod< [channelId: BytesLike, packet: UniversalPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/IUniversalChannelHandler.ts b/src/evm/contracts/IUniversalChannelHandler.ts index d58b0567..5e49e8c2 100644 --- a/src/evm/contracts/IUniversalChannelHandler.ts +++ b/src/evm/contracts/IUniversalChannelHandler.ts @@ -326,7 +326,12 @@ export interface IUniversalChannelHandler extends BaseContract { onRecvPacket: TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -450,7 +455,12 @@ export interface IUniversalChannelHandler extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/Mars.ts b/src/evm/contracts/Mars.sol/Mars.ts index d4987cb2..f67f73d5 100644 --- a/src/evm/contracts/Mars.sol/Mars.ts +++ b/src/evm/contracts/Mars.sol/Mars.ts @@ -404,7 +404,12 @@ export interface Mars extends BaseContract { onRecvPacket: TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -590,7 +595,12 @@ export interface Mars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/PanickingMars.ts b/src/evm/contracts/Mars.sol/PanickingMars.ts index 31c0e168..c336ce11 100644 --- a/src/evm/contracts/Mars.sol/PanickingMars.ts +++ b/src/evm/contracts/Mars.sol/PanickingMars.ts @@ -404,7 +404,12 @@ export interface PanickingMars extends BaseContract { onRecvPacket: TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; @@ -590,7 +595,12 @@ export interface PanickingMars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/RevertingBytesMars.ts b/src/evm/contracts/Mars.sol/RevertingBytesMars.ts index c39bae7d..39617705 100644 --- a/src/evm/contracts/Mars.sol/RevertingBytesMars.ts +++ b/src/evm/contracts/Mars.sol/RevertingBytesMars.ts @@ -404,7 +404,12 @@ export interface RevertingBytesMars extends BaseContract { onRecvPacket: TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; @@ -586,7 +591,12 @@ export interface RevertingBytesMars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/RevertingEmptyMars.ts b/src/evm/contracts/Mars.sol/RevertingEmptyMars.ts index 925b7b32..a35ffe2c 100644 --- a/src/evm/contracts/Mars.sol/RevertingEmptyMars.ts +++ b/src/evm/contracts/Mars.sol/RevertingEmptyMars.ts @@ -404,7 +404,12 @@ export interface RevertingEmptyMars extends BaseContract { onRecvPacket: TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; @@ -590,7 +595,12 @@ export interface RevertingEmptyMars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/RevertingStringCloseChannelMars.ts b/src/evm/contracts/Mars.sol/RevertingStringCloseChannelMars.ts index 3b5e5eb9..4f2c6362 100644 --- a/src/evm/contracts/Mars.sol/RevertingStringCloseChannelMars.ts +++ b/src/evm/contracts/Mars.sol/RevertingStringCloseChannelMars.ts @@ -404,7 +404,12 @@ export interface RevertingStringCloseChannelMars extends BaseContract { onRecvPacket: TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -590,7 +595,12 @@ export interface RevertingStringCloseChannelMars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/Mars.sol/RevertingStringMars.ts b/src/evm/contracts/Mars.sol/RevertingStringMars.ts index 54bc0bf2..adc8f497 100644 --- a/src/evm/contracts/Mars.sol/RevertingStringMars.ts +++ b/src/evm/contracts/Mars.sol/RevertingStringMars.ts @@ -404,7 +404,12 @@ export interface RevertingStringMars extends BaseContract { onRecvPacket: TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; @@ -590,7 +595,12 @@ export interface RevertingStringMars extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [arg0: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ack: AckPacketStructOutput; + skipAck: boolean; + } + ], "view" >; getFunction( diff --git a/src/evm/contracts/Moon.ts b/src/evm/contracts/Moon.ts index 8801654e..a89728a0 100644 --- a/src/evm/contracts/Moon.ts +++ b/src/evm/contracts/Moon.ts @@ -404,7 +404,12 @@ export interface Moon extends BaseContract { onRecvPacket: TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -590,7 +595,12 @@ export interface Moon extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/UniversalChannelHandler.ts b/src/evm/contracts/UniversalChannelHandler.ts index d05bce39..f072db09 100644 --- a/src/evm/contracts/UniversalChannelHandler.ts +++ b/src/evm/contracts/UniversalChannelHandler.ts @@ -492,7 +492,12 @@ export interface UniversalChannelHandler extends BaseContract { onRecvPacket: TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; @@ -641,7 +646,12 @@ export interface UniversalChannelHandler extends BaseContract { nameOrSignature: "onRecvPacket" ): TypedContractMethod< [packet: IbcPacketStruct], - [AckPacketStructOutput], + [ + [AckPacketStructOutput, boolean] & { + ackPacket: AckPacketStructOutput; + skipAck: boolean; + } + ], "nonpayable" >; getFunction( diff --git a/src/evm/contracts/factories/Dispatcher__factory.ts b/src/evm/contracts/factories/Dispatcher__factory.ts index a89cfda3..7e7a204c 100644 --- a/src/evm/contracts/factories/Dispatcher__factory.ts +++ b/src/evm/contracts/factories/Dispatcher__factory.ts @@ -2090,7 +2090,7 @@ const _abi = [ ] as const; const _bytecode = - "0x60a0604052306080523480156200001557600080fd5b506200002062000026565b620000e7565b600054610100900460ff1615620000935760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811614620000e5576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6080516158656200011f60003960008181610c1f01528181610c68015281816113c201528181611402015261149501526158656000f3fe6080604052600436106101c25760003560e01c8063715018a6116100f7578063b12f89be11610095578063c899e27211610064578063c899e2721461051e578063e30c39781461053e578063f2fde38b1461055c578063f90b8e961461057c57600080fd5b8063b12f89be14610486578063ba5a4d25146104a6578063c00fa7c0146104c6578063c3e1155c146104e657600080fd5b80637ab4339d116100d15780637ab4339d1461040857806381bc079b146104285780638da5cb5b146104485780639f59ae711461046657600080fd5b8063715018a6146103bc5780637774a6d3146103d157806379ba5097146103f357600080fd5b8063478222c211610164578063556d51781161013e578063556d51781461033c5780635d7adf961461035c5780636050b5f31461037c5780636b67055e1461039c57600080fd5b8063478222c2146102cd5780634f1ef2861461030657806352d1902d1461031957600080fd5b80633659cfe6116101a05780633659cfe614610240578063418925b71461026057806342852d2414610280578063429446b6146102ad57600080fd5b80631eb9fc86146101c75780632494546b146101e95780632bf5d19d14610220575b600080fd5b3480156101d357600080fd5b506101e76101e2366004613faf565b61059c565b005b3480156101f557600080fd5b5060fa546102069063ffffffff1681565b60405163ffffffff90911681526020015b60405180910390f35b34801561022c57600080fd5b506101e761023b366004614085565b610926565b34801561024c57600080fd5b506101e761025b36600461412f565b610c15565b34801561026c57600080fd5b506101e761027b36600461418d565b610cfd565b34801561028c57600080fd5b506102a061029b36600461424e565b610db6565b6040516102179190614351565b3480156102b957600080fd5b506101e76102c8366004613faf565b61110e565b3480156102d957600080fd5b50610105546102ee906001600160a01b031681565b6040516001600160a01b039091168152602001610217565b6101e76103143660046144a4565b6113b8565b34801561032557600080fd5b5061032e611488565b604051908152602001610217565b34801561034857600080fd5b506101e7610357366004614507565b61153b565b34801561036857600080fd5b506101e761037736600461456f565b611553565b34801561038857600080fd5b506101e761039736600461456f565b611863565b3480156103a857600080fd5b506101e76103b736600461456f565b611875565b3480156103c857600080fd5b506101e7611f67565b3480156103dd57600080fd5b506103e6611f7b565b60405161021791906145c8565b3480156103ff57600080fd5b506101e7612009565b34801561041457600080fd5b506101e76104233660046145fb565b612080565b34801561043457600080fd5b506101e761044336600461464c565b612209565b34801561045457600080fd5b506033546001600160a01b03166102ee565b34801561047257600080fd5b506101e7610481366004614665565b6122d1565b34801561049257600080fd5b5061032e6104a13660046146a6565b612326565b3480156104b257600080fd5b506101e76104c13660046146f1565b6123df565b3480156104d257600080fd5b506101e76104e1366004614665565b61291b565b3480156104f257600080fd5b50610506610501366004614795565b612957565b6040516001600160401b039091168152602001610217565b34801561052a57600080fd5b506101e76105393660046147f2565b612aab565b34801561054a57600080fd5b506065546001600160a01b03166102ee565b34801561056857600080fd5b506101e761057736600461412f565b612b56565b34801561058857600080fd5b506101e7610597366004614874565b612bc7565b6105a46131f4565b60028510156105c65760405163af0ba14d60e01b815260040160405180910390fd5b6105ec6105d388806148cc565b60208a01356105e286806148cc565b876020013561324d565b61064e8686600081811061060257610602614912565b905060200281019061061491906148cc565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061328892505050565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb36106818c806148cc565b8d602001356040518463ffffffff1660e01b81526004016106a493929190614951565b600060405180830381865af41580156106c1573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106e991908101906149c5565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60078a8e806040019061071691906148cc565b8f8f6107228e806148cc565b8f602001356040518a63ffffffff1660e01b815260040161074b99989796959493929190614a4e565b600060405180830381865af4158015610768573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079091908101906149c5565b6040518463ffffffff1660e01b81526004016107ae93929190614b68565b600060405180830381600087803b1580156107c857600080fd5b505af11580156107dc573d6000803e3d6000fd5b50600092506107f791506107f2905089806148cc565b613307565b9050600080610869836301d08fc560e71b6020808e01359089013561081f60408b018b6148cc565b6040516024016108329493929190614d16565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915261339a565b9150915081156108ce57610882838b8b8b8b8b8b613486565b826001600160a01b03167fcf8be9ab2b5edf8beb2c45abe8e0cc7646318ac19f6c3164ba2e19e93a8a32af8b602001356040516108c191815260200190565b60405180910390a2610910565b826001600160a01b03167f971a4433f5bff5f011728a4123aeeca4b5275ac20b013cf276e65510491ac26f8260405161090791906145c8565b60405180910390a25b50505061091d6001609755565b50505050505050565b61092e6131f4565b6002831461094f5760405163af0ba14d60e01b815260040160405180910390fd5b61095c6105d388806148cc565b6109728484600081811061060257610602614912565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb36109a58c806148cc565b8d602001356040518463ffffffff1660e01b81526004016109c893929190614951565b600060405180830381865af41580156109e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a0d91908101906149c5565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60068c8e8060400190610a3a91906148cc565b8d8d610a468e806148cc565b8f602001356040518a63ffffffff1660e01b8152600401610a6f99989796959493929190614a4e565b600060405180830381865af4158015610a8c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ab491908101906149c5565b6040518463ffffffff1660e01b8152600401610ad293929190614b68565b600060405180830381600087803b158015610aec57600080fd5b505af1158015610b00573d6000803e3d6000fd5b5060009250610b1691506107f2905089806148cc565b9050600080610b6c83634bdb559760e01b8b8a8a8f602001358b8060000190610b3f91906148cc565b8d602001358e8060400190610b5491906148cc565b60405160240161083299989796959493929190614d86565b915091508115610bdc57826001600160a01b03167ff910705a7a768eb5958f281a5f84cae8bffc5dd811ca5cd303dda140a423698c82806020019051810190610bb59190614deb565b8b8b8b8b610bc38c806148cc565b8d602001356040516108c1989796959493929190614e33565b826001600160a01b03167f9e2fe55a3b54b57f82334c273f8d048cd7f05ad19c16cf334276a8c1fec4b6fd8260405161090791906145c8565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610c665760405162461bcd60e51b8152600401610c5d90614e99565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610caf6000805160206157e9833981519152546001600160a01b031690565b6001600160a01b031614610cd55760405162461bcd60e51b8152600401610c5d90614ee5565b610cde81613726565b60408051600080825260208201909252610cfa9183919061372e565b50565b610d056131f4565b600283141580610d13575080155b15610d3157604051637d6ba8a560e01b815260040160405180910390fd5b6000879003610d535760405163f61bbcf360e01b815260040160405180910390fd5b336001600160a01b03167f20fd8a5856711b18d00def4aa6abafbe00ce6d60795e015cc1cad35eb9b463598989898989898989604051610d9a989796959493929190614f31565b60405180910390a2610dac6001609755565b5050505050505050565b610dfc6040805160e08101909152606081526020810160008152602001600015158152602001606081526020016060815260200160008019168152602001606081525090565b6001600160a01b038316600090815260fb6020908152604080832085845290915290819020815160e08101909252805482908290610e3990614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054610e6590614f91565b8015610eb25780601f10610e8757610100808354040283529160200191610eb2565b820191906000526020600020905b815481529060010190602001808311610e9557829003601f168201915b5050509183525050600182015460209091019060ff166002811115610ed957610ed96142d2565b6002811115610eea57610eea6142d2565b81526001820154610100900460ff161515602080830191909152600283018054604080518285028101850182528281529401939260009084015b82821015610fd0578382906000526020600020018054610f4390614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054610f6f90614f91565b8015610fbc5780601f10610f9157610100808354040283529160200191610fbc565b820191906000526020600020905b815481529060010190602001808311610f9f57829003601f168201915b505050505081526020019060010190610f24565b505050508152602001600382018054610fe890614f91565b80601f016020809104026020016040519081016040528092919081815260200182805461101490614f91565b80156110615780601f1061103657610100808354040283529160200191611061565b820191906000526020600020905b81548152906001019060200180831161104457829003601f168201915b505050505081526020016004820154815260200160058201805461108490614f91565b80601f01602080910402602001604051908101604052809291908181526020018280546110b090614f91565b80156110fd5780601f106110d2576101008083540402835291602001916110fd565b820191906000526020600020905b8154815290600101906020018083116110e057829003601f168201915b505050505081525050905092915050565b6111166131f4565b60028510156111385760405163af0ba14d60e01b815260040160405180910390fd5b6111456105d388806148cc565b61115b8686600081811061060257610602614912565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb361118e8c806148cc565b8d602001356040518463ffffffff1660e01b81526004016111b193929190614951565b600060405180830381865af41580156111ce573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111f691908101906149c5565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60088a8e806040019061122391906148cc565b8f8f61122f8e806148cc565b8f602001356040518a63ffffffff1660e01b815260040161125899989796959493929190614a4e565b600060405180830381865af4158015611275573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261129d91908101906149c5565b6040518463ffffffff1660e01b81526004016112bb93929190614b68565b600060405180830381600087803b1580156112d557600080fd5b505af11580156112e9573d6000803e3d6000fd5b50600092506112ff91506107f2905089806148cc565b90506000806113278363fad28a2460e01b8c6020013560405160240161083291815260200190565b91509150811561137f57611340838b8b8b8b8b8b613486565b826001600160a01b03167fe80f571f70f7cabf9d7ac60ece08421be374117776c311c327a083ca398f802f8b602001356040516108c191815260200190565b826001600160a01b03167ff6a58ef30f66943749e8c29c661c84da143a1c8ed017f5faa92b509e0000875a8260405161090791906145c8565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036114005760405162461bcd60e51b8152600401610c5d90614e99565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166114496000805160206157e9833981519152546001600160a01b031690565b6001600160a01b03161461146f5760405162461bcd60e51b8152600401610c5d90614ee5565b61147882613726565b6114848282600161372e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146115285760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c00000000000000006064820152608401610c5d565b506000805160206157e983398151915290565b611543613899565b61154e8383836138f3565b505050565b61155b6131f4565b61157461156b6020840184614fc5565b6020013561398e565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634b5728d1866040518263ffffffff1660e01b81526004016115ba9190615047565b600060405180830381865af41580156115d7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526115ff91908101906149c5565b604051637e4794ed60e11b815273__$d825222459c46c14afb2efe0967c30e98d$__9063fc8f29da90611636908990600401615047565b602060405180830381865af4158015611653573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116779190615109565b60405160200161168991815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b81526004016116b693929190614b68565b600060405180830381600087803b1580156116d057600080fd5b505af11580156116e4573d6000803e3d6000fd5b5050505060006117078380602001906116fd9190614fc5565b6107f290806148cc565b6001600160a01b0381166000908152610100602090815260408220929350909190829061173690870187614fc5565b602001358152602001908152602001600020600085604001602081019061175d9190615122565b6001600160401b0316815260208101919091526040016000205460ff169050801561179b5760405163066c745760e01b815260040160405180910390fd5b6117c36117ae60e0860160c08701615122565b6117be60c0870160a08801615122565b613a59565b6117e0576040516312c9cc9f60e01b815260040160405180910390fd5b6117ed6020850185614fc5565b602001356001600160a01b0383167fedbcd9eeb09d85c3ea1b5bf002c04478059cb261cab82c903885cefccae374bc61182c6060880160408901615122565b6080880161184060e08a0160c08b01615122565b60405161184f9392919061513d565b60405180910390a350506114846001609755565b61186b6131f4565b6114846001609755565b61187d6131f4565b61188d61156b6020840184614fc5565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634b5728d1866040518263ffffffff1660e01b81526004016118d39190615047565b600060405180830381865af41580156118f0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261191891908101906149c5565b604051637e4794ed60e11b815273__$d825222459c46c14afb2efe0967c30e98d$__9063fc8f29da9061194f908990600401615047565b602060405180830381865af415801561196c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119909190615109565b6040516020016119a291815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b81526004016119cf93929190614b68565b600060405180830381600087803b1580156119e957600080fd5b505af11580156119fd573d6000803e3d6000fd5b505050506000611a168380602001906116fd9190614fc5565b6001600160a01b03811660009081526101006020908152604082209293509091908290611a4590870187614fc5565b6020013581526020019081526020016000206000856040016020810190611a6c9190615122565b6001600160401b0316815260208101919091526040016000205460ff1690508015611aaa5760405163066c745760e01b815260040160405180910390fd5b6001600160a01b03821660009081526101006020908152604082206001929091611ad690880188614fc5565b6020013581526020019081526020016000206000866040016020810190611afd9190615122565b6001600160401b031681526020810191909152604001600020805460ff191691151591909117905560026001600160a01b038316600090815260fb6020908152604082209190611b4f90880188614fc5565b60209081013582528101919091526040016000206001015460ff166002811115611b7b57611b7b6142d2565b03611c7a576001600160a01b038216600090815260fd6020908152604082209190611ba890870187614fc5565b60209081013582528101919091526040908101600020546001600160401b031690611bd99060608701908701615122565b6001600160401b031614611c005760405163362a414d60e01b815260040160405180910390fd5b611c106060850160408601615122565b611c1b90600161516d565b6001600160a01b038316600090815260fd6020908152604082209190611c4390880188614fc5565b60200135815260200190815260200160002060006101000a8154816001600160401b0302191690836001600160401b031602179055505b611c876020850185614fc5565b602001356001600160a01b0383167fde5b57e6566d68a30b0979431df3d5df6db3b9aa89f8820f595b9315bf86d067611cc66060880160408901615122565b6040516001600160401b03909116815260200160405180910390a3611cf46117ae60e0860160c08701615122565b15611d7757611d066020850185614fc5565b602001356001600160a01b0383167fedbcd9eeb09d85c3ea1b5bf002c04478059cb261cab82c903885cefccae374bc611d456060880160408901615122565b60808801611d5960e08a0160c08b01615122565b604051611d689392919061513d565b60405180910390a3505061186b565b604080518082019091526000815260606020820152600080611dac85634dcc0aa660e01b896040516024016108329190615257565b915091508115611dd15780806020019051810190611dca919061526a565b9250611de9565b60408051808201909152600081526020810182905292505b6001600160a01b0385166000908152610101602090815260408220908290611e13908b018b614fc5565b6020013581526020019081526020016000206000896040016020810190611e3a9190615122565b6001600160401b0316815260208101919091526040016000205460ff1690508015611e7857604051637aa549d360e01b815260040160405180910390fd5b6001600160a01b03861660009081526101016020908152604082206001929091611ea4908c018c614fc5565b60200135815260200190815260200160002060008a6040016020810190611ecb9190615122565b6001600160401b03168152602080820192909252604001600020805460ff191692151592909217909155611f0190890189614fc5565b602001356001600160a01b0387167fa32e6f42b1d63fb83ad73b009a6dbb9413d1da02e95b1bb08f081815eea8db20611f4060608c0160408d01615122565b87604051611f4f929190615320565b60405180910390a35050505050506114846001609755565b611f6f613899565b611f796000613aa7565b565b60f98054611f8890614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054611fb490614f91565b80156120015780601f10611fd657610100808354040283529160200191612001565b820191906000526020600020905b815481529060010190602001808311611fe457829003601f168201915b505050505081565b60655433906001600160a01b031681146120775760405162461bcd60e51b815260206004820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152608401610c5d565b610cfa81613aa7565b600054600290610100900460ff161580156120a2575060005460ff8083169116105b6121055760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610c5d565b6000805461ffff191660ff8316176101001790556121216131f4565b82516000036121435760405163e8cf362360e01b815260040160405180910390fd5b6001600160a01b03821661216a5760405163cbdd34cf60e01b815260040160405180910390fd5b612172613ac0565b61217a613aef565b60f96121868482615388565b50825160fa805463ffffffff191663ffffffff90921691909117905561010580546001600160a01b0319166001600160a01b03841617905560016097556000805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a1505050565b6122116131f4565b61221a81613b1e565b33600090815260fb6020908152604080832084845290915281209061223f8282613e39565b60018201805461ffff1916905561225a600283016000613e73565b612268600383016000613e39565b60048201600090556005820160006122809190613e39565b505060008181526101036020526040812061229a91613e39565b604051819033907f21372e37743553ba8e5f61239803174a827c7732d53ec8adcb76c6b3bb2c13f190600090a3610cfa6001609755565b6122d9613899565b60008190036122fb5760405163e8cf362360e01b815260040160405180910390fd5b60f9612308828483615447565b5060fa805463ffffffff191663ffffffff9290921691909117905550565b600061236783838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061328892505050565b6001600160a01b03166344c9af28856040518263ffffffff1660e01b815260040161239491815260200190565b602060405180830381865afa1580156123b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123d59190615109565b90505b9392505050565b6123e76131f4565b60006123f66116fd8680614fc5565b905061240561156b8680614fc5565b6001600160a01b031663cb535ab58373__$d825222459c46c14afb2efe0967c30e98d$__6311a7a373896040518263ffffffff1660e01b815260040161244b9190615047565b600060405180830381865af4158015612468573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261249091908101906149c5565b6040516374e9704560e01b815273__$d825222459c46c14afb2efe0967c30e98d$__906374e97045906124c9908b908b90600401615507565b602060405180830381865af41580156124e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061250a9190615109565b60405160200161251c91815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b815260040161254993929190614b68565b600060405180830381600087803b15801561256357600080fd5b505af1158015612577573d6000803e3d6000fd5b505050506001600160a01b038116600090815260ff602052604081208161259e8880614fc5565b60200135815260200190815260200160002060008760400160208101906125c59190615122565b6001600160401b0316815260208101919091526040016000205460ff169050806126025760405163ca89746b60e01b815260040160405180910390fd5b6000806126a184637e1d42b560e01b8a73__$d825222459c46c14afb2efe0967c30e98d$__63360b8cd78c8c6040518363ffffffff1660e01b815260040161264b929190615507565b600060405180830381865af4158015612668573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052612690919081019061526a565b60405160240161083292919061551b565b9150915081156128c55760026001600160a01b038516600090815260fb60205260408120906126d08b80614fc5565b60209081013582528101919091526040016000206001015460ff1660028111156126fc576126fc6142d2565b036127f1576001600160a01b038416600090815260fe60205260408120906127248a80614fc5565b60209081013582528101919091526040908101600020546001600160401b0316906127559060608b01908b01615122565b6001600160401b03161461277c5760405163362a414d60e01b815260040160405180910390fd5b61278c6060890160408a01615122565b61279790600161516d565b6001600160a01b038516600090815260fe60205260408120906127ba8b80614fc5565b60200135815260200190815260200160002060006101000a8154816001600160401b0302191690836001600160401b031602179055505b6001600160a01b038416600090815260ff60205260408120906128148a80614fc5565b602001358152602001908152602001600020600089604001602081019061283b9190615122565b6001600160401b031681526020810191909152604001600020805460ff191690556128668880614fc5565b602001356001600160a01b0385167fe46f6591236abe528fe47a3b281fb002524dadd3e62b1f317ed285d07273c3b16128a560608c0160408d01615122565b6040516001600160401b03909116815260200160405180910390a3612907565b836001600160a01b03167f625eea143c9dae6915c809da47016c22d9cd006c3ace7c345c5cbcf57d3aefbc826040516128fe91906145c8565b60405180910390a25b505050506129156001609755565b50505050565b612923613899565b6101048282604051612936929190615540565b90815260405190819003602001902080546001600160a01b03191690555050565b60006129616131f4565b61296a85613b1e565b42826001600160401b0316116129935760405163551ea0fb60e11b815260040160405180910390fd5b5033600090815260fc602090815260408083208784529091528120546001600160401b0316908190036129d957604051631e510bfb60e21b815260040160405180910390fd5b33600090815260ff6020908152604080832088845282528083206001600160401b03851684529091529020805460ff19166001908117909155612a1d90829061516d565b33600081815260fc602090815260408083208a845290915290819020805467ffffffffffffffff19166001600160401b03949094169390931790925590518691907fb5bff96e18da044e4e34510d16df9053b9f1920f6a960732e5aaf22fe9b8013690612a91908890889087908990615550565b60405180910390a3612aa36001609755565b949350505050565b612aea82828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061328892505050565b6001600160a01b03166349ff245e878787876040518563ffffffff1660e01b8152600401612b1b9493929190615585565b600060405180830381600087803b158015612b3557600080fd5b505af1158015612b49573d6000803e3d6000fd5b505050505b505050505050565b612b5e613899565b606580546001600160a01b0383166001600160a01b03199091168117909155612b8f6033546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b612bcf6131f4565b6001600160a01b038316612bf65760405163cbdd34cf60e01b815260040160405180910390fd5b6001600160a01b038316600090815260fb60209081526040808320858452909152808220815160e08101909252805482908290612c3290614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054612c5e90614f91565b8015612cab5780601f10612c8057610100808354040283529160200191612cab565b820191906000526020600020905b815481529060010190602001808311612c8e57829003601f168201915b5050509183525050600182015460209091019060ff166002811115612cd257612cd26142d2565b6002811115612ce357612ce36142d2565b81526001820154610100900460ff161515602080830191909152600283018054604080518285028101850182528281529401939260009084015b82821015612dc9578382906000526020600020018054612d3c90614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054612d6890614f91565b8015612db55780601f10612d8a57610100808354040283529160200191612db5565b820191906000526020600020905b815481529060010190602001808311612d9857829003601f168201915b505050505081526020019060010190612d1d565b505050508152602001600382018054612de190614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054612e0d90614f91565b8015612e5a5780601f10612e2f57610100808354040283529160200191612e5a565b820191906000526020600020905b815481529060010190602001808311612e3d57829003601f168201915b5050505050815260200160048201548152602001600582018054612e7d90614f91565b80601f0160208091040260200160405190810160405280929190818152602001828054612ea990614f91565b8015612ef65780601f10612ecb57610100808354040283529160200191612ef6565b820191906000526020600020905b815481529060010190602001808311612ed957829003601f168201915b5050509190925250505060a0810151909150612f2557604051634d93b09d60e11b815260040160405180910390fd5b612f2e8361398e565b6001600160a01b031663cb535ab58373__$d825222459c46c14afb2efe0967c30e98d$__636f6547268560c00151886040518363ffffffff1660e01b8152600401612f7a9291906155ac565b600060405180830381865af4158015612f97573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052612fbf91908101906149c5565b602085015185516060870151608088015160a0890151604051631f621e1560e31b815273__$d825222459c46c14afb2efe0967c30e98d$__9563fb10f0a8956130159560099592949193909291906004016155ce565b600060405180830381865af4158015613032573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261305a91908101906149c5565b6040518463ffffffff1660e01b815260040161307893929190614b68565b600060405180830381600087803b15801561309257600080fd5b505af11580156130a6573d6000803e3d6000fd5b505050506000806130d686633f9fdbe460e01b8786608001518760a0015160405160240161083293929190615676565b6001600160a01b038816600090815260fb602090815260408083208a845290915281209294509092506131098282613e39565b60018201805461ffff19169055613124600283016000613e73565b613132600383016000613e39565b600482016000905560058201600061314a9190613e39565b505060008581526101036020526040812061316491613e39565b81156131a55760405185906001600160a01b038816907f5f010dbbd6bf46aec8131c5456301a75cd688d3cca9bc8380c9e26301be2072990600090a36131e7565b856001600160a01b03167fc9d36d7a317cb116925d5cb66f0069fe825822fe23e9cf3f421c38cf444caa30826040516131de91906145c8565b60405180910390a25b50505061154e6001609755565b6002609754036132465760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610c5d565b6002609755565b841580613258575081155b80613261575083155b8061326a575080155b15612b4e57604051637d6ba8a560e01b815260040160405180910390fd5b600081516000036132b65760405163524e171160e01b81526020600482015260006024820152604401610c5d565b610104826040516132c7919061569f565b908152604051908190036020019020546001600160a01b0316905080613302578160405163036c4d8760e11b8152600401610c5d91906145c8565b919050565b60fa5460009073__$f61eb90c6f674e787d51c07f105fa231e2$__9063a1ef9a989061333c90859063ffffffff1681886156b1565b6040518363ffffffff1660e01b8152600401613359929190615507565b602060405180830381865af4158015613376573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123d891906156db565b600060606001600160a01b0384163b6133e257505060408051808201909152601481527318d85b1b081d1bc81b9bdb8b58dbdb9d1c9858dd60621b602082015260009061347f565b60005a9050846001600160a01b0316846040516133ff919061569f565b6000604051808303816000865af19150503d806000811461343c576040519150601f19603f3d011682016040523d82523d6000602084013e613441565b606091505b5090935091508215801561345f575061345b6040826156f8565b5a11155b1561347d5760405163b08ede0960e01b815260040160405180910390fd5b505b9250929050565b6040518060e001604052808780604001906134a191906148cc565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252506020018460028111156134ed576134ed6142d2565b81528315156020820152604001613504868861571a565b815260200161351383806148cc565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252506020838101359082015260400161356188806148cc565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509390945250506001600160a01b038a16815260fb602090815260408083208b83013584529091529020825190915081906135cb9082615388565b50602082015160018083018054909160ff19909116908360028111156135f3576135f36142d2565b021790555060408201516001820180549115156101000261ff001990921691909117905560608201518051613632916002840191602090910190613e91565b50608082015160038201906136479082615388565b5060a0820151600482015560c082015160058201906136669082615388565b5050506001600160a01b038716600081815260fc602090815260408083208a8301358085529083528184208054600167ffffffffffffffff19918216811790925586865260fd85528386208387528552838620805482168317905595855260fe84528285209185529252822080549093161790915585908590816136ec576136ec614912565b90506020028101906136fe91906148cc565b60208089013560009081526101039091526040902091610dac919083615447565b6001609755565b610cfa613899565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156137615761154e83613b59565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156137bb575060408051601f3d908101601f191682019092526137b891810190615109565b60015b61381e5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610c5d565b6000805160206157e9833981519152811461388d5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610c5d565b5061154e838383613bf5565b6033546001600160a01b03163314611f795760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610c5d565b600082900361391f5760405163524e171160e01b81526020600482015260006024820152604401610c5d565b6001600160a01b0381166139465760405163cbdd34cf60e01b815260040160405180910390fd5b80610104848460405161395a929190615540565b90815260405190819003602001902080546001600160a01b03929092166001600160a01b0319909216919091179055505050565b60008181526101036020526040812080548291906139ab90614f91565b80601f01602080910402602001604051908101604052809291908181526020018280546139d790614f91565b8015613a245780601f106139f957610100808354040283529160200191613a24565b820191906000526020600020905b815481529060010190602001808311613a0757829003601f168201915b505050505090508051600003613a50576040516363b99a9d60e11b815260048101849052602401610c5d565b6123d881613288565b60006001600160401b03831615801590613a7c5750826001600160401b03164210155b806123d857506001600160401b038216158015906123d85750506001600160401b0316431015919050565b606580546001600160a01b0319169055610cfa81613c1a565b600054610100900460ff16613ae75760405162461bcd60e51b8152600401610c5d9061579d565b611f79613c6c565b600054610100900460ff16613b165760405162461bcd60e51b8152600401610c5d9061579d565b611f79613c9c565b33600090815260fb60209081526040808320848452909152902060040154610cfa57604051631109bfb360e31b815260040160405180910390fd5b6001600160a01b0381163b613bc65760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c5d565b6000805160206157e983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b613bfe83613cc3565b600082511180613c0b5750805b1561154e576129158383613d03565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff16613c935760405162461bcd60e51b8152600401610c5d9061579d565b611f7933613aa7565b600054610100900460ff1661371f5760405162461bcd60e51b8152600401610c5d9061579d565b613ccc81613b59565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606123d88383604051806060016040528060278152602001615809602791396060600080856001600160a01b031685604051613d40919061569f565b600060405180830381855af49150503d8060008114613d7b576040519150601f19603f3d011682016040523d82523d6000602084013e613d80565b606091505b5091509150613d9186838387613d9b565b9695505050505050565b60608315613e0a578251600003613e03576001600160a01b0385163b613e035760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610c5d565b5081612aa3565b612aa38383815115613e1f5781518083602001fd5b8060405162461bcd60e51b8152600401610c5d91906145c8565b508054613e4590614f91565b6000825580601f10613e55575050565b601f016020900490600052602060002090810190610cfa9190613ee7565b5080546000825590600052602060002090810190610cfa9190613efc565b828054828255906000526020600020908101928215613ed7579160200282015b82811115613ed75782518290613ec79082615388565b5091602001919060010190613eb1565b50613ee3929150613efc565b5090565b5b80821115613ee35760008155600101613ee8565b80821115613ee3576000613f108282613e39565b50600101613efc565b600060608284031215613f2b57600080fd5b50919050565b60008083601f840112613f4357600080fd5b5081356001600160401b03811115613f5a57600080fd5b6020830191508360208260051b850101111561347f57600080fd5b80356003811061330257600080fd5b8015158114610cfa57600080fd5b803561330281613f84565b600060408284031215613f2b57600080fd5b600080600080600080600060c0888a031215613fca57600080fd5b87356001600160401b0380821115613fe157600080fd5b613fed8b838c01613f19565b985060208a013591508082111561400357600080fd5b61400f8b838c01613f31565b909850965086915061402360408b01613f75565b955061403160608b01613f92565b945060808a013591508082111561404757600080fd5b6140538b838c01613f19565b935060a08a013591508082111561406957600080fd5b506140768a828b01613f9d565b91505092959891949750929550565b600080600080600080600060c0888a0312156140a057600080fd5b87356001600160401b03808211156140b757600080fd5b6140c38b838c01613f19565b98506140d160208b01613f75565b97506140df60408b01613f92565b965060608a01359150808211156140f557600080fd5b6141018b838c01613f31565b909650945060808a013591508082111561404757600080fd5b6001600160a01b0381168114610cfa57600080fd5b60006020828403121561414157600080fd5b81356123d88161411a565b60008083601f84011261415e57600080fd5b5081356001600160401b0381111561417557600080fd5b60208301915083602082850101111561347f57600080fd5b60008060008060008060008060a0898b0312156141a957600080fd5b88356001600160401b03808211156141c057600080fd5b6141cc8c838d0161414c565b909a5098508891506141e060208c01613f75565b975060408b013591506141f282613f84565b90955060608a0135908082111561420857600080fd5b6142148c838d01613f31565b909650945060808b013591508082111561422d57600080fd5b5061423a8b828c0161414c565b999c989b5096995094979396929594505050565b6000806040838503121561426157600080fd5b823561426c8161411a565b946020939093013593505050565b60005b8381101561429557818101518382015260200161427d565b838111156129155750506000910152565b600081518084526142be81602086016020860161427a565b601f01601f19169290920160200192915050565b634e487b7160e01b600052602160045260246000fd5b600381106142f8576142f86142d2565b9052565b600081518084526020808501808196508360051b8101915082860160005b858110156143445782840389526143328483516142a6565b9885019893509084019060010161431a565b5091979650505050505050565b602081526000825160e0602084015261436e6101008401826142a6565b9050602084015161438260408501826142e8565b506040840151151560608401526060840151601f19808584030160808601526143ab83836142fc565b925060808601519150808584030160a08601526143c883836142a6565b925060a086015160c086015260c08601519150808584030160e0860152506143f082826142a6565b95945050505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715614437576144376143f9565b604052919050565b60006001600160401b03821115614458576144586143f9565b50601f01601f191660200190565b60006144796144748461443f565b61440f565b905082815283838301111561448d57600080fd5b828260208301376000602084830101529392505050565b600080604083850312156144b757600080fd5b82356144c28161411a565b915060208301356001600160401b038111156144dd57600080fd5b8301601f810185136144ee57600080fd5b6144fd85823560208401614466565b9150509250929050565b60008060006040848603121561451c57600080fd5b83356001600160401b0381111561453257600080fd5b61453e8682870161414c565b90945092505060208401356145528161411a565b809150509250925092565b600060e08284031215613f2b57600080fd5b6000806040838503121561458257600080fd5b82356001600160401b038082111561459957600080fd5b6145a58683870161455d565b935060208501359150808211156145bb57600080fd5b506144fd85828601613f9d565b6020815260006123d860208301846142a6565b600082601f8301126145ec57600080fd5b6123d883833560208501614466565b6000806040838503121561460e57600080fd5b82356001600160401b0381111561462457600080fd5b614630858286016145db565b92505060208301356146418161411a565b809150509250929050565b60006020828403121561465e57600080fd5b5035919050565b6000806020838503121561467857600080fd5b82356001600160401b0381111561468e57600080fd5b61469a8582860161414c565b90969095509350505050565b6000806000604084860312156146bb57600080fd5b8335925060208401356001600160401b038111156146d857600080fd5b6146e48682870161414c565b9497909650939450505050565b6000806000806060858703121561470757600080fd5b84356001600160401b038082111561471e57600080fd5b61472a8883890161455d565b9550602087013591508082111561474057600080fd5b61474c8883890161414c565b9095509350604087013591508082111561476557600080fd5b5061477287828801613f9d565b91505092959194509250565b80356001600160401b038116811461330257600080fd5b600080600080606085870312156147ab57600080fd5b8435935060208501356001600160401b038111156147c857600080fd5b6147d48782880161414c565b90945092506147e790506040860161477e565b905092959194509250565b6000806000806000806080878903121561480b57600080fd5b86356001600160401b038082111561482257600080fd5b61482e8a838b0161414c565b90985096506020890135955060408901359450606089013591508082111561485557600080fd5b5061486289828a0161414c565b979a9699509497509295939492505050565b60008060006060848603121561488957600080fd5b83356148948161411a565b92506020840135915060408401356001600160401b038111156148b657600080fd5b6148c286828701613f9d565b9150509250925092565b6000808335601e198436030181126148e357600080fd5b8301803591506001600160401b038211156148fd57600080fd5b60200191503681900382131561347f57600080fd5b634e487b7160e01b600052603260045260246000fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b604081526000614965604083018587614928565b9050826020830152949350505050565b60006149836144748461443f565b905082815283838301111561499757600080fd5b6123d883602083018461427a565b600082601f8301126149b657600080fd5b6123d883835160208501614975565b6000602082840312156149d757600080fd5b81516001600160401b038111156149ed57600080fd5b612aa3848285016149a5565b600a81106142f8576142f86142d2565b6000808335601e19843603018112614a2057600080fd5b83016020810192503590506001600160401b03811115614a3f57600080fd5b80360382131561347f57600080fd5b614a58818b6149f9565b60006020614a688184018c6142e8565b60c06040840152614a7d60c084018a8c614928565b8381036060850152878152818101600589901b820183018a60005b8b811015614ad257848303601f19018452614ab3828e614a09565b614abe858284614928565b958801959450505090850190600101614a98565b50508581036080870152614ae781898b614928565b9450505050508260a08301529a9950505050505050505050565b6000808335601e19843603018112614b1857600080fd5b83016020810192503590506001600160401b03811115614b3757600080fd5b8060051b360382131561347f57600080fd5b60008235603e19833603018112614b5f57600080fd5b90910192915050565b6000606080835260a0808401614b7e8889614b01565b60408786018190529281905260059260c08089019083861b8a01018460005b85811015614cde578b830360bf19018452813536889003607e19018112614bc357600080fd5b87016080848101614bd48380614b01565b928752908290528b860191808c1b87018d0191908160005b82811015614c5c57898503609f19018652614c078285614b49565b614c118182614a09565b8e8852614c218f89018284614928565b9150506020614c3281840184614a09565b9350888303828a0152614c46838583614928565b9982019998505093909301925050600101614bec565b5050505060209150614c7082840184614a09565b87830384890152614c82838284614928565b92505050614c9288840184614a09565b8783038a890152614ca4838284614928565b92505050614cb48d840184614a09565b93508682038e880152614cc8828583614928565b9783019796505050929092019150600101614b9d565b505060208d013560808b015289810360208b0152614cfc818d6142a6565b97505050878603818901525050505050613d9181856142a6565b848152836020820152606060408201526000613d91606083018486614928565b81835260006020808501808196508560051b810191508460005b87811015614344578284038952614d678288614a09565b614d72868284614928565b9a87019a9550505090840190600101614d50565b614d90818b6142e8565b60c060208201526000614da760c083018a8c614d36565b8860408401528281036060840152614dc081888a614928565b905085608084015282810360a0840152614ddb818587614928565b9c9b505050505050505050505050565b600060208284031215614dfd57600080fd5b81516001600160401b03811115614e1357600080fd5b8201601f81018413614e2457600080fd5b612aa384825160208401614975565b60c081526000614e4660c083018b6142a6565b614e53602084018b6142e8565b88151560408401528281036060840152614e6e81888a614d36565b90508281036080840152614e83818688614928565b9150508260a08301529998505050505050505050565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b60a081526000614f4560a083018a8c614928565b614f52602084018a6142e8565b87151560408401528281036060840152614f6d818789614d36565b90508281036080840152614f82818587614928565b9b9a5050505050505050505050565b600181811c90821680614fa557607f821691505b602082108103613f2b57634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112614fdb57600080fd5b9190910192915050565b6000614ff18283614a09565b60408552615003604086018284614928565b915050602083013560208501528091505092915050565b6001600160401b038061502c8361477e565b1683528061503c6020840161477e565b166020840152505050565b6020815260006150578384614b49565b60e0602084015261506c610100840182614fe5565b905061507b6020850185614b49565b601f19808584030160408601526150928383614fe5565b92506150a06040870161477e565b91506001600160401b0380831660608701526150bf6060880188614a09565b9350828786030160808801526150d6858583614928565b9450506150e960a087016080890161501a565b806150f660c0890161477e565b1660e08701525050508091505092915050565b60006020828403121561511b57600080fd5b5051919050565b60006020828403121561513457600080fd5b6123d88261477e565b6001600160401b038481168252608082019061515c602084018661501a565b808416606084015250949350505050565b60006001600160401b0380831681851680830382111561519d57634e487b7160e01b600052601160045260246000fd5b01949350505050565b60006151b28283614b49565b60e084526151c360e0850182614fe5565b90506151d26020840184614b49565b84820360208601526151e48282614fe5565b9150506151f36040840161477e565b6001600160401b0380821660408701526152106060860186614a09565b92508684036060880152615225848483614928565b935050615238608087016080870161501a565b8061524560c0870161477e565b1660c087015250508091505092915050565b6020815260006123d860208301846151a6565b60006020828403121561527c57600080fd5b81516001600160401b038082111561529357600080fd5b90830190604082860312156152a757600080fd5b6040516040810181811083821117156152c2576152c26143f9565b60405282516152d081613f84565b81526020830151828111156152e457600080fd5b6152f0878286016149a5565b60208301525095945050505050565b8051151582526000602082015160406020850152612aa360408501826142a6565b6001600160401b03831681526040602082015260006123d560408301846152ff565b601f82111561154e57600081815260208120601f850160051c810160208610156153695750805b601f850160051c820191505b81811015612b4e57828155600101615375565b81516001600160401b038111156153a1576153a16143f9565b6153b5816153af8454614f91565b84615342565b602080601f8311600181146153ea57600084156153d25750858301515b600019600386901b1c1916600185901b178555612b4e565b600085815260208120601f198616915b82811015615419578886015182559484019460019091019084016153fa565b50858210156154375787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6001600160401b0383111561545e5761545e6143f9565b6154728361546c8354614f91565b83615342565b6000601f8411600181146154a6576000851561548e5750838201355b600019600387901b1c1916600186901b178355615500565b600083815260209020601f19861690835b828110156154d757868501358255602094850194600190920191016154b7565b50868210156154f45760001960f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b6020815260006123d5602083018486614928565b60408152600061552e60408301856151a6565b82810360208401526143f081856152ff565b8183823760009101908152919050565b606081526000615564606083018688614928565b6001600160401b039485166020840152929093166040909101529392505050565b606081526000615599606083018688614928565b6020830194909452506040015292915050565b6040815260006155bf60408301856142a6565b90508260208301529392505050565b6155d881886149f9565b600060206155e8818401896142e8565b60c060408401526155fc60c08401886142a6565b8381036060850152865180825282820190600581901b83018401848a0160005b8381101561564a57601f198684030185526156388383516142a6565b9487019492509086019060010161561c565b5050868103608088015261565e818a6142a6565b955050505050508260a0830152979650505050505050565b83815260606020820152600061568f60608301856142a6565b9050826040830152949350505050565b60008251614fdb81846020870161427a565b600080858511156156c157600080fd5b838611156156ce57600080fd5b5050820193919092039150565b6000602082840312156156ed57600080fd5b81516123d88161411a565b60008261571557634e487b7160e01b600052601260045260246000fd5b500490565b60006001600160401b0380841115615734576157346143f9565b8360051b602061574581830161440f565b86815291850191818101903684111561575d57600080fd5b865b84811015615791578035868111156157775760008081fd5b61578336828b016145db565b84525091830191830161575f565b50979650505050505050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b60608201526080019056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220bf8a17eff072122ba44ed6aa283e975964c11923f10fd06add4b4e9ef36c245264736f6c634300080f0033"; + "0x60a0604052306080523480156200001557600080fd5b506200002062000026565b620000e7565b600054610100900460ff1615620000935760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811614620000e5576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6080516158d46200011f60003960008181610c1f01528181610c68015281816113c201528181611402015261149501526158d46000f3fe6080604052600436106101c25760003560e01c8063715018a6116100f7578063b12f89be11610095578063c899e27211610064578063c899e2721461051e578063e30c39781461053e578063f2fde38b1461055c578063f90b8e961461057c57600080fd5b8063b12f89be14610486578063ba5a4d25146104a6578063c00fa7c0146104c6578063c3e1155c146104e657600080fd5b80637ab4339d116100d15780637ab4339d1461040857806381bc079b146104285780638da5cb5b146104485780639f59ae711461046657600080fd5b8063715018a6146103bc5780637774a6d3146103d157806379ba5097146103f357600080fd5b8063478222c211610164578063556d51781161013e578063556d51781461033c5780635d7adf961461035c5780636050b5f31461037c5780636b67055e1461039c57600080fd5b8063478222c2146102cd5780634f1ef2861461030657806352d1902d1461031957600080fd5b80633659cfe6116101a05780633659cfe614610240578063418925b71461026057806342852d2414610280578063429446b6146102ad57600080fd5b80631eb9fc86146101c75780632494546b146101e95780632bf5d19d14610220575b600080fd5b3480156101d357600080fd5b506101e76101e2366004613fc6565b61059c565b005b3480156101f557600080fd5b5060fa546102069063ffffffff1681565b60405163ffffffff90911681526020015b60405180910390f35b34801561022c57600080fd5b506101e761023b36600461409c565b610926565b34801561024c57600080fd5b506101e761025b366004614146565b610c15565b34801561026c57600080fd5b506101e761027b3660046141a4565b610cfd565b34801561028c57600080fd5b506102a061029b366004614265565b610db6565b6040516102179190614365565b3480156102b957600080fd5b506101e76102c8366004613fc6565b61110e565b3480156102d957600080fd5b50610105546102ee906001600160a01b031681565b6040516001600160a01b039091168152602001610217565b6101e76103143660046144b8565b6113b8565b34801561032557600080fd5b5061032e611488565b604051908152602001610217565b34801561034857600080fd5b506101e761035736600461451b565b61153b565b34801561036857600080fd5b506101e7610377366004614583565b611553565b34801561038857600080fd5b506101e7610397366004614583565b611863565b3480156103a857600080fd5b506101e76103b7366004614583565b611875565b3480156103c857600080fd5b506101e7611f7e565b3480156103dd57600080fd5b506103e6611f92565b60405161021791906145dc565b3480156103ff57600080fd5b506101e7612020565b34801561041457600080fd5b506101e761042336600461460f565b612097565b34801561043457600080fd5b506101e7610443366004614660565b612220565b34801561045457600080fd5b506033546001600160a01b03166102ee565b34801561047257600080fd5b506101e7610481366004614679565b6122e8565b34801561049257600080fd5b5061032e6104a13660046146ba565b61233d565b3480156104b257600080fd5b506101e76104c1366004614705565b6123f6565b3480156104d257600080fd5b506101e76104e1366004614679565b612932565b3480156104f257600080fd5b506105066105013660046147a9565b61296e565b6040516001600160401b039091168152602001610217565b34801561052a57600080fd5b506101e7610539366004614806565b612ac2565b34801561054a57600080fd5b506065546001600160a01b03166102ee565b34801561056857600080fd5b506101e7610577366004614146565b612b6d565b34801561058857600080fd5b506101e7610597366004614888565b612bde565b6105a461320b565b60028510156105c65760405163af0ba14d60e01b815260040160405180910390fd5b6105ec6105d388806148e0565b60208a01356105e286806148e0565b8760200135613264565b61064e8686600081811061060257610602614926565b905060200281019061061491906148e0565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061329f92505050565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb36106818c806148e0565b8d602001356040518463ffffffff1660e01b81526004016106a493929190614965565b600060405180830381865af41580156106c1573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526106e991908101906149d9565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60078a8e806040019061071691906148e0565b8f8f6107228e806148e0565b8f602001356040518a63ffffffff1660e01b815260040161074b99989796959493929190614a62565b600060405180830381865af4158015610768573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261079091908101906149d9565b6040518463ffffffff1660e01b81526004016107ae93929190614b7c565b600060405180830381600087803b1580156107c857600080fd5b505af11580156107dc573d6000803e3d6000fd5b50600092506107f791506107f2905089806148e0565b61331e565b9050600080610869836301d08fc560e71b6020808e01359089013561081f60408b018b6148e0565b6040516024016108329493929190614d2a565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b0319909316929092179091526133b1565b9150915081156108ce57610882838b8b8b8b8b8b61349d565b826001600160a01b03167fcf8be9ab2b5edf8beb2c45abe8e0cc7646318ac19f6c3164ba2e19e93a8a32af8b602001356040516108c191815260200190565b60405180910390a2610910565b826001600160a01b03167f971a4433f5bff5f011728a4123aeeca4b5275ac20b013cf276e65510491ac26f8260405161090791906145dc565b60405180910390a25b50505061091d6001609755565b50505050505050565b61092e61320b565b6002831461094f5760405163af0ba14d60e01b815260040160405180910390fd5b61095c6105d388806148e0565b6109728484600081811061060257610602614926565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb36109a58c806148e0565b8d602001356040518463ffffffff1660e01b81526004016109c893929190614965565b600060405180830381865af41580156109e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a0d91908101906149d9565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60068c8e8060400190610a3a91906148e0565b8d8d610a468e806148e0565b8f602001356040518a63ffffffff1660e01b8152600401610a6f99989796959493929190614a62565b600060405180830381865af4158015610a8c573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ab491908101906149d9565b6040518463ffffffff1660e01b8152600401610ad293929190614b7c565b600060405180830381600087803b158015610aec57600080fd5b505af1158015610b00573d6000803e3d6000fd5b5060009250610b1691506107f2905089806148e0565b9050600080610b6c83634bdb559760e01b8b8a8a8f602001358b8060000190610b3f91906148e0565b8d602001358e8060400190610b5491906148e0565b60405160240161083299989796959493929190614d97565b915091508115610bdc57826001600160a01b03167ff910705a7a768eb5958f281a5f84cae8bffc5dd811ca5cd303dda140a423698c82806020019051810190610bb59190614dfc565b8b8b8b8b610bc38c806148e0565b8d602001356040516108c1989796959493929190614e44565b826001600160a01b03167f9e2fe55a3b54b57f82334c273f8d048cd7f05ad19c16cf334276a8c1fec4b6fd8260405161090791906145dc565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610c665760405162461bcd60e51b8152600401610c5d90614eaa565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610caf600080516020615858833981519152546001600160a01b031690565b6001600160a01b031614610cd55760405162461bcd60e51b8152600401610c5d90614ef6565b610cde8161373d565b60408051600080825260208201909252610cfa91839190613745565b50565b610d0561320b565b600283141580610d13575080155b15610d3157604051637d6ba8a560e01b815260040160405180910390fd5b6000879003610d535760405163f61bbcf360e01b815260040160405180910390fd5b336001600160a01b03167f20fd8a5856711b18d00def4aa6abafbe00ce6d60795e015cc1cad35eb9b463598989898989898989604051610d9a989796959493929190614f42565b60405180910390a2610dac6001609755565b5050505050505050565b610dfc6040805160e08101909152606081526020810160008152602001600015158152602001606081526020016060815260200160008019168152602001606081525090565b6001600160a01b038316600090815260fb6020908152604080832085845290915290819020815160e08101909252805482908290610e3990614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054610e6590614fa2565b8015610eb25780601f10610e8757610100808354040283529160200191610eb2565b820191906000526020600020905b815481529060010190602001808311610e9557829003601f168201915b5050509183525050600182015460209091019060ff166002811115610ed957610ed96142e9565b6002811115610eea57610eea6142e9565b81526001820154610100900460ff161515602080830191909152600283018054604080518285028101850182528281529401939260009084015b82821015610fd0578382906000526020600020018054610f4390614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054610f6f90614fa2565b8015610fbc5780601f10610f9157610100808354040283529160200191610fbc565b820191906000526020600020905b815481529060010190602001808311610f9f57829003601f168201915b505050505081526020019060010190610f24565b505050508152602001600382018054610fe890614fa2565b80601f016020809104026020016040519081016040528092919081815260200182805461101490614fa2565b80156110615780601f1061103657610100808354040283529160200191611061565b820191906000526020600020905b81548152906001019060200180831161104457829003601f168201915b505050505081526020016004820154815260200160058201805461108490614fa2565b80601f01602080910402602001604051908101604052809291908181526020018280546110b090614fa2565b80156110fd5780601f106110d2576101008083540402835291602001916110fd565b820191906000526020600020905b8154815290600101906020018083116110e057829003601f168201915b505050505081525050905092915050565b61111661320b565b60028510156111385760405163af0ba14d60e01b815260040160405180910390fd5b6111456105d388806148e0565b61115b8686600081811061060257610602614926565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634f9b0fb361118e8c806148e0565b8d602001356040518463ffffffff1660e01b81526004016111b193929190614965565b600060405180830381865af41580156111ce573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526111f691908101906149d9565b73__$d825222459c46c14afb2efe0967c30e98d$__6325e0dd0e60088a8e806040019061122391906148e0565b8f8f61122f8e806148e0565b8f602001356040518a63ffffffff1660e01b815260040161125899989796959493929190614a62565b600060405180830381865af4158015611275573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261129d91908101906149d9565b6040518463ffffffff1660e01b81526004016112bb93929190614b7c565b600060405180830381600087803b1580156112d557600080fd5b505af11580156112e9573d6000803e3d6000fd5b50600092506112ff91506107f2905089806148e0565b90506000806113278363fad28a2460e01b8c6020013560405160240161083291815260200190565b91509150811561137f57611340838b8b8b8b8b8b61349d565b826001600160a01b03167fe80f571f70f7cabf9d7ac60ece08421be374117776c311c327a083ca398f802f8b602001356040516108c191815260200190565b826001600160a01b03167ff6a58ef30f66943749e8c29c661c84da143a1c8ed017f5faa92b509e0000875a8260405161090791906145dc565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036114005760405162461bcd60e51b8152600401610c5d90614eaa565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316611449600080516020615858833981519152546001600160a01b031690565b6001600160a01b03161461146f5760405162461bcd60e51b8152600401610c5d90614ef6565b6114788261373d565b61148482826001613745565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146115285760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c00000000000000006064820152608401610c5d565b5060008051602061585883398151915290565b6115436138b0565b61154e83838361390a565b505050565b61155b61320b565b61157461156b6020840184614fd6565b602001356139a5565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634b5728d1866040518263ffffffff1660e01b81526004016115ba9190615058565b600060405180830381865af41580156115d7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526115ff91908101906149d9565b604051637e4794ed60e11b815273__$d825222459c46c14afb2efe0967c30e98d$__9063fc8f29da90611636908990600401615058565b602060405180830381865af4158015611653573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611677919061511a565b60405160200161168991815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b81526004016116b693929190614b7c565b600060405180830381600087803b1580156116d057600080fd5b505af11580156116e4573d6000803e3d6000fd5b5050505060006117078380602001906116fd9190614fd6565b6107f290806148e0565b6001600160a01b0381166000908152610100602090815260408220929350909190829061173690870187614fd6565b602001358152602001908152602001600020600085604001602081019061175d9190615133565b6001600160401b0316815260208101919091526040016000205460ff169050801561179b5760405163066c745760e01b815260040160405180910390fd5b6117c36117ae60e0860160c08701615133565b6117be60c0870160a08801615133565b613a70565b6117e0576040516312c9cc9f60e01b815260040160405180910390fd5b6117ed6020850185614fd6565b602001356001600160a01b0383167fedbcd9eeb09d85c3ea1b5bf002c04478059cb261cab82c903885cefccae374bc61182c6060880160408901615133565b6080880161184060e08a0160c08b01615133565b60405161184f9392919061514e565b60405180910390a350506114846001609755565b61186b61320b565b6114846001609755565b61187d61320b565b61188d61156b6020840184614fd6565b6001600160a01b031663cb535ab58273__$d825222459c46c14afb2efe0967c30e98d$__634b5728d1866040518263ffffffff1660e01b81526004016118d39190615058565b600060405180830381865af41580156118f0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261191891908101906149d9565b604051637e4794ed60e11b815273__$d825222459c46c14afb2efe0967c30e98d$__9063fc8f29da9061194f908990600401615058565b602060405180830381865af415801561196c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611990919061511a565b6040516020016119a291815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b81526004016119cf93929190614b7c565b600060405180830381600087803b1580156119e957600080fd5b505af11580156119fd573d6000803e3d6000fd5b505050506000611a168380602001906116fd9190614fd6565b6001600160a01b03811660009081526101006020908152604082209293509091908290611a4590870187614fd6565b6020013581526020019081526020016000206000856040016020810190611a6c9190615133565b6001600160401b0316815260208101919091526040016000205460ff1690508015611aaa5760405163066c745760e01b815260040160405180910390fd5b6001600160a01b03821660009081526101006020908152604082206001929091611ad690880188614fd6565b6020013581526020019081526020016000206000866040016020810190611afd9190615133565b6001600160401b031681526020810191909152604001600020805460ff191691151591909117905560026001600160a01b038316600090815260fb6020908152604082209190611b4f90880188614fd6565b60209081013582528101919091526040016000206001015460ff166002811115611b7b57611b7b6142e9565b03611c7a576001600160a01b038216600090815260fd6020908152604082209190611ba890870187614fd6565b60209081013582528101919091526040908101600020546001600160401b031690611bd99060608701908701615133565b6001600160401b031614611c005760405163362a414d60e01b815260040160405180910390fd5b611c106060850160408601615133565b611c1b90600161517e565b6001600160a01b038316600090815260fd6020908152604082209190611c4390880188614fd6565b60200135815260200190815260200160002060006101000a8154816001600160401b0302191690836001600160401b031602179055505b611c876020850185614fd6565b602001356001600160a01b0383167fde5b57e6566d68a30b0979431df3d5df6db3b9aa89f8820f595b9315bf86d067611cc66060880160408901615133565b6040516001600160401b03909116815260200160405180910390a3611cf46117ae60e0860160c08701615133565b15611d7757611d066020850185614fd6565b602001356001600160a01b0383167fedbcd9eeb09d85c3ea1b5bf002c04478059cb261cab82c903885cefccae374bc611d456060880160408901615133565b60808801611d5960e08a0160c08b01615133565b604051611d689392919061514e565b60405180910390a3505061186b565b6040805180820190915260008152606060208201526000806000611dae86634dcc0aa660e01b8a6040516024016108329190615268565b915091508115611de75780806020019051810190611dcc91906152f4565b90945092508215611de25750505050505061186b565b611dff565b60408051808201909152600081526020810182905293505b6001600160a01b0386166000908152610101602090815260408220908290611e29908c018c614fd6565b60200135815260200190815260200160002060008a6040016020810190611e509190615133565b6001600160401b0316815260208101919091526040016000205460ff1690508015611e8e57604051637aa549d360e01b815260040160405180910390fd5b6001600160a01b03871660009081526101016020908152604082206001929091611eba908d018d614fd6565b60200135815260200190815260200160002060008b6040016020810190611ee19190615133565b6001600160401b03168152602080820192909252604001600020805460ff191692151592909217909155611f17908a018a614fd6565b602001356001600160a01b0388167fa32e6f42b1d63fb83ad73b009a6dbb9413d1da02e95b1bb08f081815eea8db20611f5660608d0160408e01615133565b88604051611f6592919061535b565b60405180910390a3505050505050506114846001609755565b611f866138b0565b611f906000613abe565b565b60f98054611f9f90614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054611fcb90614fa2565b80156120185780601f10611fed57610100808354040283529160200191612018565b820191906000526020600020905b815481529060010190602001808311611ffb57829003601f168201915b505050505081565b60655433906001600160a01b0316811461208e5760405162461bcd60e51b815260206004820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152608401610c5d565b610cfa81613abe565b600054600290610100900460ff161580156120b9575060005460ff8083169116105b61211c5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608401610c5d565b6000805461ffff191660ff83161761010017905561213861320b565b825160000361215a5760405163e8cf362360e01b815260040160405180910390fd5b6001600160a01b0382166121815760405163cbdd34cf60e01b815260040160405180910390fd5b612189613ad7565b612191613b06565b60f961219d84826153c3565b50825160fa805463ffffffff191663ffffffff90921691909117905561010580546001600160a01b0319166001600160a01b03841617905560016097556000805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a1505050565b61222861320b565b61223181613b35565b33600090815260fb602090815260408083208484529091528120906122568282613e50565b60018201805461ffff19169055612271600283016000613e8a565b61227f600383016000613e50565b60048201600090556005820160006122979190613e50565b50506000818152610103602052604081206122b191613e50565b604051819033907f21372e37743553ba8e5f61239803174a827c7732d53ec8adcb76c6b3bb2c13f190600090a3610cfa6001609755565b6122f06138b0565b60008190036123125760405163e8cf362360e01b815260040160405180910390fd5b60f961231f828483615482565b5060fa805463ffffffff191663ffffffff9290921691909117905550565b600061237e83838080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061329f92505050565b6001600160a01b03166344c9af28856040518263ffffffff1660e01b81526004016123ab91815260200190565b602060405180830381865afa1580156123c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123ec919061511a565b90505b9392505050565b6123fe61320b565b600061240d6116fd8680614fd6565b905061241c61156b8680614fd6565b6001600160a01b031663cb535ab58373__$d825222459c46c14afb2efe0967c30e98d$__6311a7a373896040518263ffffffff1660e01b81526004016124629190615058565b600060405180830381865af415801561247f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526124a791908101906149d9565b6040516374e9704560e01b815273__$d825222459c46c14afb2efe0967c30e98d$__906374e97045906124e0908b908b90600401615542565b602060405180830381865af41580156124fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612521919061511a565b60405160200161253391815260200190565b6040516020818303038152906040526040518463ffffffff1660e01b815260040161256093929190614b7c565b600060405180830381600087803b15801561257a57600080fd5b505af115801561258e573d6000803e3d6000fd5b505050506001600160a01b038116600090815260ff60205260408120816125b58880614fd6565b60200135815260200190815260200160002060008760400160208101906125dc9190615133565b6001600160401b0316815260208101919091526040016000205460ff169050806126195760405163ca89746b60e01b815260040160405180910390fd5b6000806126b884637e1d42b560e01b8a73__$d825222459c46c14afb2efe0967c30e98d$__63360b8cd78c8c6040518363ffffffff1660e01b8152600401612662929190615542565b600060405180830381865af415801561267f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526126a79190810190615556565b60405160240161083292919061558a565b9150915081156128dc5760026001600160a01b038516600090815260fb60205260408120906126e78b80614fd6565b60209081013582528101919091526040016000206001015460ff166002811115612713576127136142e9565b03612808576001600160a01b038416600090815260fe602052604081209061273b8a80614fd6565b60209081013582528101919091526040908101600020546001600160401b03169061276c9060608b01908b01615133565b6001600160401b0316146127935760405163362a414d60e01b815260040160405180910390fd5b6127a36060890160408a01615133565b6127ae90600161517e565b6001600160a01b038516600090815260fe60205260408120906127d18b80614fd6565b60200135815260200190815260200160002060006101000a8154816001600160401b0302191690836001600160401b031602179055505b6001600160a01b038416600090815260ff602052604081209061282b8a80614fd6565b60200135815260200190815260200160002060008960400160208101906128529190615133565b6001600160401b031681526020810191909152604001600020805460ff1916905561287d8880614fd6565b602001356001600160a01b0385167fe46f6591236abe528fe47a3b281fb002524dadd3e62b1f317ed285d07273c3b16128bc60608c0160408d01615133565b6040516001600160401b03909116815260200160405180910390a361291e565b836001600160a01b03167f625eea143c9dae6915c809da47016c22d9cd006c3ace7c345c5cbcf57d3aefbc8260405161291591906145dc565b60405180910390a25b5050505061292c6001609755565b50505050565b61293a6138b0565b610104828260405161294d9291906155af565b90815260405190819003602001902080546001600160a01b03191690555050565b600061297861320b565b61298185613b35565b42826001600160401b0316116129aa5760405163551ea0fb60e11b815260040160405180910390fd5b5033600090815260fc602090815260408083208784529091528120546001600160401b0316908190036129f057604051631e510bfb60e21b815260040160405180910390fd5b33600090815260ff6020908152604080832088845282528083206001600160401b03851684529091529020805460ff19166001908117909155612a3490829061517e565b33600081815260fc602090815260408083208a845290915290819020805467ffffffffffffffff19166001600160401b03949094169390931790925590518691907fb5bff96e18da044e4e34510d16df9053b9f1920f6a960732e5aaf22fe9b8013690612aa89088908890879089906155bf565b60405180910390a3612aba6001609755565b949350505050565b612b0182828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061329f92505050565b6001600160a01b03166349ff245e878787876040518563ffffffff1660e01b8152600401612b3294939291906155f4565b600060405180830381600087803b158015612b4c57600080fd5b505af1158015612b60573d6000803e3d6000fd5b505050505b505050505050565b612b756138b0565b606580546001600160a01b0383166001600160a01b03199091168117909155612ba66033546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b612be661320b565b6001600160a01b038316612c0d5760405163cbdd34cf60e01b815260040160405180910390fd5b6001600160a01b038316600090815260fb60209081526040808320858452909152808220815160e08101909252805482908290612c4990614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054612c7590614fa2565b8015612cc25780601f10612c9757610100808354040283529160200191612cc2565b820191906000526020600020905b815481529060010190602001808311612ca557829003601f168201915b5050509183525050600182015460209091019060ff166002811115612ce957612ce96142e9565b6002811115612cfa57612cfa6142e9565b81526001820154610100900460ff161515602080830191909152600283018054604080518285028101850182528281529401939260009084015b82821015612de0578382906000526020600020018054612d5390614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054612d7f90614fa2565b8015612dcc5780601f10612da157610100808354040283529160200191612dcc565b820191906000526020600020905b815481529060010190602001808311612daf57829003601f168201915b505050505081526020019060010190612d34565b505050508152602001600382018054612df890614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054612e2490614fa2565b8015612e715780601f10612e4657610100808354040283529160200191612e71565b820191906000526020600020905b815481529060010190602001808311612e5457829003601f168201915b5050505050815260200160048201548152602001600582018054612e9490614fa2565b80601f0160208091040260200160405190810160405280929190818152602001828054612ec090614fa2565b8015612f0d5780601f10612ee257610100808354040283529160200191612f0d565b820191906000526020600020905b815481529060010190602001808311612ef057829003601f168201915b5050509190925250505060a0810151909150612f3c57604051634d93b09d60e11b815260040160405180910390fd5b612f45836139a5565b6001600160a01b031663cb535ab58373__$d825222459c46c14afb2efe0967c30e98d$__636f6547268560c00151886040518363ffffffff1660e01b8152600401612f9192919061561b565b600060405180830381865af4158015612fae573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052612fd691908101906149d9565b602085015185516060870151608088015160a0890151604051631f621e1560e31b815273__$d825222459c46c14afb2efe0967c30e98d$__9563fb10f0a89561302c95600995929491939092919060040161563d565b600060405180830381865af4158015613049573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261307191908101906149d9565b6040518463ffffffff1660e01b815260040161308f93929190614b7c565b600060405180830381600087803b1580156130a957600080fd5b505af11580156130bd573d6000803e3d6000fd5b505050506000806130ed86633f9fdbe460e01b8786608001518760a00151604051602401610832939291906156e5565b6001600160a01b038816600090815260fb602090815260408083208a845290915281209294509092506131208282613e50565b60018201805461ffff1916905561313b600283016000613e8a565b613149600383016000613e50565b60048201600090556005820160006131619190613e50565b505060008581526101036020526040812061317b91613e50565b81156131bc5760405185906001600160a01b038816907f5f010dbbd6bf46aec8131c5456301a75cd688d3cca9bc8380c9e26301be2072990600090a36131fe565b856001600160a01b03167fc9d36d7a317cb116925d5cb66f0069fe825822fe23e9cf3f421c38cf444caa30826040516131f591906145dc565b60405180910390a25b50505061154e6001609755565b60026097540361325d5760405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606401610c5d565b6002609755565b84158061326f575081155b80613278575083155b80613281575080155b15612b6557604051637d6ba8a560e01b815260040160405180910390fd5b600081516000036132cd5760405163524e171160e01b81526020600482015260006024820152604401610c5d565b610104826040516132de919061570e565b908152604051908190036020019020546001600160a01b0316905080613319578160405163036c4d8760e11b8152600401610c5d91906145dc565b919050565b60fa5460009073__$f61eb90c6f674e787d51c07f105fa231e2$__9063a1ef9a989061335390859063ffffffff168188615720565b6040518363ffffffff1660e01b8152600401613370929190615542565b602060405180830381865af415801561338d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123ef919061574a565b600060606001600160a01b0384163b6133f957505060408051808201909152601481527318d85b1b081d1bc81b9bdb8b58dbdb9d1c9858dd60621b6020820152600090613496565b60005a9050846001600160a01b031684604051613416919061570e565b6000604051808303816000865af19150503d8060008114613453576040519150601f19603f3d011682016040523d82523d6000602084013e613458565b606091505b509093509150821580156134765750613472604082615767565b5a11155b156134945760405163b08ede0960e01b815260040160405180910390fd5b505b9250929050565b6040518060e001604052808780604001906134b891906148e0565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505090825250602001846002811115613504576135046142e9565b8152831515602082015260400161351b8688615789565b815260200161352a83806148e0565b8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050908252506020838101359082015260400161357888806148e0565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201829052509390945250506001600160a01b038a16815260fb602090815260408083208b83013584529091529020825190915081906135e290826153c3565b50602082015160018083018054909160ff199091169083600281111561360a5761360a6142e9565b021790555060408201516001820180549115156101000261ff001990921691909117905560608201518051613649916002840191602090910190613ea8565b506080820151600382019061365e90826153c3565b5060a0820151600482015560c0820151600582019061367d90826153c3565b5050506001600160a01b038716600081815260fc602090815260408083208a8301358085529083528184208054600167ffffffffffffffff19918216811790925586865260fd85528386208387528552838620805482168317905595855260fe845282852091855292528220805490931617909155859085908161370357613703614926565b905060200281019061371591906148e0565b60208089013560009081526101039091526040902091610dac919083615482565b6001609755565b610cfa6138b0565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156137785761154e83613b70565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156137d2575060408051601f3d908101601f191682019092526137cf9181019061511a565b60015b6138355760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b6064820152608401610c5d565b60008051602061585883398151915281146138a45760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b6064820152608401610c5d565b5061154e838383613c0c565b6033546001600160a01b03163314611f905760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610c5d565b60008290036139365760405163524e171160e01b81526020600482015260006024820152604401610c5d565b6001600160a01b03811661395d5760405163cbdd34cf60e01b815260040160405180910390fd5b8061010484846040516139719291906155af565b90815260405190819003602001902080546001600160a01b03929092166001600160a01b0319909216919091179055505050565b60008181526101036020526040812080548291906139c290614fa2565b80601f01602080910402602001604051908101604052809291908181526020018280546139ee90614fa2565b8015613a3b5780601f10613a1057610100808354040283529160200191613a3b565b820191906000526020600020905b815481529060010190602001808311613a1e57829003601f168201915b505050505090508051600003613a67576040516363b99a9d60e11b815260048101849052602401610c5d565b6123ef8161329f565b60006001600160401b03831615801590613a935750826001600160401b03164210155b806123ef57506001600160401b038216158015906123ef5750506001600160401b0316431015919050565b606580546001600160a01b0319169055610cfa81613c31565b600054610100900460ff16613afe5760405162461bcd60e51b8152600401610c5d9061580c565b611f90613c83565b600054610100900460ff16613b2d5760405162461bcd60e51b8152600401610c5d9061580c565b611f90613cb3565b33600090815260fb60209081526040808320848452909152902060040154610cfa57604051631109bfb360e31b815260040160405180910390fd5b6001600160a01b0381163b613bdd5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610c5d565b60008051602061585883398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b613c1583613cda565b600082511180613c225750805b1561154e5761292c8383613d1a565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff16613caa5760405162461bcd60e51b8152600401610c5d9061580c565b611f9033613abe565b600054610100900460ff166137365760405162461bcd60e51b8152600401610c5d9061580c565b613ce381613b70565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606123ef8383604051806060016040528060278152602001615878602791396060600080856001600160a01b031685604051613d57919061570e565b600060405180830381855af49150503d8060008114613d92576040519150601f19603f3d011682016040523d82523d6000602084013e613d97565b606091505b5091509150613da886838387613db2565b9695505050505050565b60608315613e21578251600003613e1a576001600160a01b0385163b613e1a5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606401610c5d565b5081612aba565b612aba8383815115613e365781518083602001fd5b8060405162461bcd60e51b8152600401610c5d91906145dc565b508054613e5c90614fa2565b6000825580601f10613e6c575050565b601f016020900490600052602060002090810190610cfa9190613efe565b5080546000825590600052602060002090810190610cfa9190613f13565b828054828255906000526020600020908101928215613eee579160200282015b82811115613eee5782518290613ede90826153c3565b5091602001919060010190613ec8565b50613efa929150613f13565b5090565b5b80821115613efa5760008155600101613eff565b80821115613efa576000613f278282613e50565b50600101613f13565b600060608284031215613f4257600080fd5b50919050565b60008083601f840112613f5a57600080fd5b5081356001600160401b03811115613f7157600080fd5b6020830191508360208260051b850101111561349657600080fd5b80356003811061331957600080fd5b8015158114610cfa57600080fd5b803561331981613f9b565b600060408284031215613f4257600080fd5b600080600080600080600060c0888a031215613fe157600080fd5b87356001600160401b0380821115613ff857600080fd5b6140048b838c01613f30565b985060208a013591508082111561401a57600080fd5b6140268b838c01613f48565b909850965086915061403a60408b01613f8c565b955061404860608b01613fa9565b945060808a013591508082111561405e57600080fd5b61406a8b838c01613f30565b935060a08a013591508082111561408057600080fd5b5061408d8a828b01613fb4565b91505092959891949750929550565b600080600080600080600060c0888a0312156140b757600080fd5b87356001600160401b03808211156140ce57600080fd5b6140da8b838c01613f30565b98506140e860208b01613f8c565b97506140f660408b01613fa9565b965060608a013591508082111561410c57600080fd5b6141188b838c01613f48565b909650945060808a013591508082111561405e57600080fd5b6001600160a01b0381168114610cfa57600080fd5b60006020828403121561415857600080fd5b81356123ef81614131565b60008083601f84011261417557600080fd5b5081356001600160401b0381111561418c57600080fd5b60208301915083602082850101111561349657600080fd5b60008060008060008060008060a0898b0312156141c057600080fd5b88356001600160401b03808211156141d757600080fd5b6141e38c838d01614163565b909a5098508891506141f760208c01613f8c565b975060408b0135915061420982613f9b565b90955060608a0135908082111561421f57600080fd5b61422b8c838d01613f48565b909650945060808b013591508082111561424457600080fd5b506142518b828c01614163565b999c989b5096995094979396929594505050565b6000806040838503121561427857600080fd5b823561428381614131565b946020939093013593505050565b60005b838110156142ac578181015183820152602001614294565b8381111561292c5750506000910152565b600081518084526142d5816020860160208601614291565b601f01601f19169290920160200192915050565b634e487b7160e01b600052602160045260246000fd5b6003811061430f5761430f6142e9565b9052565b6000815180845260208085019450848260051b860182860160005b858110156143585783830389526143468383516142bd565b9885019892509084019060010161432e565b5090979650505050505050565b602081526000825160e060208401526143826101008401826142bd565b9050602084015161439660408501826142ff565b506040840151151560608401526060840151601f19808584030160808601526143bf8383614313565b925060808601519150808584030160a08601526143dc83836142bd565b925060a086015160c086015260c08601519150808584030160e08601525061440482826142bd565b95945050505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561444b5761444b61440d565b604052919050565b60006001600160401b0382111561446c5761446c61440d565b50601f01601f191660200190565b600061448d61448884614453565b614423565b90508281528383830111156144a157600080fd5b828260208301376000602084830101529392505050565b600080604083850312156144cb57600080fd5b82356144d681614131565b915060208301356001600160401b038111156144f157600080fd5b8301601f8101851361450257600080fd5b6145118582356020840161447a565b9150509250929050565b60008060006040848603121561453057600080fd5b83356001600160401b0381111561454657600080fd5b61455286828701614163565b909450925050602084013561456681614131565b809150509250925092565b600060e08284031215613f4257600080fd5b6000806040838503121561459657600080fd5b82356001600160401b03808211156145ad57600080fd5b6145b986838701614571565b935060208501359150808211156145cf57600080fd5b5061451185828601613fb4565b6020815260006123ef60208301846142bd565b600082601f83011261460057600080fd5b6123ef8383356020850161447a565b6000806040838503121561462257600080fd5b82356001600160401b0381111561463857600080fd5b614644858286016145ef565b925050602083013561465581614131565b809150509250929050565b60006020828403121561467257600080fd5b5035919050565b6000806020838503121561468c57600080fd5b82356001600160401b038111156146a257600080fd5b6146ae85828601614163565b90969095509350505050565b6000806000604084860312156146cf57600080fd5b8335925060208401356001600160401b038111156146ec57600080fd5b6146f886828701614163565b9497909650939450505050565b6000806000806060858703121561471b57600080fd5b84356001600160401b038082111561473257600080fd5b61473e88838901614571565b9550602087013591508082111561475457600080fd5b61476088838901614163565b9095509350604087013591508082111561477957600080fd5b5061478687828801613fb4565b91505092959194509250565b80356001600160401b038116811461331957600080fd5b600080600080606085870312156147bf57600080fd5b8435935060208501356001600160401b038111156147dc57600080fd5b6147e887828801614163565b90945092506147fb905060408601614792565b905092959194509250565b6000806000806000806080878903121561481f57600080fd5b86356001600160401b038082111561483657600080fd5b6148428a838b01614163565b90985096506020890135955060408901359450606089013591508082111561486957600080fd5b5061487689828a01614163565b979a9699509497509295939492505050565b60008060006060848603121561489d57600080fd5b83356148a881614131565b92506020840135915060408401356001600160401b038111156148ca57600080fd5b6148d686828701613fb4565b9150509250925092565b6000808335601e198436030181126148f757600080fd5b8301803591506001600160401b0382111561491157600080fd5b60200191503681900382131561349657600080fd5b634e487b7160e01b600052603260045260246000fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60408152600061497960408301858761493c565b9050826020830152949350505050565b600061499761448884614453565b90508281528383830111156149ab57600080fd5b6123ef836020830184614291565b600082601f8301126149ca57600080fd5b6123ef83835160208501614989565b6000602082840312156149eb57600080fd5b81516001600160401b03811115614a0157600080fd5b612aba848285016149b9565b600a811061430f5761430f6142e9565b6000808335601e19843603018112614a3457600080fd5b83016020810192503590506001600160401b03811115614a5357600080fd5b80360382131561349657600080fd5b614a6c818b614a0d565b60006020614a7c8184018c6142ff565b60c06040840152614a9160c084018a8c61493c565b8381036060850152878152818101600589901b820183018a60005b8b811015614ae657848303601f19018452614ac7828e614a1d565b614ad285828461493c565b958801959450505090850190600101614aac565b50508581036080870152614afb81898b61493c565b9450505050508260a08301529a9950505050505050505050565b6000808335601e19843603018112614b2c57600080fd5b83016020810192503590506001600160401b03811115614b4b57600080fd5b8060051b360382131561349657600080fd5b60008235603e19833603018112614b7357600080fd5b90910192915050565b6000606080835260a0808401614b928889614b15565b60408786018190529281905260059260c08089019083861b8a01018460005b85811015614cf2578b830360bf19018452813536889003607e19018112614bd757600080fd5b87016080848101614be88380614b15565b928752908290528b860191808c1b87018d0191908160005b82811015614c7057898503609f19018652614c1b8285614b5d565b614c258182614a1d565b8e8852614c358f8901828461493c565b9150506020614c4681840184614a1d565b9350888303828a0152614c5a83858361493c565b9982019998505093909301925050600101614c00565b5050505060209150614c8482840184614a1d565b87830384890152614c9683828461493c565b92505050614ca688840184614a1d565b8783038a890152614cb883828461493c565b92505050614cc88d840184614a1d565b93508682038e880152614cdc82858361493c565b9783019796505050929092019150600101614bb1565b505060208d013560808b015289810360208b0152614d10818d6142bd565b97505050878603818901525050505050613da881856142bd565b848152836020820152606060408201526000613da860608301848661493c565b818352600060208085019450848460051b86018460005b87811015614358578383038952614d788288614a1d565b614d8385828461493c565b9a87019a9450505090840190600101614d61565b614da1818b6142ff565b60c060208201526000614db860c083018a8c614d4a565b8860408401528281036060840152614dd181888a61493c565b905085608084015282810360a0840152614dec81858761493c565b9c9b505050505050505050505050565b600060208284031215614e0e57600080fd5b81516001600160401b03811115614e2457600080fd5b8201601f81018413614e3557600080fd5b612aba84825160208401614989565b60c081526000614e5760c083018b6142bd565b614e64602084018b6142ff565b88151560408401528281036060840152614e7f81888a614d4a565b90508281036080840152614e9481868861493c565b9150508260a08301529998505050505050505050565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b60a081526000614f5660a083018a8c61493c565b614f63602084018a6142ff565b87151560408401528281036060840152614f7e818789614d4a565b90508281036080840152614f9381858761493c565b9b9a5050505050505050505050565b600181811c90821680614fb657607f821691505b602082108103613f4257634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112614fec57600080fd5b9190910192915050565b60006150028283614a1d565b6040855261501460408601828461493c565b915050602083013560208501528091505092915050565b6001600160401b038061503d83614792565b1683528061504d60208401614792565b166020840152505050565b6020815260006150688384614b5d565b60e0602084015261507d610100840182614ff6565b905061508c6020850185614b5d565b601f19808584030160408601526150a38383614ff6565b92506150b160408701614792565b91506001600160401b0380831660608701526150d06060880188614a1d565b9350828786030160808801526150e785858361493c565b9450506150fa60a087016080890161502b565b8061510760c08901614792565b1660e08701525050508091505092915050565b60006020828403121561512c57600080fd5b5051919050565b60006020828403121561514557600080fd5b6123ef82614792565b6001600160401b038481168252608082019061516d602084018661502b565b808416606084015250949350505050565b60006001600160401b038083168185168083038211156151ae57634e487b7160e01b600052601160045260246000fd5b01949350505050565b60006151c38283614b5d565b60e084526151d460e0850182614ff6565b90506151e36020840184614b5d565b84820360208601526151f58282614ff6565b91505061520460408401614792565b6001600160401b0380821660408701526152216060860186614a1d565b9250868403606088015261523684848361493c565b935050615249608087016080870161502b565b8061525660c08701614792565b1660c087015250508091505092915050565b6020815260006123ef60208301846151b7565b60006040828403121561528d57600080fd5b604051604081016001600160401b0382821081831117156152b0576152b061440d565b81604052829350845191506152c482613f9b565b908252602084015190808211156152da57600080fd5b506152e7858286016149b9565b6020830152505092915050565b6000806040838503121561530757600080fd5b82516001600160401b0381111561531d57600080fd5b6153298582860161527b565b925050602083015161465581613f9b565b8051151582526000602082015160406020850152612aba60408501826142bd565b6001600160401b03831681526040602082015260006123ec604083018461533a565b601f82111561154e57600081815260208120601f850160051c810160208610156153a45750805b601f850160051c820191505b81811015612b65578281556001016153b0565b81516001600160401b038111156153dc576153dc61440d565b6153f0816153ea8454614fa2565b8461537d565b602080601f831160018114615425576000841561540d5750858301515b600019600386901b1c1916600185901b178555612b65565b600085815260208120601f198616915b8281101561545457888601518255948401946001909101908401615435565b50858210156154725787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6001600160401b038311156154995761549961440d565b6154ad836154a78354614fa2565b8361537d565b6000601f8411600181146154e157600085156154c95750838201355b600019600387901b1c1916600186901b17835561553b565b600083815260209020601f19861690835b8281101561551257868501358255602094850194600190920191016154f2565b508682101561552f5760001960f88860031b161c19848701351681555b505060018560011b0183555b5050505050565b6020815260006123ec60208301848661493c565b60006020828403121561556857600080fd5b81516001600160401b0381111561557e57600080fd5b612aba8482850161527b565b60408152600061559d60408301856151b7565b8281036020840152614404818561533a565b8183823760009101908152919050565b6060815260006155d360608301868861493c565b6001600160401b039485166020840152929093166040909101529392505050565b60608152600061560860608301868861493c565b6020830194909452506040015292915050565b60408152600061562e60408301856142bd565b90508260208301529392505050565b6156478188614a0d565b60006020615657818401896142ff565b60c0604084015261566b60c08401886142bd565b8381036060850152865180825282820190600581901b83018401848a0160005b838110156156b957601f198684030185526156a78383516142bd565b9487019492509086019060010161568b565b505086810360808801526156cd818a6142bd565b955050505050508260a0830152979650505050505050565b8381526060602082015260006156fe60608301856142bd565b9050826040830152949350505050565b60008251614fec818460208701614291565b6000808585111561573057600080fd5b8386111561573d57600080fd5b5050820193919092039150565b60006020828403121561575c57600080fd5b81516123ef81614131565b60008261578457634e487b7160e01b600052601260045260246000fd5b500490565b60006001600160401b03808411156157a3576157a361440d565b8360051b60206157b4818301614423565b8681529185019181810190368411156157cc57600080fd5b865b84811015615800578035868111156157e65760008081fd5b6157f236828b016145ef565b8452509183019183016157ce565b50979650505050505050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b60608201526080019056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a26469706673582212203f8f26d60b9aaf3863f5927452254ff0890e5a52ede93e9772d0c793e637860164736f6c634300080f0033"; type DispatcherConstructorParams = | [linkLibraryAddresses: DispatcherLibraryAddresses, signer?: Signer] diff --git a/src/evm/contracts/factories/Earth__factory.ts b/src/evm/contracts/factories/Earth__factory.ts index c0615bcc..ef3ec938 100644 --- a/src/evm/contracts/factories/Earth__factory.ts +++ b/src/evm/contracts/factories/Earth__factory.ts @@ -295,6 +295,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, @@ -598,7 +603,7 @@ const _abi = [ ] as const; const _bytecode = - "0x608060405234801561001057600080fd5b5060405161195538038061195583398101604081905261002f916100b2565b808061003a33610062565b600180546001600160a01b0319166001600160a01b0392909216919091179055506100e29050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100c457600080fd5b81516001600160a01b03811681146100db57600080fd5b9392505050565b611864806100f16000396000f3fe6080604052600436106100f75760003560e01c80635b7615851161008a57806392dfa3921161005957806392dfa392146102ea578063d24ba0241461030a578063f12b758a1461032a578063f2fde38b1461034a57600080fd5b80635b7615851461026a578063715018a614610297578063866f3f97146102ac5780638da5cb5b146102cc57600080fd5b8063400d9f5d116100c6578063400d9f5d146101cd5780634252ae9b146101ed5780634eeb73911461021c578063588152ca1461024a57600080fd5b80631b2f37d0146101035780632466911c146101255780632cc422d9146101555780632eed7c701461018d57600080fd5b366100fe57005b600080fd5b34801561010f57600080fd5b5061012361011e366004610e0e565b61036a565b005b610138610133366004610f6a565b6103bb565b6040516001600160401b0390911681526020015b60405180910390f35b34801561016157600080fd5b50600154610175906001600160a01b031681565b6040516001600160a01b03909116815260200161014c565b34801561019957600080fd5b506101bd6101a8366004610ffd565b60026020526000908152604090205460ff1681565b604051901515815260200161014c565b3480156101d957600080fd5b506101236101e8366004611016565b610457565b3480156101f957600080fd5b5061020d610208366004610ffd565b610532565b60405161014c93929190611113565b34801561022857600080fd5b5061023c610237366004610ffd565b6106d6565b60405161014c929190611148565b34801561025657600080fd5b50610123610265366004611260565b6107c4565b34801561027657600080fd5b5061028a610285366004611016565b610972565b60405161014c91906112d3565b3480156102a357600080fd5b50610123610af3565b3480156102b857600080fd5b5061028a6102c73660046112e6565b610b07565b3480156102d857600080fd5b506000546001600160a01b0316610175565b3480156102f657600080fd5b50610123610305366004610ffd565b610b62565b34801561031657600080fd5b5061012361032536600461133f565b610b76565b34801561033657600080fd5b5061023c610345366004610ffd565b610c06565b34801561035657600080fd5b50610123610365366004610e0e565b610c16565b610372610c91565b6001600160a01b0381166103995760405163a944796960e01b815260040160405180910390fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001546000906001600160a01b031663462fdf8334896103e18c6001600160a01b031690565b8a8a8a8a8a6040518963ffffffff1660e01b815260040161040897969594939291906113fc565b60206040518083038185885af1158015610426573d6000803e3d6000fd5b50505050506040513d601f19601f8201168201806040525081019061044b9190611449565b98975050505050505050565b6001546001600160a01b0316331461048257604051631323efc560e01b815260040160405180910390fd5b600082815260026020526040902054829060ff166104b357604051630100e70560e51b815260040160405180910390fd5b60056040518060400160405280858152602001846104d090611466565b90528154600181810184556000938452602093849020835160059093020191825583830151805191830191825593840151600283015560408401516003830155606084015192939192600484019061052890826114f7565b5050505050505050565b6004818154811061054257600080fd5b90600052602060002090600702016000915090508060000154908060010160405180608001604052908160008201548152602001600182015481526020016002820154815260200160038201805461059990611472565b80601f01602080910402602001604051908101604052809291908181526020018280546105c590611472565b80156106125780601f106105e757610100808354040283529160200191610612565b820191906000526020600020905b8154815290600101906020018083116105f557829003601f168201915b5050509190925250506040805180820190915260058401805460ff1615158252600685018054949594929350909160208401919061064f90611472565b80601f016020809104026020016040519081016040528092919081815260200182805461067b90611472565b80156106c85780601f1061069d576101008083540402835291602001916106c8565b820191906000526020600020905b8154815290600101906020018083116106ab57829003601f168201915b505050505081525050905083565b600581815481106106e657600080fd5b90600052602060002090600502016000915090508060000154908060010160405180608001604052908160008201548152602001600182015481526020016002820154815260200160038201805461073d90611472565b80601f016020809104026020016040519081016040528092919081815260200182805461076990611472565b80156107b65780601f1061078b576101008083540402835291602001916107b6565b820191906000526020600020905b81548152906001019060200180831161079957829003601f168201915b505050505081525050905082565b6001546001600160a01b031633146107ef57604051631323efc560e01b815260040160405180910390fd5b600083815260026020526040902054839060ff1661082057604051630100e70560e51b815260040160405180910390fd5b601461082f60208401846115b6565b905010156108505760405163503b43db60e01b815260040160405180910390fd5b600061085f60208401846115b6565b61086e916014916000916115fc565b61087791611626565b60601c9050806001600160a01b03166108938560400151610ceb565b6001600160a01b0316146108ba57604051631863a42d60e31b815260040160405180910390fd5b60046040518060600160405280878152602001868152602001856108dd90611669565b90528154600181810184556000938452602093849020835160079093020191825583830151805191830191825593840151600283015560408401516003830155606084015192939192600484019061093590826114f7565b5050506040820151805160058301805460ff19169115159190911781556020820151600684019061096690826114f7565b50505050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b031633146109b257604051631323efc560e01b815260040160405180910390fd5b600083815260026020526040902054839060ff166109e357604051630100e70560e51b815260040160405180910390fd5b6003604051806040016040528086815260200185610a0090611466565b905281546001818101845560009384526020938490208351600590930201918255838301518051918301918255938401516002830155604084015160038301556060840151929391926004840190610a5890826114f7565b5050505050306001600160a01b031663866f3f9785610a7a8660000135610ceb565b610a8760608801886115b6565b6040518563ffffffff1660e01b8152600401610aa694939291906116c1565b600060405180830381865afa158015610ac3573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610aeb91908101906116ec565b949350505050565b610afb610c91565b610b056000610cfc565b565b604080518082019091526000815260606020820152604051806040016040528060011515815260200130868686604051602001610b4794939291906117a9565b60408051601f19818403018152919052905295945050505050565b610b6a610c91565b610b7381610d4c565b50565b6001546001600160a01b0316631f3a583085610b98886001600160a01b031690565b8686866040518663ffffffff1660e01b8152600401610bbb9594939291906117f3565b6020604051808303816000875af1158015610bda573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bfe9190611449565b505050505050565b600381815481106106e657600080fd5b610c1e610c91565b6001600160a01b038116610c885760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610b7381610cfc565b6000546001600160a01b03163314610b055760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610c7f565b6000610cf682610d85565b92915050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80610d6a57604051631d6f5e8b60e01b815260040160405180910390fd5b6000908152600260205260409020805460ff19166001179055565b60006001600160a01b03821115610dee5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663630206269747360c81b6064820152608401610c7f565b5090565b80356001600160a01b0381168114610e0957600080fd5b919050565b600060208284031215610e2057600080fd5b610e2982610df2565b9392505050565b60008083601f840112610e4257600080fd5b5081356001600160401b03811115610e5957600080fd5b602083019150836020828501011115610e7157600080fd5b9250929050565b6001600160401b0381168114610b7357600080fd5b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715610ec557610ec5610e8d565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610ef357610ef3610e8d565b604052919050565b600082601f830112610f0c57600080fd5b604051604081018181106001600160401b0382111715610f2e57610f2e610e8d565b8060405250806040840185811115610f4557600080fd5b845b81811015610f5f578035835260209283019201610f47565b509195945050505050565b6000806000806000806000610100888a031215610f8657600080fd5b610f8f88610df2565b96506020880135955060408801356001600160401b03811115610fb157600080fd5b610fbd8a828b01610e30565b9096509450506060880135610fd181610e78565b9250610fe08960808a01610efb565b9150610fef8960c08a01610efb565b905092959891949750929550565b60006020828403121561100f57600080fd5b5035919050565b6000806040838503121561102957600080fd5b8235915060208301356001600160401b0381111561104657600080fd5b83016080818603121561105857600080fd5b809150509250929050565b60005b8381101561107e578181015183820152602001611066565b8381111561108d576000848401525b50505050565b600081518084526110ab816020860160208601611063565b601f01601f19169290920160200192915050565b8051825260208101516020830152604081015160408301526000606082015160806060850152610aeb6080850182611093565b8051151582526000602082015160406020850152610aeb6040850182611093565b83815260606020820152600061112c60608301856110bf565b828103604084015261113e81856110f2565b9695505050505050565b828152604060208201526000610aeb60408301846110bf565b60006001600160401b0382111561117a5761117a610e8d565b50601f01601f191660200190565b600082601f83011261119957600080fd5b81356111ac6111a782611161565b610ecb565b8181528460208386010111156111c157600080fd5b816020850160208301376000918101602001919091529392505050565b6000608082840312156111f057600080fd5b604051608081016001600160401b03828210818311171561121357611213610e8d565b81604052829350843583526020850135602084015260408501356040840152606085013591508082111561124657600080fd5b5061125385828601611188565b6060830152505092915050565b60008060006060848603121561127557600080fd5b8335925060208401356001600160401b038082111561129357600080fd5b61129f878388016111de565b935060408601359150808211156112b557600080fd5b508401604081870312156112c857600080fd5b809150509250925092565b602081526000610e2960208301846110f2565b600080600080606085870312156112fc57600080fd5b8435935061130c60208601610df2565b925060408501356001600160401b0381111561132757600080fd5b61133387828801610e30565b95989497509550505050565b60008060008060006080868803121561135757600080fd5b61136086610df2565b94506020860135935060408601356001600160401b0381111561138257600080fd5b61138e88828901610e30565b90945092505060608601356113a281610e78565b809150509295509295909350565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8060005b600281101561108d5781518452602093840193909101906001016113dd565b600061010089835288602084015280604084015261141d818401888a6113b0565b9150506001600160401b038516606083015261143c60808301856113d9565b61044b60c08301846113d9565b60006020828403121561145b57600080fd5b8151610e2981610e78565b6000610cf636836111de565b600181811c9082168061148657607f821691505b6020821081036114a657634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156114f257600081815260208120601f850160051c810160208610156114d35750805b601f850160051c820191505b81811015610bfe578281556001016114df565b505050565b81516001600160401b0381111561151057611510610e8d565b6115248161151e8454611472565b846114ac565b602080601f83116001811461155957600084156115415750858301515b600019600386901b1c1916600185901b178555610bfe565b600085815260208120601f198616915b8281101561158857888601518255948401946001909101908401611569565b50858210156115a65787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000808335601e198436030181126115cd57600080fd5b8301803591506001600160401b038211156115e757600080fd5b602001915036819003821315610e7157600080fd5b6000808585111561160c57600080fd5b8386111561161957600080fd5b5050820193919092039150565b6bffffffffffffffffffffffff1981358181169160148510156116535780818660140360031b1b83161692505b505092915050565b8015158114610b7357600080fd5b60006040823603121561167b57600080fd5b611683610ea3565b823561168e8161165b565b815260208301356001600160401b038111156116a957600080fd5b6116b536828601611188565b60208301525092915050565b8481526001600160a01b038416602082015260606040820181905260009061113e90830184866113b0565b600060208083850312156116ff57600080fd5b82516001600160401b038082111561171657600080fd5b908401906040828703121561172a57600080fd5b611732610ea3565b825161173d8161165b565b8152828401518281111561175057600080fd5b80840193505086601f84011261176557600080fd5b825191506117756111a783611161565b828152878584860101111561178957600080fd5b61179883868301878701611063565b938101939093525090949350505050565b60006bffffffffffffffffffffffff19808760601b168352808660601b166014840152506361636b2d60e01b60288301528284602c8401375060009101602c019081529392505050565b8581528460208201526080604082015260006118136080830185876113b0565b90506001600160401b0383166060830152969550505050505056fea264697066735822122091b749cf059121ef0f69359eaeff391a25b37f777e20f083c40d9e54d028b95d64736f6c634300080f0033"; + "0x608060405234801561001057600080fd5b5060405161199638038061199683398101604081905261002f916100b2565b808061003a33610062565b600180546001600160a01b0319166001600160a01b0392909216919091179055506100e29050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100c457600080fd5b81516001600160a01b03811681146100db57600080fd5b9392505050565b6118a5806100f16000396000f3fe6080604052600436106100f75760003560e01c80635b7615851161008a57806392dfa3921161005957806392dfa392146102f8578063d24ba02414610318578063f12b758a14610338578063f2fde38b1461035857600080fd5b80635b7615851461026a578063715018a614610298578063866f3f97146102ad5780638da5cb5b146102da57600080fd5b8063400d9f5d116100c6578063400d9f5d146101cd5780634252ae9b146101ed5780634eeb73911461021c578063588152ca1461024a57600080fd5b80631b2f37d0146101035780632466911c146101255780632cc422d9146101555780632eed7c701461018d57600080fd5b366100fe57005b600080fd5b34801561010f57600080fd5b5061012361011e366004610e23565b610378565b005b610138610133366004610f7f565b6103c9565b6040516001600160401b0390911681526020015b60405180910390f35b34801561016157600080fd5b50600154610175906001600160a01b031681565b6040516001600160a01b03909116815260200161014c565b34801561019957600080fd5b506101bd6101a8366004611012565b60026020526000908152604090205460ff1681565b604051901515815260200161014c565b3480156101d957600080fd5b506101236101e836600461102b565b610465565b3480156101f957600080fd5b5061020d610208366004611012565b610540565b60405161014c93929190611130565b34801561022857600080fd5b5061023c610237366004611012565b6106e4565b60405161014c929190611165565b34801561025657600080fd5b5061012361026536600461127d565b6107d2565b34801561027657600080fd5b5061028a61028536600461102b565b610980565b60405161014c9291906112f0565b3480156102a457600080fd5b50610123610b08565b3480156102b957600080fd5b506102cd6102c8366004611314565b610b1c565b60405161014c919061136d565b3480156102e657600080fd5b506000546001600160a01b0316610175565b34801561030457600080fd5b50610123610313366004611012565b610b77565b34801561032457600080fd5b50610123610333366004611380565b610b8b565b34801561034457600080fd5b5061023c610353366004611012565b610c1b565b34801561036457600080fd5b50610123610373366004610e23565b610c2b565b610380610ca6565b6001600160a01b0381166103a75760405163a944796960e01b815260040160405180910390fd5b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001546000906001600160a01b031663462fdf8334896103ef8c6001600160a01b031690565b8a8a8a8a8a6040518963ffffffff1660e01b8152600401610416979695949392919061143d565b60206040518083038185885af1158015610434573d6000803e3d6000fd5b50505050506040513d601f19601f82011682018060405250810190610459919061148a565b98975050505050505050565b6001546001600160a01b0316331461049057604051631323efc560e01b815260040160405180910390fd5b600082815260026020526040902054829060ff166104c157604051630100e70560e51b815260040160405180910390fd5b60056040518060400160405280858152602001846104de906114a7565b9052815460018181018455600093845260209384902083516005909302019182558383015180519183019182559384015160028301556040840151600383015560608401519293919260048401906105369082611538565b5050505050505050565b6004818154811061055057600080fd5b9060005260206000209060070201600091509050806000015490806001016040518060800160405290816000820154815260200160018201548152602001600282015481526020016003820180546105a7906114b3565b80601f01602080910402602001604051908101604052809291908181526020018280546105d3906114b3565b80156106205780601f106105f557610100808354040283529160200191610620565b820191906000526020600020905b81548152906001019060200180831161060357829003601f168201915b5050509190925250506040805180820190915260058401805460ff1615158252600685018054949594929350909160208401919061065d906114b3565b80601f0160208091040260200160405190810160405280929190818152602001828054610689906114b3565b80156106d65780601f106106ab576101008083540402835291602001916106d6565b820191906000526020600020905b8154815290600101906020018083116106b957829003601f168201915b505050505081525050905083565b600581815481106106f457600080fd5b90600052602060002090600502016000915090508060000154908060010160405180608001604052908160008201548152602001600182015481526020016002820154815260200160038201805461074b906114b3565b80601f0160208091040260200160405190810160405280929190818152602001828054610777906114b3565b80156107c45780601f10610799576101008083540402835291602001916107c4565b820191906000526020600020905b8154815290600101906020018083116107a757829003601f168201915b505050505081525050905082565b6001546001600160a01b031633146107fd57604051631323efc560e01b815260040160405180910390fd5b600083815260026020526040902054839060ff1661082e57604051630100e70560e51b815260040160405180910390fd5b601461083d60208401846115f7565b9050101561085e5760405163503b43db60e01b815260040160405180910390fd5b600061086d60208401846115f7565b61087c9160149160009161163d565b61088591611667565b60601c9050806001600160a01b03166108a18560400151610d00565b6001600160a01b0316146108c857604051631863a42d60e31b815260040160405180910390fd5b60046040518060600160405280878152602001868152602001856108eb906116aa565b9052815460018181018455600093845260209384902083516007909302019182558383015180519183019182559384015160028301556040840151600383015560608401519293919260048401906109439082611538565b5050506040820151805160058301805460ff1916911515919091178155602082015160068401906109749082611538565b50505050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b031633146109c357604051631323efc560e01b815260040160405180910390fd5b600084815260026020526040902054849060ff166109f457604051630100e70560e51b815260040160405180910390fd5b6003604051806040016040528087815260200186610a11906114a7565b905281546001818101845560009384526020938490208351600590930201918255838301518051918301918255938401516002830155604084015160038301556060840151929391926004840190610a699082611538565b5050505050306001600160a01b031663866f3f9786610a8b8760000135610d00565b610a9860608901896115f7565b6040518563ffffffff1660e01b8152600401610ab79493929190611702565b600060405180830381865afa158015610ad4573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610afc919081019061172d565b95600095509350505050565b610b10610ca6565b610b1a6000610d11565b565b604080518082019091526000815260606020820152604051806040016040528060011515815260200130868686604051602001610b5c94939291906117ea565b60408051601f19818403018152919052905295945050505050565b610b7f610ca6565b610b8881610d61565b50565b6001546001600160a01b0316631f3a583085610bad886001600160a01b031690565b8686866040518663ffffffff1660e01b8152600401610bd0959493929190611834565b6020604051808303816000875af1158015610bef573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c13919061148a565b505050505050565b600381815481106106f457600080fd5b610c33610ca6565b6001600160a01b038116610c9d5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610b8881610d11565b6000546001600160a01b03163314610b1a5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610c94565b6000610d0b82610d9a565b92915050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80610d7f57604051631d6f5e8b60e01b815260040160405180910390fd5b6000908152600260205260409020805460ff19166001179055565b60006001600160a01b03821115610e035760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663630206269747360c81b6064820152608401610c94565b5090565b80356001600160a01b0381168114610e1e57600080fd5b919050565b600060208284031215610e3557600080fd5b610e3e82610e07565b9392505050565b60008083601f840112610e5757600080fd5b5081356001600160401b03811115610e6e57600080fd5b602083019150836020828501011115610e8657600080fd5b9250929050565b6001600160401b0381168114610b8857600080fd5b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715610eda57610eda610ea2565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610f0857610f08610ea2565b604052919050565b600082601f830112610f2157600080fd5b604051604081018181106001600160401b0382111715610f4357610f43610ea2565b8060405250806040840185811115610f5a57600080fd5b845b81811015610f74578035835260209283019201610f5c565b509195945050505050565b6000806000806000806000610100888a031215610f9b57600080fd5b610fa488610e07565b96506020880135955060408801356001600160401b03811115610fc657600080fd5b610fd28a828b01610e45565b9096509450506060880135610fe681610e8d565b9250610ff58960808a01610f10565b91506110048960c08a01610f10565b905092959891949750929550565b60006020828403121561102457600080fd5b5035919050565b6000806040838503121561103e57600080fd5b8235915060208301356001600160401b0381111561105b57600080fd5b83016080818603121561106d57600080fd5b809150509250929050565b60005b8381101561109357818101518382015260200161107b565b838111156110a2576000848401525b50505050565b600081518084526110c0816020860160208601611078565b601f01601f19169290920160200192915050565b805182526020810151602083015260408101516040830152600060608201516080606085015261110760808501826110a8565b949350505050565b805115158252600060208201516040602085015261110760408501826110a8565b83815260606020820152600061114960608301856110d4565b828103604084015261115b818561110f565b9695505050505050565b82815260406020820152600061110760408301846110d4565b60006001600160401b0382111561119757611197610ea2565b50601f01601f191660200190565b600082601f8301126111b657600080fd5b81356111c96111c48261117e565b610ee0565b8181528460208386010111156111de57600080fd5b816020850160208301376000918101602001919091529392505050565b60006080828403121561120d57600080fd5b604051608081016001600160401b03828210818311171561123057611230610ea2565b81604052829350843583526020850135602084015260408501356040840152606085013591508082111561126357600080fd5b50611270858286016111a5565b6060830152505092915050565b60008060006060848603121561129257600080fd5b8335925060208401356001600160401b03808211156112b057600080fd5b6112bc878388016111fb565b935060408601359150808211156112d257600080fd5b508401604081870312156112e557600080fd5b809150509250925092565b604081526000611303604083018561110f565b905082151560208301529392505050565b6000806000806060858703121561132a57600080fd5b8435935061133a60208601610e07565b925060408501356001600160401b0381111561135557600080fd5b61136187828801610e45565b95989497509550505050565b602081526000610e3e602083018461110f565b60008060008060006080868803121561139857600080fd5b6113a186610e07565b94506020860135935060408601356001600160401b038111156113c357600080fd5b6113cf88828901610e45565b90945092505060608601356113e381610e8d565b809150509295509295909350565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b8060005b60028110156110a257815184526020938401939091019060010161141e565b600061010089835288602084015280604084015261145e818401888a6113f1565b9150506001600160401b038516606083015261147d608083018561141a565b61045960c083018461141a565b60006020828403121561149c57600080fd5b8151610e3e81610e8d565b6000610d0b36836111fb565b600181811c908216806114c757607f821691505b6020821081036114e757634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111561153357600081815260208120601f850160051c810160208610156115145750805b601f850160051c820191505b81811015610c1357828155600101611520565b505050565b81516001600160401b0381111561155157611551610ea2565b6115658161155f84546114b3565b846114ed565b602080601f83116001811461159a57600084156115825750858301515b600019600386901b1c1916600185901b178555610c13565b600085815260208120601f198616915b828110156115c9578886015182559484019460019091019084016115aa565b50858210156115e75787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000808335601e1984360301811261160e57600080fd5b8301803591506001600160401b0382111561162857600080fd5b602001915036819003821315610e8657600080fd5b6000808585111561164d57600080fd5b8386111561165a57600080fd5b5050820193919092039150565b6bffffffffffffffffffffffff1981358181169160148510156116945780818660140360031b1b83161692505b505092915050565b8015158114610b8857600080fd5b6000604082360312156116bc57600080fd5b6116c4610eb8565b82356116cf8161169c565b815260208301356001600160401b038111156116ea57600080fd5b6116f6368286016111a5565b60208301525092915050565b8481526001600160a01b038416602082015260606040820181905260009061115b90830184866113f1565b6000602080838503121561174057600080fd5b82516001600160401b038082111561175757600080fd5b908401906040828703121561176b57600080fd5b611773610eb8565b825161177e8161169c565b8152828401518281111561179157600080fd5b80840193505086601f8401126117a657600080fd5b825191506117b66111c48361117e565b82815287858486010111156117ca57600080fd5b6117d983868301878701611078565b938101939093525090949350505050565b60006bffffffffffffffffffffffff19808760601b168352808660601b166014840152506361636b2d60e01b60288301528284602c8401375060009101602c019081529392505050565b8581528460208201526080604082015260006118546080830185876113f1565b90506001600160401b0383166060830152969550505050505056fea2646970667358221220767039ec33266ac463719289d2dbeb2e5fee5d86c7542d93e556f6286c0cd30c64736f6c634300080f0033"; type EarthConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/IUniversalChannelHandler__factory.ts b/src/evm/contracts/factories/IUniversalChannelHandler__factory.ts index dcbae851..f48b9d25 100644 --- a/src/evm/contracts/factories/IUniversalChannelHandler__factory.ts +++ b/src/evm/contracts/factories/IUniversalChannelHandler__factory.ts @@ -364,6 +364,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, diff --git a/src/evm/contracts/factories/Mars.sol/Mars__factory.ts b/src/evm/contracts/factories/Mars.sol/Mars__factory.ts index 5d510fcd..b3ca1da6 100644 --- a/src/evm/contracts/factories/Mars.sol/Mars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/Mars__factory.ts @@ -476,6 +476,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, @@ -888,7 +893,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f6565b503480156200005057600080fd5b50604051620029a7380380620029a78339810160408190526200007391620001cd565b806200007f33620000a6565b600180546001600160a01b0319166001600160a01b03929092169190911790555062000370565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000141579160200282015b82811115620001415782518290620001309082620002a4565b509160200191906001019062000117565b506200014f92915062000153565b5090565b808211156200014f5760006200016a828262000174565b5060010162000153565b508054620001829062000215565b6000825580601f1062000193575050565b601f016020900490600052602060002090810190620001b39190620001b6565b50565b5b808211156200014f5760008155600101620001b7565b600060208284031215620001e057600080fd5b81516001600160a01b0381168114620001f857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022a57607f821691505b6020821081036200024b57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200029f57600081815260208120601f850160051c810160208610156200027a5750805b601f850160051c820191505b818110156200029b5782815560010162000286565b5050505b505050565b81516001600160401b03811115620002c057620002c0620001ff565b620002d881620002d1845462000215565b8462000251565b602080601f831160018114620003105760008415620002f75750858301515b600019600386901b1c1916600185901b1785556200029b565b600085815260208120601f198616915b82811015620003415788860151825594840194600190910190840162000320565b5085821015620003605787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61262780620003806000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611396565b610459565b005b61017a610175366004611507565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611396565b61052a565b3480156101c357600080fd5b506101d76101d2366004611587565b6105e6565b60405161018e9291906115ed565b3480156101f157600080fd5b5061020561020036600461168e565b6106a2565b60405161018e91906117c7565b34801561021e57600080fd5b5061023261022d36600461186d565b6106e7565b60405161018e9190611955565b34801561024b57600080fd5b5061025f61025a366004611587565b6108c2565b60405161018e969594939291906119a5565b34801561027d57600080fd5b5061016561028c366004611587565b610b1a565b34801561029d57600080fd5b5061017a6102ac366004611a1a565b610b7c565b3480156102bd57600080fd5b506101656102cc366004611a90565b610bff565b6101656102df366004611ad2565b610c70565b3480156102f057600080fd5b50610165610d3c565b34801561030557600080fd5b50610165610314366004611ad2565b610d50565b34801561032557600080fd5b50610205610334366004611587565b610dd2565b34801561034557600080fd5b50610165610354366004611bc4565b610e7e565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611587565b610eea565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611c2e565b610f0b565b34801561040557600080fd5b5061025f610414366004611587565b610f41565b34801561042557600080fd5b50610165610434366004611c95565b610f51565b34801561044557600080fd5b50610165610454366004611587565b610fcf565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611cdb565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611d0f565b600154909150610520906001600160a01b031686838686610ffa565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611d2c565b9060005260206000200154036105ae576005818154811061059a5761059a611d2c565b6000918252602082200155600191506105c0565b806105b881611d42565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611d69565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611d69565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db8684846110c9565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610727576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528251805184926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace019190829081906107729082611e00565b506020918201516001909101558201518051600283019081906107959082611e00565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b03909216919091179055606082015160058201906107de9082611e00565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff1992909216919091179091556040805180820182526001815290519091828101916108a891017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60405160208183030381529060405281525090505b919050565b600481815481106108d257600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461090590611d69565b80601f016020809104026020016040519081016040528092919081815260200182805461093190611d69565b801561097e5780601f106109535761010080835404028352916020019161097e565b820191906000526020600020905b81548152906001019060200180831161096157829003601f168201915b5050505050815260200160018201548152505090806002016040518060400160405290816000820180546109b190611d69565b80601f01602080910402602001604051908101604052809291908181526020018280546109dd90611d69565b8015610a2a5780601f106109ff57610100808354040283529160200191610a2a565b820191906000526020600020905b815481529060010190602001808311610a0d57829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a6190611d69565b80601f0160208091040260200160405190810160405280929190818152602001828054610a8d90611d69565b8015610ada5780601f10610aaf57610100808354040283529160200191610ada565b820191906000526020600020905b815481529060010190602001808311610abd57829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610b226111ef565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b6857600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610bb3908690899089908890600401611cdb565b6020604051808303816000875af1158015610bd2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bf69190611d0f565b95945050505050565b6001546001600160a01b03163314610c2a576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c6b8282612121565b505050565b610c786111ef565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610cb8908c908c908c908c908c908c908c908c90600401612354565b600060405180830381600087803b158015610cd257600080fd5b505af1158015610ce6573d6000803e3d6000fd5b50505050610d31818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a91508990508888611249565b505050505050505050565b610d446111ef565b610d4e60006112fe565b565b610d586111ef565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d96908b908b908b908b908b908b908b908b90600401612354565b600060405180830381600087803b158015610db057600080fd5b505af1158015610dc4573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610de257600080fd5b906000526020600020016000915090508054610dfd90611d69565b80601f0160208091040260200160405190810160405280929190818152602001828054610e2990611d69565b8015610e765780601f10610e4b57610100808354040283529160200191610e76565b820191906000526020600020905b815481529060010190602001808311610e5957829003601f168201915b505050505081565b6001546001600160a01b03163314610ea9576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048482826123b4565b60058181548110610efa57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610f36576040516321bf7f4960e01b815260040160405180910390fd5b6105df8483836110c9565b600281815481106108d257600080fd5b610f596111ef565b6001600160a01b038116610fc35760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610fcc816112fe565b50565b6001546001600160a01b03163314610fcc576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561103a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061105e9190612494565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b815260040161109094939291906124d4565b6000604051808303818588803b1580156110a957600080fd5b505af11580156110bd573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156111ce57600681815481106110eb576110eb611d2c565b906000526020600020016040516020016111059190612504565b60405160208183030381529060405280519060200120848460405160200161112e92919061257a565b60405160208183030381529060405280519060200120036111bc57600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111e89350505050565b806111c681611d42565b9150506110ce565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d4e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610fba565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611289573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112ad9190612494565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112e5979695949392919061258a565b6000604051808303818588803b158015610db057600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261136057600080fd5b5081356001600160401b0381111561137757600080fd5b60208301915083602082850101111561138f57600080fd5b9250929050565b600080600080606085870312156113ac57600080fd5b8435935060208501356001600160401b038111156113c957600080fd5b6113d58782880161134e565b9598909750949560400135949350505050565b6001600160401b0381168114610fcc57600080fd5b80356108bd816113e8565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561144057611440611408565b60405290565b60405160c081016001600160401b038111828210171561144057611440611408565b604051601f8201601f191681016001600160401b038111828210171561149057611490611408565b604052919050565b600082601f8301126114a957600080fd5b604051604081018181106001600160401b03821117156114cb576114cb611408565b80604052508060408401858111156114e257600080fd5b845b818110156114fc5780358352602092830192016114e4565b509195945050505050565b60008060008060008060e0878903121561152057600080fd5b86356001600160401b0381111561153657600080fd5b61154289828a0161134e565b90975095505060208701359350604087013561155d816113e8565b925061156c8860608901611498565b915061157b8860a08901611498565b90509295509295509295565b60006020828403121561159957600080fd5b5035919050565b6000815180845260005b818110156115c6576020818501810151868301820152016115aa565b818111156115d8576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061160860408301846115a0565b949350505050565b8035600381106108bd57600080fd5b600082601f83011261163057600080fd5b81356001600160401b0381111561164957611649611408565b61165c601f8201601f1916602001611468565b81815284602083860101111561167157600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156116a957600080fd5b6116b288611610565b965060208801356001600160401b03808211156116ce57600080fd5b818a0191508a601f8301126116e257600080fd5b8135818111156116f4576116f4611408565b8060051b61170460208201611468565b9182526020818501810192908101908e84111561172057600080fd5b6020860192505b8383101561175e57848335111561173d57600080fd5b61174d8f6020853589010161161f565b825260209283019290910190611727565b9a5050505060408a0135965060608a013591508082111561177e57600080fd5b61178a8b838c0161161f565b955060808a0135945060a08a01359150808211156117a757600080fd5b506117b48a828b0161134e565b989b979a50959850939692959293505050565b6020815260006111e860208301846115a0565b6000604082840312156117ec57600080fd5b6117f461141e565b905081356001600160401b0381111561180c57600080fd5b6118188482850161161f565b8252506020820135602082015292915050565b60006040828403121561183d57600080fd5b61184561141e565b90508135611852816113e8565b81526020820135611862816113e8565b602082015292915050565b60006020828403121561187f57600080fd5b81356001600160401b038082111561189657600080fd5b9083019060e082860312156118aa57600080fd5b6118b2611446565b8235828111156118c157600080fd5b6118cd878286016117da565b8252506020830135828111156118e257600080fd5b6118ee878286016117da565b602083015250611900604084016113fd565b604082015260608301358281111561191757600080fd5b6119238782860161161f565b606083015250611936866080850161182b565b608082015261194760c084016113fd565b60a082015295945050505050565b602081528151151560208201526000602083015160408084015261160860608401826115a0565b600081516040845261199160408501826115a0565b602093840151949093019390935250919050565b60e0815260006119b860e083018961197c565b82810360208401526119ca818961197c565b90506001600160401b03808816604085015283820360608501526119ee82886115a0565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b60008060008060608587031215611a3057600080fd5b84356001600160401b03811115611a4657600080fd5b611a528782880161134e565b909550935050602085013591506040850135611a6d816113e8565b939692955090935050565b600060e08284031215611a8a57600080fd5b50919050565b600060208284031215611aa257600080fd5b81356001600160401b03811115611ab857600080fd5b61160884828501611a78565b8015158114610fcc57600080fd5b60008060008060008060008060a0898b031215611aee57600080fd5b88356001600160401b0380821115611b0557600080fd5b611b118c838d0161134e565b909a509850889150611b2560208c01611610565b975060408b01359150611b3782611ac4565b90955060608a01359080821115611b4d57600080fd5b818b0191508b601f830112611b6157600080fd5b813581811115611b7057600080fd5b8c60208260051b8501011115611b8557600080fd5b6020830196508095505060808b0135915080821115611ba357600080fd5b50611bb08b828c0161134e565b999c989b5096995094979396929594505050565b60008060408385031215611bd757600080fd5b82356001600160401b0380821115611bee57600080fd5b611bfa86838701611a78565b93506020850135915080821115611c1057600080fd5b50830160408186031215611c2357600080fd5b809150509250929050565b60008060008060608587031215611c4457600080fd5b843593506020850135925060408501356001600160401b03811115611c6857600080fd5b611c748782880161134e565b95989497509550505050565b6001600160a01b0381168114610fcc57600080fd5b600060208284031215611ca757600080fd5b81356111e881611c80565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611cf5606083018587611cb2565b90506001600160401b038316604083015295945050505050565b600060208284031215611d2157600080fd5b81516111e8816113e8565b634e487b7160e01b600052603260045260246000fd5b600060018201611d6257634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611d7d57607f821691505b602082108103611a8a57634e487b7160e01b600052602260045260246000fd5b601f821115610c6b57600081815260208120601f850160051c81016020861015611dc45750805b601f850160051c820191505b81811015611de357828155600101611dd0565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611e1957611e19611408565b611e2d81611e278454611d69565b84611d9d565b602080601f831160018114611e5c5760008415611e4a5750858301515b611e548582611deb565b865550611de3565b600085815260208120601f198616915b82811015611e8b57888601518255948401946001909101908401611e6c565b5085821015611ea95787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611ecf57600080fd5b9190910192915050565b6000808335601e19843603018112611ef057600080fd5b8301803591506001600160401b03821115611f0a57600080fd5b60200191503681900382131561138f57600080fd5b611f298283611ed9565b6001600160401b03811115611f4057611f40611408565b611f5481611f4e8554611d69565b85611d9d565b6000601f821160018114611f825760008315611f705750838201355b611f7a8482611deb565b865550611fdc565b600085815260209020601f19841690835b82811015611fb35786850135825560209485019460019092019101611f93565b5084821015611fd05760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611ffb816113e8565b92915050565b6001600160401b0383111561201857612018611408565b61202c836120268354611d69565b83611d9d565b6000601f84116001811461205a57600085156120485750838201355b6120528682611deb565b8455506105df565b600083815260209020601f19861690835b8281101561208b578685013582556020948501946001909201910161206b565b50868210156120a85760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b81356120c5816113e8565b815467ffffffffffffffff19166001600160401b0382161782555060208201356120ee816113e8565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b61212b8283611eb9565b6121358182611ed9565b6001600160401b0381111561214c5761214c611408565b6121608161215a8654611d69565b86611d9d565b6000601f82116001811461218e576000831561217c5750838201355b6121868482611deb565b8755506121e8565b600086815260209020601f19841690835b828110156121bf578685013582556020948501946001909201910161219f565b50848210156121dc5760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506122106122076020840184611eb9565b60028301611f1f565b61224061221f60408401611fee565b600483016001600160401b0382166001600160401b03198254161781555050565b61224d6060830183611ed9565b61225b818360058601612001565b505061226d60808301600683016120ba565b61229d61227c60c08401611fee565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106122bf57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156123475782840389528135601e198836030181126122fe57600080fd5b870185810190356001600160401b0381111561231957600080fd5b80360382131561232857600080fd5b612333868284611cb2565b9a87019a95505050908401906001016122dd565b5091979650505050505050565b60a08152600061236860a083018a8c611cb2565b612375602084018a6122a1565b871515604084015282810360608401526123908187896122c3565b905082810360808401526123a5818587611cb2565b9b9a5050505050505050505050565b81356123bf81611ac4565b815490151560ff1660ff1991909116178155600180820160206123e485820186611ed9565b6001600160401b038111156123fb576123fb611408565b6124098161215a8654611d69565b6000601f82116001811461243757600083156124255750838201355b61242f8482611deb565b875550610d31565b600086815260209020601f19841690835b828110156124655786850135825593870193908901908701612448565b50848210156124825760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156124a657600080fd5b81516111e881611c80565b8060005b60028110156104845781518452602093840193909101906001016124b5565b8481526001600160401b038416602082015260c081016124f760408301856124b1565b610bf660808301846124b1565b600080835461251281611d69565b6001828116801561252a576001811461253f5761256e565b60ff198416875282151583028701945061256e565b8760005260208060002060005b858110156125655781548a82015290840190820161254c565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906125ae908301896115a0565b6125bb60408401896122a1565b82810360608401526125ce8187896122c3565b905082810360808401526125e3818587611cb2565b9a995050505050505050505056fea2646970667358221220f0697f917baa51fd7d2964c3ba263c7d4e74ecd6c6f5d39aa80663343740f3c364736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f6565b503480156200005057600080fd5b50604051620029c5380380620029c58339810160408190526200007391620001cd565b806200007f33620000a6565b600180546001600160a01b0319166001600160a01b03929092169190911790555062000370565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000141579160200282015b82811115620001415782518290620001309082620002a4565b509160200191906001019062000117565b506200014f92915062000153565b5090565b808211156200014f5760006200016a828262000174565b5060010162000153565b508054620001829062000215565b6000825580601f1062000193575050565b601f016020900490600052602060002090810190620001b39190620001b6565b50565b5b808211156200014f5760008155600101620001b7565b600060208284031215620001e057600080fd5b81516001600160a01b0381168114620001f857600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022a57607f821691505b6020821081036200024b57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200029f57600081815260208120601f850160051c810160208610156200027a5750805b601f850160051c820191505b818110156200029b5782815560010162000286565b5050505b505050565b81516001600160401b03811115620002c057620002c0620001ff565b620002d881620002d1845462000215565b8462000251565b602080601f831160018114620003105760008415620002f75750858301515b600019600386901b1c1916600185901b1785556200029b565b600085815260208120601f198616915b82811015620003415788860151825594840194600190910190840162000320565b5085821015620003605787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61264580620003806000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461139c565b61045a565b005b61017a610175366004611512565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461139c565b61052b565b3480156101c357600080fd5b506101d76101d2366004611592565b6105e7565b60405161018e9291906115f8565b3480156101f157600080fd5b50610205610200366004611699565b6106a3565b60405161018e91906117d2565b34801561021e57600080fd5b5061023261022d366004611878565b6106e8565b60405161018e929190611960565b34801561024c57600080fd5b5061026061025b366004611592565b6108c8565b60405161018e969594939291906119c3565b34801561027e57600080fd5b5061016561028d366004611592565b610b20565b34801561029e57600080fd5b5061017a6102ad366004611a38565b610b82565b3480156102be57600080fd5b506101656102cd366004611aae565b610c05565b6101656102e0366004611af0565b610c76565b3480156102f157600080fd5b50610165610d42565b34801561030657600080fd5b50610165610315366004611af0565b610d56565b34801561032657600080fd5b50610205610335366004611592565b610dd8565b34801561034657600080fd5b50610165610355366004611be2565b610e84565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a7366004611592565b610ef0565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611c4c565b610f11565b34801561040657600080fd5b50610260610415366004611592565b610f47565b34801561042657600080fd5b50610165610435366004611cb3565b610f57565b34801561044657600080fd5b50610165610455366004611592565b610fd5565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611cf9565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611d2d565b600154909150610521906001600160a01b031686838686611000565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611d4a565b9060005260206000200154036105af576005818154811061059b5761059b611d4a565b6000918252602082200155600191506105c1565b806105b981611d60565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611d87565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611d87565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc8684846110cf565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b0316331461072b576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528351805185926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace019190829081906107769082611e1e565b506020918201516001909101558201518051600283019081906107999082611e1e565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b03909216919091179055606082015160058201906107e29082611e1e565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff1992909216919091179091556040805180820182526001815290519091828101916108ac91017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60408051601f1981840301815291905290529360009350915050565b600481815481106108d857600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461090b90611d87565b80601f016020809104026020016040519081016040528092919081815260200182805461093790611d87565b80156109845780601f1061095957610100808354040283529160200191610984565b820191906000526020600020905b81548152906001019060200180831161096757829003601f168201915b5050505050815260200160018201548152505090806002016040518060400160405290816000820180546109b790611d87565b80601f01602080910402602001604051908101604052809291908181526020018280546109e390611d87565b8015610a305780601f10610a0557610100808354040283529160200191610a30565b820191906000526020600020905b815481529060010190602001808311610a1357829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a6790611d87565b80601f0160208091040260200160405190810160405280929190818152602001828054610a9390611d87565b8015610ae05780601f10610ab557610100808354040283529160200191610ae0565b820191906000526020600020905b815481529060010190602001808311610ac357829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610b286111f5565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b6e57600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610bb9908690899089908890600401611cf9565b6020604051808303816000875af1158015610bd8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bfc9190611d2d565b95945050505050565b6001546001600160a01b03163314610c30576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c71828261213f565b505050565b610c7e6111f5565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610cbe908c908c908c908c908c908c908c908c90600401612372565b600060405180830381600087803b158015610cd857600080fd5b505af1158015610cec573d6000803e3d6000fd5b50505050610d37818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a9150899050888861124f565b505050505050505050565b610d4a6111f5565b610d546000611304565b565b610d5e6111f5565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d9c908b908b908b908b908b908b908b908b90600401612372565b600060405180830381600087803b158015610db657600080fd5b505af1158015610dca573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610de857600080fd5b906000526020600020016000915090508054610e0390611d87565b80601f0160208091040260200160405190810160405280929190818152602001828054610e2f90611d87565b8015610e7c5780601f10610e5157610100808354040283529160200191610e7c565b820191906000526020600020905b815481529060010190602001808311610e5f57829003601f168201915b505050505081565b6001546001600160a01b03163314610eaf576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048582826123d2565b60058181548110610f0057600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610f3c576040516321bf7f4960e01b815260040160405180910390fd5b6105e08483836110cf565b600281815481106108d857600080fd5b610f5f6111f5565b6001600160a01b038116610fc95760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610fd281611304565b50565b6001546001600160a01b03163314610fd2576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611040573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061106491906124b2565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b815260040161109694939291906124f2565b6000604051808303818588803b1580156110af57600080fd5b505af11580156110c3573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156111d457600681815481106110f1576110f1611d4a565b9060005260206000200160405160200161110b9190612522565b604051602081830303815290604052805190602001208484604051602001611134929190612598565b60405160208183030381529060405280519060200120036111c257600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111ee9350505050565b806111cc81611d60565b9150506110d4565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d545760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610fc0565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561128f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112b391906124b2565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112eb97969594939291906125a8565b6000604051808303818588803b158015610db657600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261136657600080fd5b5081356001600160401b0381111561137d57600080fd5b60208301915083602082850101111561139557600080fd5b9250929050565b600080600080606085870312156113b257600080fd5b8435935060208501356001600160401b038111156113cf57600080fd5b6113db87828801611354565b9598909750949560400135949350505050565b6001600160401b0381168114610fd257600080fd5b803561140e816113ee565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561144b5761144b611413565b60405290565b60405160c081016001600160401b038111828210171561144b5761144b611413565b604051601f8201601f191681016001600160401b038111828210171561149b5761149b611413565b604052919050565b600082601f8301126114b457600080fd5b604051604081018181106001600160401b03821117156114d6576114d6611413565b80604052508060408401858111156114ed57600080fd5b845b818110156115075780358352602092830192016114ef565b509195945050505050565b60008060008060008060e0878903121561152b57600080fd5b86356001600160401b0381111561154157600080fd5b61154d89828a01611354565b909750955050602087013593506040870135611568816113ee565b925061157788606089016114a3565b91506115868860a089016114a3565b90509295509295509295565b6000602082840312156115a457600080fd5b5035919050565b6000815180845260005b818110156115d1576020818501810151868301820152016115b5565b818111156115e3576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061161360408301846115ab565b949350505050565b80356003811061140e57600080fd5b600082601f83011261163b57600080fd5b81356001600160401b0381111561165457611654611413565b611667601f8201601f1916602001611473565b81815284602083860101111561167c57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156116b457600080fd5b6116bd8861161b565b965060208801356001600160401b03808211156116d957600080fd5b818a0191508a601f8301126116ed57600080fd5b8135818111156116ff576116ff611413565b8060051b61170f60208201611473565b9182526020818501810192908101908e84111561172b57600080fd5b6020860192505b8383101561176957848335111561174857600080fd5b6117588f6020853589010161162a565b825260209283019290910190611732565b9a5050505060408a0135965060608a013591508082111561178957600080fd5b6117958b838c0161162a565b955060808a0135945060a08a01359150808211156117b257600080fd5b506117bf8a828b01611354565b989b979a50959850939692959293505050565b6020815260006111ee60208301846115ab565b6000604082840312156117f757600080fd5b6117ff611429565b905081356001600160401b0381111561181757600080fd5b6118238482850161162a565b8252506020820135602082015292915050565b60006040828403121561184857600080fd5b611850611429565b9050813561185d816113ee565b8152602082013561186d816113ee565b602082015292915050565b60006020828403121561188a57600080fd5b81356001600160401b03808211156118a157600080fd5b9083019060e082860312156118b557600080fd5b6118bd611451565b8235828111156118cc57600080fd5b6118d8878286016117e5565b8252506020830135828111156118ed57600080fd5b6118f9878286016117e5565b60208301525061190b60408401611403565b604082015260608301358281111561192257600080fd5b61192e8782860161162a565b6060830152506119418660808501611836565b608082015261195260c08401611403565b60a082015295945050505050565b60408152825115156040820152600060208401516040606084015261198860808401826115ab565b91505082151560208301529392505050565b60008151604084526119af60408501826115ab565b602093840151949093019390935250919050565b60e0815260006119d660e083018961199a565b82810360208401526119e8818961199a565b90506001600160401b0380881660408501528382036060850152611a0c82886115ab565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b60008060008060608587031215611a4e57600080fd5b84356001600160401b03811115611a6457600080fd5b611a7087828801611354565b909550935050602085013591506040850135611a8b816113ee565b939692955090935050565b600060e08284031215611aa857600080fd5b50919050565b600060208284031215611ac057600080fd5b81356001600160401b03811115611ad657600080fd5b61161384828501611a96565b8015158114610fd257600080fd5b60008060008060008060008060a0898b031215611b0c57600080fd5b88356001600160401b0380821115611b2357600080fd5b611b2f8c838d01611354565b909a509850889150611b4360208c0161161b565b975060408b01359150611b5582611ae2565b90955060608a01359080821115611b6b57600080fd5b818b0191508b601f830112611b7f57600080fd5b813581811115611b8e57600080fd5b8c60208260051b8501011115611ba357600080fd5b6020830196508095505060808b0135915080821115611bc157600080fd5b50611bce8b828c01611354565b999c989b5096995094979396929594505050565b60008060408385031215611bf557600080fd5b82356001600160401b0380821115611c0c57600080fd5b611c1886838701611a96565b93506020850135915080821115611c2e57600080fd5b50830160408186031215611c4157600080fd5b809150509250929050565b60008060008060608587031215611c6257600080fd5b843593506020850135925060408501356001600160401b03811115611c8657600080fd5b611c9287828801611354565b95989497509550505050565b6001600160a01b0381168114610fd257600080fd5b600060208284031215611cc557600080fd5b81356111ee81611c9e565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611d13606083018587611cd0565b90506001600160401b038316604083015295945050505050565b600060208284031215611d3f57600080fd5b81516111ee816113ee565b634e487b7160e01b600052603260045260246000fd5b600060018201611d8057634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611d9b57607f821691505b602082108103611aa857634e487b7160e01b600052602260045260246000fd5b601f821115610c7157600081815260208120601f850160051c81016020861015611de25750805b601f850160051c820191505b81811015611e0157828155600101611dee565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611e3757611e37611413565b611e4b81611e458454611d87565b84611dbb565b602080601f831160018114611e7a5760008415611e685750858301515b611e728582611e09565b865550611e01565b600085815260208120601f198616915b82811015611ea957888601518255948401946001909101908401611e8a565b5085821015611ec75787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611eed57600080fd5b9190910192915050565b6000808335601e19843603018112611f0e57600080fd5b8301803591506001600160401b03821115611f2857600080fd5b60200191503681900382131561139557600080fd5b611f478283611ef7565b6001600160401b03811115611f5e57611f5e611413565b611f7281611f6c8554611d87565b85611dbb565b6000601f821160018114611fa05760008315611f8e5750838201355b611f988482611e09565b865550611ffa565b600085815260209020601f19841690835b82811015611fd15786850135825560209485019460019092019101611fb1565b5084821015611fee5760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135612019816113ee565b92915050565b6001600160401b0383111561203657612036611413565b61204a836120448354611d87565b83611dbb565b6000601f84116001811461207857600085156120665750838201355b6120708682611e09565b8455506105e0565b600083815260209020601f19861690835b828110156120a95786850135825560209485019460019092019101612089565b50868210156120c65760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b81356120e3816113ee565b815467ffffffffffffffff19166001600160401b03821617825550602082013561210c816113ee565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b6121498283611ed7565b6121538182611ef7565b6001600160401b0381111561216a5761216a611413565b61217e816121788654611d87565b86611dbb565b6000601f8211600181146121ac576000831561219a5750838201355b6121a48482611e09565b875550612206565b600086815260209020601f19841690835b828110156121dd57868501358255602094850194600190920191016121bd565b50848210156121fa5760001960f88660031b161c19848701351681555b505060018360011b0186555b50505050602081013560018301555061222e6122256020840184611ed7565b60028301611f3d565b61225e61223d6040840161200c565b600483016001600160401b0382166001600160401b03198254161781555050565b61226b6060830183611ef7565b61227981836005860161201f565b505061228b60808301600683016120d8565b6122bb61229a60c0840161200c565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106122dd57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156123655782840389528135601e1988360301811261231c57600080fd5b870185810190356001600160401b0381111561233757600080fd5b80360382131561234657600080fd5b612351868284611cd0565b9a87019a95505050908401906001016122fb565b5091979650505050505050565b60a08152600061238660a083018a8c611cd0565b612393602084018a6122bf565b871515604084015282810360608401526123ae8187896122e1565b905082810360808401526123c3818587611cd0565b9b9a5050505050505050505050565b81356123dd81611ae2565b815490151560ff1660ff19919091161781556001808201602061240285820186611ef7565b6001600160401b0381111561241957612419611413565b612427816121788654611d87565b6000601f82116001811461245557600083156124435750838201355b61244d8482611e09565b875550610d37565b600086815260209020601f19841690835b828110156124835786850135825593870193908901908701612466565b50848210156124a05760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156124c457600080fd5b81516111ee81611c9e565b8060005b60028110156104855781518452602093840193909101906001016124d3565b8481526001600160401b038416602082015260c0810161251560408301856124cf565b610bfc60808301846124cf565b600080835461253081611d87565b60018281168015612548576001811461255d5761258c565b60ff198416875282151583028701945061258c565b8760005260208060002060005b858110156125835781548a82015290840190820161256a565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906125cc908301896115ab565b6125d960408401896122bf565b82810360608401526125ec8187896122e1565b90508281036080840152612601818587611cd0565b9a995050505050505050505056fea264697066735822122090d366fbf1f66078a7406186bbc71249911f4a41c27be2a1e60b58097fd9f77864736f6c634300080f0033"; type MarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Mars.sol/PanickingMars__factory.ts b/src/evm/contracts/factories/Mars.sol/PanickingMars__factory.ts index f3137c04..99df3a3b 100644 --- a/src/evm/contracts/factories/Mars.sol/PanickingMars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/PanickingMars__factory.ts @@ -479,6 +479,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "view", }, @@ -891,7 +896,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620027a5380380620027a58339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61242280620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461122f565b610459565b005b61017a6101753660046113a5565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461122f565b61052a565b3480156101c357600080fd5b506101d76101d2366004611425565b6105e6565b60405161018e92919061148b565b3480156101f157600080fd5b5061020561020036600461152c565b6106a2565b60405161018e9190611665565b34801561021e57600080fd5b5061023261022d36600461170b565b6106e7565b60405161018e91906117f3565b34801561024b57600080fd5b5061025f61025a366004611425565b610756565b60405161018e96959493929190611843565b34801561027d57600080fd5b5061016561028c366004611425565b6109b3565b34801561029d57600080fd5b5061017a6102ac3660046118b8565b610a15565b3480156102bd57600080fd5b506101656102cc36600461192e565b610a98565b6101656102df366004611970565b610b09565b3480156102f057600080fd5b50610165610bd5565b34801561030557600080fd5b50610165610314366004611970565b610be9565b34801561032557600080fd5b50610205610334366004611425565b610c6b565b34801561034557600080fd5b50610165610354366004611a62565b610d17565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611425565b610d83565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611acc565b610da4565b34801561040557600080fd5b5061025f610414366004611425565b610dda565b34801561042557600080fd5b50610165610434366004611b33565b610dea565b34801561044557600080fd5b50610165610454366004611425565b610e68565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611b79565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611bad565b600154909150610520906001600160a01b031686838686610e93565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611bca565b9060005260206000200154036105ae576005818154811061059a5761059a611bca565b6000918252602082200155600191506105c0565b806105b881611be0565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611c07565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611c07565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db868484610f62565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610727576040516321bf7f4960e01b815260040160405180910390fd5b61072f611c3b565b50506040805180820182526000808252825160208181019094529081529181019190915290565b6004818154811061076657600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461079990611c07565b80601f01602080910402602001604051908101604052809291908181526020018280546107c590611c07565b80156108125780601f106107e757610100808354040283529160200191610812565b820191906000526020600020905b8154815290600101906020018083116107f557829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461084590611c07565b80601f016020809104026020016040519081016040528092919081815260200182805461087190611c07565b80156108be5780601f10610893576101008083540402835291602001916108be565b820191906000526020600020905b8154815290600101906020018083116108a157829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b03909216926108f590611c07565b80601f016020809104026020016040519081016040528092919081815260200182805461092190611c07565b801561096e5780601f106109435761010080835404028352916020019161096e565b820191906000526020600020905b81548152906001019060200180831161095157829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109bb611088565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a0157600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a4c908690899089908890600401611b79565b6020604051808303816000875af1158015610a6b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a8f9190611bad565b95945050505050565b6001546001600160a01b03163314610ac3576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610b048282611f1c565b505050565b610b11611088565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b51908c908c908c908c908c908c908c908c9060040161214f565b600060405180830381600087803b158015610b6b57600080fd5b505af1158015610b7f573d6000803e3d6000fd5b50505050610bca818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110e2565b505050505050505050565b610bdd611088565b610be76000611197565b565b610bf1611088565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c2f908b908b908b908b908b908b908b908b9060040161214f565b600060405180830381600087803b158015610c4957600080fd5b505af1158015610c5d573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c7b57600080fd5b906000526020600020016000915090508054610c9690611c07565b80601f0160208091040260200160405190810160405280929190818152602001828054610cc290611c07565b8015610d0f5780601f10610ce457610100808354040283529160200191610d0f565b820191906000526020600020905b815481529060010190602001808311610cf257829003601f168201915b505050505081565b6001546001600160a01b03163314610d42576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048482826121af565b60058181548110610d9357600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610dcf576040516321bf7f4960e01b815260040160405180910390fd5b6105df848383610f62565b6002818154811061076657600080fd5b610df2611088565b6001600160a01b038116610e5c5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e6581611197565b50565b6001546001600160a01b03163314610e65576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610ed3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ef7919061228f565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f2994939291906122cf565b6000604051808303818588803b158015610f4257600080fd5b505af1158015610f56573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156110675760068181548110610f8457610f84611bca565b90600052602060002001604051602001610f9e91906122ff565b604051602081830303815290604052805190602001208484604051602001610fc7929190612375565b604051602081830303815290604052805190602001200361105557600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110819350505050565b8061105f81611be0565b915050610f67565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610be75760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e53565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611122573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611146919061228f565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b815260040161117e9796959493929190612385565b6000604051808303818588803b158015610c4957600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f8401126111f957600080fd5b5081356001600160401b0381111561121057600080fd5b60208301915083602082850101111561122857600080fd5b9250929050565b6000806000806060858703121561124557600080fd5b8435935060208501356001600160401b0381111561126257600080fd5b61126e878288016111e7565b9598909750949560400135949350505050565b6001600160401b0381168114610e6557600080fd5b80356112a181611281565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112de576112de6112a6565b60405290565b60405160c081016001600160401b03811182821017156112de576112de6112a6565b604051601f8201601f191681016001600160401b038111828210171561132e5761132e6112a6565b604052919050565b600082601f83011261134757600080fd5b604051604081018181106001600160401b0382111715611369576113696112a6565b806040525080604084018581111561138057600080fd5b845b8181101561139a578035835260209283019201611382565b509195945050505050565b60008060008060008060e087890312156113be57600080fd5b86356001600160401b038111156113d457600080fd5b6113e089828a016111e7565b9097509550506020870135935060408701356113fb81611281565b925061140a8860608901611336565b91506114198860a08901611336565b90509295509295509295565b60006020828403121561143757600080fd5b5035919050565b6000815180845260005b8181101561146457602081850181015186830182015201611448565b81811115611476576000602083870101525b50601f01601f19169290920160200192915050565b82151581526040602082015260006114a6604083018461143e565b949350505050565b8035600381106112a157600080fd5b600082601f8301126114ce57600080fd5b81356001600160401b038111156114e7576114e76112a6565b6114fa601f8201601f1916602001611306565b81815284602083860101111561150f57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561154757600080fd5b611550886114ae565b965060208801356001600160401b038082111561156c57600080fd5b818a0191508a601f83011261158057600080fd5b813581811115611592576115926112a6565b8060051b6115a260208201611306565b9182526020818501810192908101908e8411156115be57600080fd5b6020860192505b838310156115fc5784833511156115db57600080fd5b6115eb8f602085358901016114bd565b8252602092830192909101906115c5565b9a5050505060408a0135965060608a013591508082111561161c57600080fd5b6116288b838c016114bd565b955060808a0135945060a08a013591508082111561164557600080fd5b506116528a828b016111e7565b989b979a50959850939692959293505050565b602081526000611081602083018461143e565b60006040828403121561168a57600080fd5b6116926112bc565b905081356001600160401b038111156116aa57600080fd5b6116b6848285016114bd565b8252506020820135602082015292915050565b6000604082840312156116db57600080fd5b6116e36112bc565b905081356116f081611281565b8152602082013561170081611281565b602082015292915050565b60006020828403121561171d57600080fd5b81356001600160401b038082111561173457600080fd5b9083019060e0828603121561174857600080fd5b6117506112e4565b82358281111561175f57600080fd5b61176b87828601611678565b82525060208301358281111561178057600080fd5b61178c87828601611678565b60208301525061179e60408401611296565b60408201526060830135828111156117b557600080fd5b6117c1878286016114bd565b6060830152506117d486608085016116c9565b60808201526117e560c08401611296565b60a082015295945050505050565b60208152815115156020820152600060208301516040808401526114a6606084018261143e565b600081516040845261182f604085018261143e565b602093840151949093019390935250919050565b60e08152600061185660e083018961181a565b8281036020840152611868818961181a565b90506001600160401b038088166040850152838203606085015261188c828861143e565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156118ce57600080fd5b84356001600160401b038111156118e457600080fd5b6118f0878288016111e7565b90955093505060208501359150604085013561190b81611281565b939692955090935050565b600060e0828403121561192857600080fd5b50919050565b60006020828403121561194057600080fd5b81356001600160401b0381111561195657600080fd5b6114a684828501611916565b8015158114610e6557600080fd5b60008060008060008060008060a0898b03121561198c57600080fd5b88356001600160401b03808211156119a357600080fd5b6119af8c838d016111e7565b909a5098508891506119c360208c016114ae565b975060408b013591506119d582611962565b90955060608a013590808211156119eb57600080fd5b818b0191508b601f8301126119ff57600080fd5b813581811115611a0e57600080fd5b8c60208260051b8501011115611a2357600080fd5b6020830196508095505060808b0135915080821115611a4157600080fd5b50611a4e8b828c016111e7565b999c989b5096995094979396929594505050565b60008060408385031215611a7557600080fd5b82356001600160401b0380821115611a8c57600080fd5b611a9886838701611916565b93506020850135915080821115611aae57600080fd5b50830160408186031215611ac157600080fd5b809150509250929050565b60008060008060608587031215611ae257600080fd5b843593506020850135925060408501356001600160401b03811115611b0657600080fd5b611b12878288016111e7565b95989497509550505050565b6001600160a01b0381168114610e6557600080fd5b600060208284031215611b4557600080fd5b813561108181611b1e565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611b93606083018587611b50565b90506001600160401b038316604083015295945050505050565b600060208284031215611bbf57600080fd5b815161108181611281565b634e487b7160e01b600052603260045260246000fd5b600060018201611c0057634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c1b57607f821691505b60208210810361192857634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60008235603e19833603018112611c6757600080fd5b9190910192915050565b6000808335601e19843603018112611c8857600080fd5b8301803591506001600160401b03821115611ca257600080fd5b60200191503681900382131561122857600080fd5b601f821115610b0457600081815260208120601f850160051c81016020861015611cde5750805b601f850160051c820191505b81811015611cfd57828155600101611cea565b505050505050565b600019600383901b1c191660019190911b1790565b611d248283611c71565b6001600160401b03811115611d3b57611d3b6112a6565b611d4f81611d498554611c07565b85611cb7565b6000601f821160018114611d7d5760008315611d6b5750838201355b611d758482611d05565b865550611dd7565b600085815260209020601f19841690835b82811015611dae5786850135825560209485019460019092019101611d8e565b5084821015611dcb5760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611df681611281565b92915050565b6001600160401b03831115611e1357611e136112a6565b611e2783611e218354611c07565b83611cb7565b6000601f841160018114611e555760008515611e435750838201355b611e4d8682611d05565b8455506105df565b600083815260209020601f19861690835b82811015611e865786850135825560209485019460019092019101611e66565b5086821015611ea35760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611ec081611281565b815467ffffffffffffffff19166001600160401b038216178255506020820135611ee981611281565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611f268283611c51565b611f308182611c71565b6001600160401b03811115611f4757611f476112a6565b611f5b81611f558654611c07565b86611cb7565b6000601f821160018114611f895760008315611f775750838201355b611f818482611d05565b875550611fe3565b600086815260209020601f19841690835b82811015611fba5786850135825560209485019460019092019101611f9a565b5084821015611fd75760001960f88660031b161c19848701351681555b505060018360011b0186555b50505050602081013560018301555061200b6120026020840184611c51565b60028301611d1a565b61203b61201a60408401611de9565b600483016001600160401b0382166001600160401b03198254161781555050565b6120486060830183611c71565b612056818360058601611dfc565b50506120686080830160068301611eb5565b61209861207760c08401611de9565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106120ba57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156121425782840389528135601e198836030181126120f957600080fd5b870185810190356001600160401b0381111561211457600080fd5b80360382131561212357600080fd5b61212e868284611b50565b9a87019a95505050908401906001016120d8565b5091979650505050505050565b60a08152600061216360a083018a8c611b50565b612170602084018a61209c565b8715156040840152828103606084015261218b8187896120be565b905082810360808401526121a0818587611b50565b9b9a5050505050505050505050565b81356121ba81611962565b815490151560ff1660ff1991909116178155600180820160206121df85820186611c71565b6001600160401b038111156121f6576121f66112a6565b61220481611f558654611c07565b6000601f82116001811461223257600083156122205750838201355b61222a8482611d05565b875550610bca565b600086815260209020601f19841690835b828110156122605786850135825593870193908901908701612243565b508482101561227d5760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156122a157600080fd5b815161108181611b1e565b8060005b60028110156104845781518452602093840193909101906001016122b0565b8481526001600160401b038416602082015260c081016122f260408301856122ac565b610a8f60808301846122ac565b600080835461230d81611c07565b60018281168015612325576001811461233a57612369565b60ff1984168752821515830287019450612369565b8760005260208060002060005b858110156123605781548a820152908401908201612347565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906123a99083018961143e565b6123b6604084018961209c565b82810360608401526123c98187896120be565b905082810360808401526123de818587611b50565b9a995050505050505050505056fea2646970667358221220d5458fb7984fcdfbcfcad95a8106a39df5682d922ddea08003a10d577e81973564736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620027bf380380620027bf8339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61243c80620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611236565b61045a565b005b61017a6101753660046113ac565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611236565b61052b565b3480156101c357600080fd5b506101d76101d236600461142c565b6105e7565b60405161018e929190611492565b3480156101f157600080fd5b50610205610200366004611533565b6106a3565b60405161018e919061166c565b34801561021e57600080fd5b5061023261022d366004611712565b6106e8565b60405161018e9291906117fa565b34801561024c57600080fd5b5061026061025b36600461142c565b61075d565b60405161018e9695949392919061185d565b34801561027e57600080fd5b5061016561028d36600461142c565b6109ba565b34801561029e57600080fd5b5061017a6102ad3660046118d2565b610a1c565b3480156102be57600080fd5b506101656102cd366004611948565b610a9f565b6101656102e036600461198a565b610b10565b3480156102f157600080fd5b50610165610bdc565b34801561030657600080fd5b5061016561031536600461198a565b610bf0565b34801561032657600080fd5b5061020561033536600461142c565b610c72565b34801561034657600080fd5b50610165610355366004611a7c565b610d1e565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a736600461142c565b610d8a565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611ae6565b610dab565b34801561040657600080fd5b5061026061041536600461142c565b610de1565b34801561042657600080fd5b50610165610435366004611b4d565b610df1565b34801561044657600080fd5b5061016561045536600461142c565b610e6f565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611b93565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611bc7565b600154909150610521906001600160a01b031686838686610e9a565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611be4565b9060005260206000200154036105af576005818154811061059b5761059b611be4565b6000918252602082200155600191506105c1565b806105b981611bfa565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611c21565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611c21565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc868484610f69565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b0316331461072b576040516321bf7f4960e01b815260040160405180910390fd5b610733611c55565b50506040805180820182526000808252825160208181019094528181529282019290925292909150565b6004818154811061076d57600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546107a090611c21565b80601f01602080910402602001604051908101604052809291908181526020018280546107cc90611c21565b80156108195780601f106107ee57610100808354040283529160200191610819565b820191906000526020600020905b8154815290600101906020018083116107fc57829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461084c90611c21565b80601f016020809104026020016040519081016040528092919081815260200182805461087890611c21565b80156108c55780601f1061089a576101008083540402835291602001916108c5565b820191906000526020600020905b8154815290600101906020018083116108a857829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b03909216926108fc90611c21565b80601f016020809104026020016040519081016040528092919081815260200182805461092890611c21565b80156109755780601f1061094a57610100808354040283529160200191610975565b820191906000526020600020905b81548152906001019060200180831161095857829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109c261108f565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a0857600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a53908690899089908890600401611b93565b6020604051808303816000875af1158015610a72573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a969190611bc7565b95945050505050565b6001546001600160a01b03163314610aca576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610b0b8282611f36565b505050565b610b1861108f565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b58908c908c908c908c908c908c908c908c90600401612169565b600060405180830381600087803b158015610b7257600080fd5b505af1158015610b86573d6000803e3d6000fd5b50505050610bd1818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110e9565b505050505050505050565b610be461108f565b610bee600061119e565b565b610bf861108f565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c36908b908b908b908b908b908b908b908b90600401612169565b600060405180830381600087803b158015610c5057600080fd5b505af1158015610c64573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c8257600080fd5b906000526020600020016000915090508054610c9d90611c21565b80601f0160208091040260200160405190810160405280929190818152602001828054610cc990611c21565b8015610d165780601f10610ceb57610100808354040283529160200191610d16565b820191906000526020600020905b815481529060010190602001808311610cf957829003601f168201915b505050505081565b6001546001600160a01b03163314610d49576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048582826121c9565b60058181548110610d9a57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610dd6576040516321bf7f4960e01b815260040160405180910390fd5b6105e0848383610f69565b6002818154811061076d57600080fd5b610df961108f565b6001600160a01b038116610e635760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e6c8161119e565b50565b6001546001600160a01b03163314610e6c576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610eda573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610efe91906122a9565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f3094939291906122e9565b6000604051808303818588803b158015610f4957600080fd5b505af1158015610f5d573d6000803e3d6000fd5b50505050505050505050565b606060005b60065481101561106e5760068181548110610f8b57610f8b611be4565b90600052602060002001604051602001610fa59190612319565b604051602081830303815290604052805190602001208484604051602001610fce92919061238f565b604051602081830303815290604052805190602001200361105c57600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110889350505050565b8061106681611bfa565b915050610f6e565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610bee5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e5a565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611129573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061114d91906122a9565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b8152600401611185979695949392919061239f565b6000604051808303818588803b158015610c5057600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261120057600080fd5b5081356001600160401b0381111561121757600080fd5b60208301915083602082850101111561122f57600080fd5b9250929050565b6000806000806060858703121561124c57600080fd5b8435935060208501356001600160401b0381111561126957600080fd5b611275878288016111ee565b9598909750949560400135949350505050565b6001600160401b0381168114610e6c57600080fd5b80356112a881611288565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112e5576112e56112ad565b60405290565b60405160c081016001600160401b03811182821017156112e5576112e56112ad565b604051601f8201601f191681016001600160401b0381118282101715611335576113356112ad565b604052919050565b600082601f83011261134e57600080fd5b604051604081018181106001600160401b0382111715611370576113706112ad565b806040525080604084018581111561138757600080fd5b845b818110156113a1578035835260209283019201611389565b509195945050505050565b60008060008060008060e087890312156113c557600080fd5b86356001600160401b038111156113db57600080fd5b6113e789828a016111ee565b90975095505060208701359350604087013561140281611288565b9250611411886060890161133d565b91506114208860a0890161133d565b90509295509295509295565b60006020828403121561143e57600080fd5b5035919050565b6000815180845260005b8181101561146b5760208185018101518683018201520161144f565b8181111561147d576000602083870101525b50601f01601f19169290920160200192915050565b82151581526040602082015260006114ad6040830184611445565b949350505050565b8035600381106112a857600080fd5b600082601f8301126114d557600080fd5b81356001600160401b038111156114ee576114ee6112ad565b611501601f8201601f191660200161130d565b81815284602083860101111561151657600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561154e57600080fd5b611557886114b5565b965060208801356001600160401b038082111561157357600080fd5b818a0191508a601f83011261158757600080fd5b813581811115611599576115996112ad565b8060051b6115a96020820161130d565b9182526020818501810192908101908e8411156115c557600080fd5b6020860192505b838310156116035784833511156115e257600080fd5b6115f28f602085358901016114c4565b8252602092830192909101906115cc565b9a5050505060408a0135965060608a013591508082111561162357600080fd5b61162f8b838c016114c4565b955060808a0135945060a08a013591508082111561164c57600080fd5b506116598a828b016111ee565b989b979a50959850939692959293505050565b6020815260006110886020830184611445565b60006040828403121561169157600080fd5b6116996112c3565b905081356001600160401b038111156116b157600080fd5b6116bd848285016114c4565b8252506020820135602082015292915050565b6000604082840312156116e257600080fd5b6116ea6112c3565b905081356116f781611288565b8152602082013561170781611288565b602082015292915050565b60006020828403121561172457600080fd5b81356001600160401b038082111561173b57600080fd5b9083019060e0828603121561174f57600080fd5b6117576112eb565b82358281111561176657600080fd5b6117728782860161167f565b82525060208301358281111561178757600080fd5b6117938782860161167f565b6020830152506117a56040840161129d565b60408201526060830135828111156117bc57600080fd5b6117c8878286016114c4565b6060830152506117db86608085016116d0565b60808201526117ec60c0840161129d565b60a082015295945050505050565b6040815282511515604082015260006020840151604060608401526118226080840182611445565b91505082151560208301529392505050565b60008151604084526118496040850182611445565b602093840151949093019390935250919050565b60e08152600061187060e0830189611834565b82810360208401526118828189611834565b90506001600160401b03808816604085015283820360608501526118a68288611445565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156118e857600080fd5b84356001600160401b038111156118fe57600080fd5b61190a878288016111ee565b90955093505060208501359150604085013561192581611288565b939692955090935050565b600060e0828403121561194257600080fd5b50919050565b60006020828403121561195a57600080fd5b81356001600160401b0381111561197057600080fd5b6114ad84828501611930565b8015158114610e6c57600080fd5b60008060008060008060008060a0898b0312156119a657600080fd5b88356001600160401b03808211156119bd57600080fd5b6119c98c838d016111ee565b909a5098508891506119dd60208c016114b5565b975060408b013591506119ef8261197c565b90955060608a01359080821115611a0557600080fd5b818b0191508b601f830112611a1957600080fd5b813581811115611a2857600080fd5b8c60208260051b8501011115611a3d57600080fd5b6020830196508095505060808b0135915080821115611a5b57600080fd5b50611a688b828c016111ee565b999c989b5096995094979396929594505050565b60008060408385031215611a8f57600080fd5b82356001600160401b0380821115611aa657600080fd5b611ab286838701611930565b93506020850135915080821115611ac857600080fd5b50830160408186031215611adb57600080fd5b809150509250929050565b60008060008060608587031215611afc57600080fd5b843593506020850135925060408501356001600160401b03811115611b2057600080fd5b611b2c878288016111ee565b95989497509550505050565b6001600160a01b0381168114610e6c57600080fd5b600060208284031215611b5f57600080fd5b813561108881611b38565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611bad606083018587611b6a565b90506001600160401b038316604083015295945050505050565b600060208284031215611bd957600080fd5b815161108881611288565b634e487b7160e01b600052603260045260246000fd5b600060018201611c1a57634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c3557607f821691505b60208210810361194257634e487b7160e01b600052602260045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60008235603e19833603018112611c8157600080fd5b9190910192915050565b6000808335601e19843603018112611ca257600080fd5b8301803591506001600160401b03821115611cbc57600080fd5b60200191503681900382131561122f57600080fd5b601f821115610b0b57600081815260208120601f850160051c81016020861015611cf85750805b601f850160051c820191505b81811015611d1757828155600101611d04565b505050505050565b600019600383901b1c191660019190911b1790565b611d3e8283611c8b565b6001600160401b03811115611d5557611d556112ad565b611d6981611d638554611c21565b85611cd1565b6000601f821160018114611d975760008315611d855750838201355b611d8f8482611d1f565b865550611df1565b600085815260209020601f19841690835b82811015611dc85786850135825560209485019460019092019101611da8565b5084821015611de55760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611e1081611288565b92915050565b6001600160401b03831115611e2d57611e2d6112ad565b611e4183611e3b8354611c21565b83611cd1565b6000601f841160018114611e6f5760008515611e5d5750838201355b611e678682611d1f565b8455506105e0565b600083815260209020601f19861690835b82811015611ea05786850135825560209485019460019092019101611e80565b5086821015611ebd5760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611eda81611288565b815467ffffffffffffffff19166001600160401b038216178255506020820135611f0381611288565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611f408283611c6b565b611f4a8182611c8b565b6001600160401b03811115611f6157611f616112ad565b611f7581611f6f8654611c21565b86611cd1565b6000601f821160018114611fa35760008315611f915750838201355b611f9b8482611d1f565b875550611ffd565b600086815260209020601f19841690835b82811015611fd45786850135825560209485019460019092019101611fb4565b5084821015611ff15760001960f88660031b161c19848701351681555b505060018360011b0186555b50505050602081013560018301555061202561201c6020840184611c6b565b60028301611d34565b61205561203460408401611e03565b600483016001600160401b0382166001600160401b03198254161781555050565b6120626060830183611c8b565b612070818360058601611e16565b50506120826080830160068301611ecf565b6120b261209160c08401611e03565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106120d457634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b8781101561215c5782840389528135601e1988360301811261211357600080fd5b870185810190356001600160401b0381111561212e57600080fd5b80360382131561213d57600080fd5b612148868284611b6a565b9a87019a95505050908401906001016120f2565b5091979650505050505050565b60a08152600061217d60a083018a8c611b6a565b61218a602084018a6120b6565b871515604084015282810360608401526121a58187896120d8565b905082810360808401526121ba818587611b6a565b9b9a5050505050505050505050565b81356121d48161197c565b815490151560ff1660ff1991909116178155600180820160206121f985820186611c8b565b6001600160401b03811115612210576122106112ad565b61221e81611f6f8654611c21565b6000601f82116001811461224c576000831561223a5750838201355b6122448482611d1f565b875550610bd1565b600086815260209020601f19841690835b8281101561227a578685013582559387019390890190870161225d565b50848210156122975760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156122bb57600080fd5b815161108881611b38565b8060005b60028110156104855781518452602093840193909101906001016122ca565b8481526001600160401b038416602082015260c0810161230c60408301856122c6565b610a9660808301846122c6565b600080835461232781611c21565b6001828116801561233f576001811461235457612383565b60ff1984168752821515830287019450612383565b8760005260208060002060005b8581101561237a5781548a820152908401908201612361565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906123c390830189611445565b6123d060408401896120b6565b82810360608401526123e38187896120d8565b905082810360808401526123f8818587611b6a565b9a995050505050505050505056fea26469706673582212201ec24b12e94ab6f00116ba7e9fecbf97c28312e102743c844151d0b435f4926f64736f6c634300080f0033"; type PanickingMarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Mars.sol/RevertingBytesMars__factory.ts b/src/evm/contracts/factories/Mars.sol/RevertingBytesMars__factory.ts index 3049b563..3e33db6f 100644 --- a/src/evm/contracts/factories/Mars.sol/RevertingBytesMars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/RevertingBytesMars__factory.ts @@ -479,6 +479,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "view", }, @@ -901,7 +906,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620023a2380380620023a28339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61201f80620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461120b565b610459565b005b61017a610175366004611381565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461120b565b61052a565b3480156101c357600080fd5b506101d76101d2366004611401565b6105e6565b60405161018e929190611467565b3480156101f157600080fd5b50610205610200366004611508565b6106a2565b60405161018e9190611641565b34801561021e57600080fd5b5061023261022d3660046116e7565b6106e7565b60405161018e91906117cf565b34801561024b57600080fd5b5061025f61025a366004611401565b61075f565b60405161018e9695949392919061181f565b34801561027d57600080fd5b5061016561028c366004611401565b6109bc565b34801561029d57600080fd5b5061017a6102ac366004611894565b610a1e565b3480156102bd57600080fd5b506101656102cc36600461190a565b610aa1565b6101656102df36600461194c565b610ae5565b3480156102f057600080fd5b50610165610bb1565b34801561030557600080fd5b5061016561031436600461194c565b610bc5565b34801561032557600080fd5b50610205610334366004611401565b610c47565b34801561034557600080fd5b50610165610354366004611a3e565b610cf3565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611401565b610d5f565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611aa8565b610d80565b34801561040557600080fd5b5061025f610414366004611401565b610db6565b34801561042557600080fd5b50610165610434366004611b0f565b610dc6565b34801561044557600080fd5b50610165610454366004611401565b610e44565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611b55565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611b89565b600154909150610520906001600160a01b031686838686610e6f565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611ba6565b9060005260206000200154036105ae576005818154811061059a5761059a611ba6565b6000918252602082200155600191506105c0565b806105b881611bbc565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611be3565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611be3565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db868484610f3e565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610727576040516321bf7f4960e01b815260040160405180910390fd5b506040805180820182526000808252825160208181018552918152908201528151639889d82160e01b81529151909181900360040190fd5b6004818154811061076f57600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546107a290611be3565b80601f01602080910402602001604051908101604052809291908181526020018280546107ce90611be3565b801561081b5780601f106107f05761010080835404028352916020019161081b565b820191906000526020600020905b8154815290600101906020018083116107fe57829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461084e90611be3565b80601f016020809104026020016040519081016040528092919081815260200182805461087a90611be3565b80156108c75780601f1061089c576101008083540402835291602001916108c7565b820191906000526020600020905b8154815290600101906020018083116108aa57829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b03909216926108fe90611be3565b80601f016020809104026020016040519081016040528092919081815260200182805461092a90611be3565b80156109775780601f1061094c57610100808354040283529160200191610977565b820191906000526020600020905b81548152906001019060200180831161095a57829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109c4611064565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a0a57600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a55908690899089908890600401611b55565b6020604051808303816000875af1158015610a74573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a989190611b89565b95945050505050565b6001546001600160a01b03163314610acc576040516321bf7f4960e01b815260040160405180910390fd5b604051631021bb3b60e31b815260040160405180910390fd5b610aed611064565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b2d908c908c908c908c908c908c908c908c90600401611cce565b600060405180830381600087803b158015610b4757600080fd5b505af1158015610b5b573d6000803e3d6000fd5b50505050610ba6818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110be565b505050505050505050565b610bb9611064565b610bc36000611173565b565b610bcd611064565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c0b908b908b908b908b908b908b908b908b90600401611cce565b600060405180830381600087803b158015610c2557600080fd5b505af1158015610c39573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c5757600080fd5b906000526020600020016000915090508054610c7290611be3565b80601f0160208091040260200160405190810160405280929190818152602001828054610c9e90611be3565b8015610ceb5780601f10610cc057610100808354040283529160200191610ceb565b820191906000526020600020905b815481529060010190602001808311610cce57829003601f168201915b505050505081565b6001546001600160a01b03163314610d1e576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b016104848282611d7d565b60058181548110610d6f57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610dab576040516321bf7f4960e01b815260040160405180910390fd5b6105df848383610f3e565b6002818154811061076f57600080fd5b610dce611064565b6001600160a01b038116610e385760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e4181611173565b50565b6001546001600160a01b03163314610e41576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610eaf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ed39190611e8c565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f059493929190611ecc565b6000604051808303818588803b158015610f1e57600080fd5b505af1158015610f32573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156110435760068181548110610f6057610f60611ba6565b90600052602060002001604051602001610f7a9190611efc565b604051602081830303815290604052805190602001208484604051602001610fa3929190611f72565b604051602081830303815290604052805190602001200361103157600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f860181900481028201810190925284815290859085908190840183828082843760009201919091525092945061105d9350505050565b8061103b81611bbc565b915050610f43565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610bc35760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e2f565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af11580156110fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111229190611e8c565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b815260040161115a9796959493929190611f82565b6000604051808303818588803b158015610c2557600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f8401126111d557600080fd5b5081356001600160401b038111156111ec57600080fd5b60208301915083602082850101111561120457600080fd5b9250929050565b6000806000806060858703121561122157600080fd5b8435935060208501356001600160401b0381111561123e57600080fd5b61124a878288016111c3565b9598909750949560400135949350505050565b6001600160401b0381168114610e4157600080fd5b803561127d8161125d565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112ba576112ba611282565b60405290565b60405160c081016001600160401b03811182821017156112ba576112ba611282565b604051601f8201601f191681016001600160401b038111828210171561130a5761130a611282565b604052919050565b600082601f83011261132357600080fd5b604051604081018181106001600160401b038211171561134557611345611282565b806040525080604084018581111561135c57600080fd5b845b8181101561137657803583526020928301920161135e565b509195945050505050565b60008060008060008060e0878903121561139a57600080fd5b86356001600160401b038111156113b057600080fd5b6113bc89828a016111c3565b9097509550506020870135935060408701356113d78161125d565b92506113e68860608901611312565b91506113f58860a08901611312565b90509295509295509295565b60006020828403121561141357600080fd5b5035919050565b6000815180845260005b8181101561144057602081850181015186830182015201611424565b81811115611452576000602083870101525b50601f01601f19169290920160200192915050565b8215158152604060208201526000611482604083018461141a565b949350505050565b80356003811061127d57600080fd5b600082601f8301126114aa57600080fd5b81356001600160401b038111156114c3576114c3611282565b6114d6601f8201601f19166020016112e2565b8181528460208386010111156114eb57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561152357600080fd5b61152c8861148a565b965060208801356001600160401b038082111561154857600080fd5b818a0191508a601f83011261155c57600080fd5b81358181111561156e5761156e611282565b8060051b61157e602082016112e2565b9182526020818501810192908101908e84111561159a57600080fd5b6020860192505b838310156115d85784833511156115b757600080fd5b6115c78f60208535890101611499565b8252602092830192909101906115a1565b9a5050505060408a0135965060608a01359150808211156115f857600080fd5b6116048b838c01611499565b955060808a0135945060a08a013591508082111561162157600080fd5b5061162e8a828b016111c3565b989b979a50959850939692959293505050565b60208152600061105d602083018461141a565b60006040828403121561166657600080fd5b61166e611298565b905081356001600160401b0381111561168657600080fd5b61169284828501611499565b8252506020820135602082015292915050565b6000604082840312156116b757600080fd5b6116bf611298565b905081356116cc8161125d565b815260208201356116dc8161125d565b602082015292915050565b6000602082840312156116f957600080fd5b81356001600160401b038082111561171057600080fd5b9083019060e0828603121561172457600080fd5b61172c6112c0565b82358281111561173b57600080fd5b61174787828601611654565b82525060208301358281111561175c57600080fd5b61176887828601611654565b60208301525061177a60408401611272565b604082015260608301358281111561179157600080fd5b61179d87828601611499565b6060830152506117b086608085016116a5565b60808201526117c160c08401611272565b60a082015295945050505050565b6020815281511515602082015260006020830151604080840152611482606084018261141a565b600081516040845261180b604085018261141a565b602093840151949093019390935250919050565b60e08152600061183260e08301896117f6565b828103602084015261184481896117f6565b90506001600160401b0380881660408501528382036060850152611868828861141a565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156118aa57600080fd5b84356001600160401b038111156118c057600080fd5b6118cc878288016111c3565b9095509350506020850135915060408501356118e78161125d565b939692955090935050565b600060e0828403121561190457600080fd5b50919050565b60006020828403121561191c57600080fd5b81356001600160401b0381111561193257600080fd5b611482848285016118f2565b8015158114610e4157600080fd5b60008060008060008060008060a0898b03121561196857600080fd5b88356001600160401b038082111561197f57600080fd5b61198b8c838d016111c3565b909a50985088915061199f60208c0161148a565b975060408b013591506119b18261193e565b90955060608a013590808211156119c757600080fd5b818b0191508b601f8301126119db57600080fd5b8135818111156119ea57600080fd5b8c60208260051b85010111156119ff57600080fd5b6020830196508095505060808b0135915080821115611a1d57600080fd5b50611a2a8b828c016111c3565b999c989b5096995094979396929594505050565b60008060408385031215611a5157600080fd5b82356001600160401b0380821115611a6857600080fd5b611a74868387016118f2565b93506020850135915080821115611a8a57600080fd5b50830160408186031215611a9d57600080fd5b809150509250929050565b60008060008060608587031215611abe57600080fd5b843593506020850135925060408501356001600160401b03811115611ae257600080fd5b611aee878288016111c3565b95989497509550505050565b6001600160a01b0381168114610e4157600080fd5b600060208284031215611b2157600080fd5b813561105d81611afa565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611b6f606083018587611b2c565b90506001600160401b038316604083015295945050505050565b600060208284031215611b9b57600080fd5b815161105d8161125d565b634e487b7160e01b600052603260045260246000fd5b600060018201611bdc57634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611bf757607f821691505b60208210810361190457634e487b7160e01b600052602260045260246000fd5b60038110611c3557634e487b7160e01b600052602160045260246000fd5b9052565b60008383855260208086019550808560051b8301018460005b87811015611cc157848303601f19018952813536889003601e19018112611c7857600080fd5b870184810190356001600160401b03811115611c9357600080fd5b803603821315611ca257600080fd5b611cad858284611b2c565b9a86019a9450505090830190600101611c52565b5090979650505050505050565b60a081526000611ce260a083018a8c611b2c565b611cef602084018a611c17565b87151560408401528281036060840152611d0a818789611c39565b90508281036080840152611d1f818587611b2c565b9b9a5050505050505050505050565b601f821115611d7857600081815260208120601f850160051c81016020861015611d555750805b601f850160051c820191505b81811015611d7457828155600101611d61565b5050505b505050565b8135611d888161193e565b815490151560ff1660ff1991909116178155600180820160208481013536869003601e19018112611db857600080fd5b850180356001600160401b03811115611dd057600080fd5b8036038383011315611de157600080fd5b611df581611def8654611be3565b86611d2e565b6000601f821160018114611e2b5760008315611e1357508382018501355b600019600385901b1c1916600184901b178655610ba6565b600086815260209020601f19841690835b82811015611e5b57868501880135825593870193908901908701611e3c565b5084821015611e7a5760001960f88660031b161c198785880101351681555b50505050841b90930190915550505050565b600060208284031215611e9e57600080fd5b815161105d81611afa565b8060005b6002811015610484578151845260209384019390910190600101611ead565b8481526001600160401b038416602082015260c08101611eef6040830185611ea9565b610a986080830184611ea9565b6000808354611f0a81611be3565b60018281168015611f225760018114611f3757611f66565b60ff1984168752821515830287019450611f66565b8760005260208060002060005b85811015611f5d5781548a820152908401908201611f44565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a060208201819052600090611fa69083018961141a565b611fb36040840189611c17565b8281036060840152611fc6818789611c39565b90508281036080840152611fdb818587611b2c565b9a995050505050505050505056fea2646970667358221220dd791365cb4b21660e70dc79fcd6150836b2c1e352bc42837bca1da1c981d56764736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620023b8380380620023b88339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61203580620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611212565b61045a565b005b61017a610175366004611388565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611212565b61052b565b3480156101c357600080fd5b506101d76101d2366004611408565b6105e7565b60405161018e92919061146e565b3480156101f157600080fd5b5061020561020036600461150f565b6106a3565b60405161018e9190611648565b34801561021e57600080fd5b5061023261022d3660046116ee565b6106e8565b60405161018e9291906117d6565b34801561024c57600080fd5b5061026061025b366004611408565b610766565b60405161018e96959493929190611839565b34801561027e57600080fd5b5061016561028d366004611408565b6109c3565b34801561029e57600080fd5b5061017a6102ad3660046118ae565b610a25565b3480156102be57600080fd5b506101656102cd366004611924565b610aa8565b6101656102e0366004611966565b610aec565b3480156102f157600080fd5b50610165610bb8565b34801561030657600080fd5b50610165610315366004611966565b610bcc565b34801561032657600080fd5b50610205610335366004611408565b610c4e565b34801561034657600080fd5b50610165610355366004611a58565b610cfa565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a7366004611408565b610d66565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611ac2565b610d87565b34801561040657600080fd5b50610260610415366004611408565b610dbd565b34801561042657600080fd5b50610165610435366004611b29565b610dcd565b34801561044657600080fd5b50610165610455366004611408565b610e4b565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611b6f565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611ba3565b600154909150610521906001600160a01b031686838686610e76565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611bc0565b9060005260206000200154036105af576005818154811061059b5761059b611bc0565b6000918252602082200155600191506105c1565b806105b981611bd6565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611bfd565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611bfd565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc868484610f45565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b0316331461072b576040516321bf7f4960e01b815260040160405180910390fd5b505060408051808201825260008082528251602081810185528282528301528251639889d82160e01b81529251919290919081900360040190fd5b6004818154811061077657600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546107a990611bfd565b80601f01602080910402602001604051908101604052809291908181526020018280546107d590611bfd565b80156108225780601f106107f757610100808354040283529160200191610822565b820191906000526020600020905b81548152906001019060200180831161080557829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461085590611bfd565b80601f016020809104026020016040519081016040528092919081815260200182805461088190611bfd565b80156108ce5780601f106108a3576101008083540402835291602001916108ce565b820191906000526020600020905b8154815290600101906020018083116108b157829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b039092169261090590611bfd565b80601f016020809104026020016040519081016040528092919081815260200182805461093190611bfd565b801561097e5780601f106109535761010080835404028352916020019161097e565b820191906000526020600020905b81548152906001019060200180831161096157829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109cb61106b565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a1157600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a5c908690899089908890600401611b6f565b6020604051808303816000875af1158015610a7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9f9190611ba3565b95945050505050565b6001546001600160a01b03163314610ad3576040516321bf7f4960e01b815260040160405180910390fd5b604051631021bb3b60e31b815260040160405180910390fd5b610af461106b565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b34908c908c908c908c908c908c908c908c90600401611ce4565b600060405180830381600087803b158015610b4e57600080fd5b505af1158015610b62573d6000803e3d6000fd5b50505050610bad818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110c5565b505050505050505050565b610bc061106b565b610bca600061117a565b565b610bd461106b565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c12908b908b908b908b908b908b908b908b90600401611ce4565b600060405180830381600087803b158015610c2c57600080fd5b505af1158015610c40573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c5e57600080fd5b906000526020600020016000915090508054610c7990611bfd565b80601f0160208091040260200160405190810160405280929190818152602001828054610ca590611bfd565b8015610cf25780601f10610cc757610100808354040283529160200191610cf2565b820191906000526020600020905b815481529060010190602001808311610cd557829003601f168201915b505050505081565b6001546001600160a01b03163314610d25576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b016104858282611d93565b60058181548110610d7657600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610db2576040516321bf7f4960e01b815260040160405180910390fd5b6105e0848383610f45565b6002818154811061077657600080fd5b610dd561106b565b6001600160a01b038116610e3f5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e488161117a565b50565b6001546001600160a01b03163314610e48576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610eb6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eda9190611ea2565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f0c9493929190611ee2565b6000604051808303818588803b158015610f2557600080fd5b505af1158015610f39573d6000803e3d6000fd5b50505050505050505050565b606060005b60065481101561104a5760068181548110610f6757610f67611bc0565b90600052602060002001604051602001610f819190611f12565b604051602081830303815290604052805190602001208484604051602001610faa929190611f88565b604051602081830303815290604052805190602001200361103857600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110649350505050565b8061104281611bd6565b915050610f4a565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610bca5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e36565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111299190611ea2565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016111619796959493929190611f98565b6000604051808303818588803b158015610c2c57600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f8401126111dc57600080fd5b5081356001600160401b038111156111f357600080fd5b60208301915083602082850101111561120b57600080fd5b9250929050565b6000806000806060858703121561122857600080fd5b8435935060208501356001600160401b0381111561124557600080fd5b611251878288016111ca565b9598909750949560400135949350505050565b6001600160401b0381168114610e4857600080fd5b803561128481611264565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112c1576112c1611289565b60405290565b60405160c081016001600160401b03811182821017156112c1576112c1611289565b604051601f8201601f191681016001600160401b038111828210171561131157611311611289565b604052919050565b600082601f83011261132a57600080fd5b604051604081018181106001600160401b038211171561134c5761134c611289565b806040525080604084018581111561136357600080fd5b845b8181101561137d578035835260209283019201611365565b509195945050505050565b60008060008060008060e087890312156113a157600080fd5b86356001600160401b038111156113b757600080fd5b6113c389828a016111ca565b9097509550506020870135935060408701356113de81611264565b92506113ed8860608901611319565b91506113fc8860a08901611319565b90509295509295509295565b60006020828403121561141a57600080fd5b5035919050565b6000815180845260005b818110156114475760208185018101518683018201520161142b565b81811115611459576000602083870101525b50601f01601f19169290920160200192915050565b82151581526040602082015260006114896040830184611421565b949350505050565b80356003811061128457600080fd5b600082601f8301126114b157600080fd5b81356001600160401b038111156114ca576114ca611289565b6114dd601f8201601f19166020016112e9565b8181528460208386010111156114f257600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561152a57600080fd5b61153388611491565b965060208801356001600160401b038082111561154f57600080fd5b818a0191508a601f83011261156357600080fd5b81358181111561157557611575611289565b8060051b611585602082016112e9565b9182526020818501810192908101908e8411156115a157600080fd5b6020860192505b838310156115df5784833511156115be57600080fd5b6115ce8f602085358901016114a0565b8252602092830192909101906115a8565b9a5050505060408a0135965060608a01359150808211156115ff57600080fd5b61160b8b838c016114a0565b955060808a0135945060a08a013591508082111561162857600080fd5b506116358a828b016111ca565b989b979a50959850939692959293505050565b6020815260006110646020830184611421565b60006040828403121561166d57600080fd5b61167561129f565b905081356001600160401b0381111561168d57600080fd5b611699848285016114a0565b8252506020820135602082015292915050565b6000604082840312156116be57600080fd5b6116c661129f565b905081356116d381611264565b815260208201356116e381611264565b602082015292915050565b60006020828403121561170057600080fd5b81356001600160401b038082111561171757600080fd5b9083019060e0828603121561172b57600080fd5b6117336112c7565b82358281111561174257600080fd5b61174e8782860161165b565b82525060208301358281111561176357600080fd5b61176f8782860161165b565b60208301525061178160408401611279565b604082015260608301358281111561179857600080fd5b6117a4878286016114a0565b6060830152506117b786608085016116ac565b60808201526117c860c08401611279565b60a082015295945050505050565b6040815282511515604082015260006020840151604060608401526117fe6080840182611421565b91505082151560208301529392505050565b60008151604084526118256040850182611421565b602093840151949093019390935250919050565b60e08152600061184c60e0830189611810565b828103602084015261185e8189611810565b90506001600160401b03808816604085015283820360608501526118828288611421565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156118c457600080fd5b84356001600160401b038111156118da57600080fd5b6118e6878288016111ca565b90955093505060208501359150604085013561190181611264565b939692955090935050565b600060e0828403121561191e57600080fd5b50919050565b60006020828403121561193657600080fd5b81356001600160401b0381111561194c57600080fd5b6114898482850161190c565b8015158114610e4857600080fd5b60008060008060008060008060a0898b03121561198257600080fd5b88356001600160401b038082111561199957600080fd5b6119a58c838d016111ca565b909a5098508891506119b960208c01611491565b975060408b013591506119cb82611958565b90955060608a013590808211156119e157600080fd5b818b0191508b601f8301126119f557600080fd5b813581811115611a0457600080fd5b8c60208260051b8501011115611a1957600080fd5b6020830196508095505060808b0135915080821115611a3757600080fd5b50611a448b828c016111ca565b999c989b5096995094979396929594505050565b60008060408385031215611a6b57600080fd5b82356001600160401b0380821115611a8257600080fd5b611a8e8683870161190c565b93506020850135915080821115611aa457600080fd5b50830160408186031215611ab757600080fd5b809150509250929050565b60008060008060608587031215611ad857600080fd5b843593506020850135925060408501356001600160401b03811115611afc57600080fd5b611b08878288016111ca565b95989497509550505050565b6001600160a01b0381168114610e4857600080fd5b600060208284031215611b3b57600080fd5b813561106481611b14565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611b89606083018587611b46565b90506001600160401b038316604083015295945050505050565b600060208284031215611bb557600080fd5b815161106481611264565b634e487b7160e01b600052603260045260246000fd5b600060018201611bf657634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c1157607f821691505b60208210810361191e57634e487b7160e01b600052602260045260246000fd5b60038110611c4f57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b87811015611cd75782840389528135601e19883603018112611c8e57600080fd5b870185810190356001600160401b03811115611ca957600080fd5b803603821315611cb857600080fd5b611cc3868284611b46565b9a87019a9550505090840190600101611c6d565b5091979650505050505050565b60a081526000611cf860a083018a8c611b46565b611d05602084018a611c31565b87151560408401528281036060840152611d20818789611c53565b90508281036080840152611d35818587611b46565b9b9a5050505050505050505050565b601f821115611d8e57600081815260208120601f850160051c81016020861015611d6b5750805b601f850160051c820191505b81811015611d8a57828155600101611d77565b5050505b505050565b8135611d9e81611958565b815490151560ff1660ff1991909116178155600180820160208481013536869003601e19018112611dce57600080fd5b850180356001600160401b03811115611de657600080fd5b8036038383011315611df757600080fd5b611e0b81611e058654611bfd565b86611d44565b6000601f821160018114611e415760008315611e2957508382018501355b600019600385901b1c1916600184901b178655610bad565b600086815260209020601f19841690835b82811015611e7157868501880135825593870193908901908701611e52565b5084821015611e905760001960f88660031b161c198785880101351681555b50505050841b90930190915550505050565b600060208284031215611eb457600080fd5b815161106481611b14565b8060005b6002811015610485578151845260209384019390910190600101611ec3565b8481526001600160401b038416602082015260c08101611f056040830185611ebf565b610a9f6080830184611ebf565b6000808354611f2081611bfd565b60018281168015611f385760018114611f4d57611f7c565b60ff1984168752821515830287019450611f7c565b8760005260208060002060005b85811015611f735781548a820152908401908201611f5a565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a060208201819052600090611fbc90830189611421565b611fc96040840189611c31565b8281036060840152611fdc818789611c53565b90508281036080840152611ff1818587611b46565b9a995050505050505050505056fea26469706673582212206b86326d1552a06317cfb2778fdd8b35dadf516778d5911b614aeb920992290564736f6c634300080f0033"; type RevertingBytesMarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Mars.sol/RevertingEmptyMars__factory.ts b/src/evm/contracts/factories/Mars.sol/RevertingEmptyMars__factory.ts index b31e65f7..b300759b 100644 --- a/src/evm/contracts/factories/Mars.sol/RevertingEmptyMars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/RevertingEmptyMars__factory.ts @@ -479,6 +479,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "view", }, @@ -891,7 +896,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b5060405162002760380380620027608339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6123dd80620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611200565b610459565b005b61017a610175366004611376565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611200565b61052a565b3480156101c357600080fd5b506101d76101d23660046113f6565b6105e6565b60405161018e92919061145c565b3480156101f157600080fd5b506102056102003660046114fd565b6106a2565b60405161018e9190611636565b34801561021e57600080fd5b5061023261022d3660046116dc565b6106e7565b60405161018e91906117c4565b34801561024b57600080fd5b5061025f61025a3660046113f6565b610727565b60405161018e96959493929190611814565b34801561027d57600080fd5b5061016561028c3660046113f6565b610984565b34801561029d57600080fd5b5061017a6102ac366004611889565b6109e6565b3480156102bd57600080fd5b506101656102cc3660046118ff565b610a69565b6101656102df366004611941565b610ada565b3480156102f057600080fd5b50610165610ba6565b34801561030557600080fd5b50610165610314366004611941565b610bba565b34801561032557600080fd5b506102056103343660046113f6565b610c3c565b34801561034557600080fd5b50610165610354366004611a33565b610ce8565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a63660046113f6565b610d54565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611a9d565b610d75565b34801561040557600080fd5b5061025f6104143660046113f6565b610dab565b34801561042557600080fd5b50610165610434366004611b04565b610dbb565b34801561044557600080fd5b506101656104543660046113f6565b610e39565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611b4a565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611b7e565b600154909150610520906001600160a01b031686838686610e64565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611b9b565b9060005260206000200154036105ae576005818154811061059a5761059a611b9b565b6000918252602082200155600191506105c0565b806105b881611bb1565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611bd8565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611bd8565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db868484610f33565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610140576040516321bf7f4960e01b815260040160405180910390fd5b6004818154811061073757600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461076a90611bd8565b80601f016020809104026020016040519081016040528092919081815260200182805461079690611bd8565b80156107e35780601f106107b8576101008083540402835291602001916107e3565b820191906000526020600020905b8154815290600101906020018083116107c657829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461081690611bd8565b80601f016020809104026020016040519081016040528092919081815260200182805461084290611bd8565b801561088f5780601f106108645761010080835404028352916020019161088f565b820191906000526020600020905b81548152906001019060200180831161087257829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b03909216926108c690611bd8565b80601f01602080910402602001604051908101604052809291908181526020018280546108f290611bd8565b801561093f5780601f106109145761010080835404028352916020019161093f565b820191906000526020600020905b81548152906001019060200180831161092257829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b61098c611059565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b1580156109d257600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a1d908690899089908890600401611b4a565b6020604051808303816000875af1158015610a3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a609190611b7e565b95945050505050565b6001546001600160a01b03163314610a94576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610ad58282611ed7565b505050565b610ae2611059565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b22908c908c908c908c908c908c908c908c9060040161210a565b600060405180830381600087803b158015610b3c57600080fd5b505af1158015610b50573d6000803e3d6000fd5b50505050610b9b818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110b3565b505050505050505050565b610bae611059565b610bb86000611168565b565b610bc2611059565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c00908b908b908b908b908b908b908b908b9060040161210a565b600060405180830381600087803b158015610c1a57600080fd5b505af1158015610c2e573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c4c57600080fd5b906000526020600020016000915090508054610c6790611bd8565b80601f0160208091040260200160405190810160405280929190818152602001828054610c9390611bd8565b8015610ce05780601f10610cb557610100808354040283529160200191610ce0565b820191906000526020600020905b815481529060010190602001808311610cc357829003601f168201915b505050505081565b6001546001600160a01b03163314610d13576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01610484828261216a565b60058181548110610d6457600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610da0576040516321bf7f4960e01b815260040160405180910390fd5b6105df848383610f33565b6002818154811061073757600080fd5b610dc3611059565b6001600160a01b038116610e2d5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e3681611168565b50565b6001546001600160a01b03163314610e36576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610ea4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ec8919061224a565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610efa949392919061228a565b6000604051808303818588803b158015610f1357600080fd5b505af1158015610f27573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156110385760068181548110610f5557610f55611b9b565b90600052602060002001604051602001610f6f91906122ba565b604051602081830303815290604052805190602001208484604051602001610f98929190612330565b604051602081830303815290604052805190602001200361102657600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110529350505050565b8061103081611bb1565b915050610f38565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610bb85760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e24565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af11580156110f3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611117919061224a565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b815260040161114f9796959493929190612340565b6000604051808303818588803b158015610c1a57600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f8401126111ca57600080fd5b5081356001600160401b038111156111e157600080fd5b6020830191508360208285010111156111f957600080fd5b9250929050565b6000806000806060858703121561121657600080fd5b8435935060208501356001600160401b0381111561123357600080fd5b61123f878288016111b8565b9598909750949560400135949350505050565b6001600160401b0381168114610e3657600080fd5b803561127281611252565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112af576112af611277565b60405290565b60405160c081016001600160401b03811182821017156112af576112af611277565b604051601f8201601f191681016001600160401b03811182821017156112ff576112ff611277565b604052919050565b600082601f83011261131857600080fd5b604051604081018181106001600160401b038211171561133a5761133a611277565b806040525080604084018581111561135157600080fd5b845b8181101561136b578035835260209283019201611353565b509195945050505050565b60008060008060008060e0878903121561138f57600080fd5b86356001600160401b038111156113a557600080fd5b6113b189828a016111b8565b9097509550506020870135935060408701356113cc81611252565b92506113db8860608901611307565b91506113ea8860a08901611307565b90509295509295509295565b60006020828403121561140857600080fd5b5035919050565b6000815180845260005b8181101561143557602081850181015186830182015201611419565b81811115611447576000602083870101525b50601f01601f19169290920160200192915050565b8215158152604060208201526000611477604083018461140f565b949350505050565b80356003811061127257600080fd5b600082601f83011261149f57600080fd5b81356001600160401b038111156114b8576114b8611277565b6114cb601f8201601f19166020016112d7565b8181528460208386010111156114e057600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561151857600080fd5b6115218861147f565b965060208801356001600160401b038082111561153d57600080fd5b818a0191508a601f83011261155157600080fd5b81358181111561156357611563611277565b8060051b611573602082016112d7565b9182526020818501810192908101908e84111561158f57600080fd5b6020860192505b838310156115cd5784833511156115ac57600080fd5b6115bc8f6020853589010161148e565b825260209283019290910190611596565b9a5050505060408a0135965060608a01359150808211156115ed57600080fd5b6115f98b838c0161148e565b955060808a0135945060a08a013591508082111561161657600080fd5b506116238a828b016111b8565b989b979a50959850939692959293505050565b602081526000611052602083018461140f565b60006040828403121561165b57600080fd5b61166361128d565b905081356001600160401b0381111561167b57600080fd5b6116878482850161148e565b8252506020820135602082015292915050565b6000604082840312156116ac57600080fd5b6116b461128d565b905081356116c181611252565b815260208201356116d181611252565b602082015292915050565b6000602082840312156116ee57600080fd5b81356001600160401b038082111561170557600080fd5b9083019060e0828603121561171957600080fd5b6117216112b5565b82358281111561173057600080fd5b61173c87828601611649565b82525060208301358281111561175157600080fd5b61175d87828601611649565b60208301525061176f60408401611267565b604082015260608301358281111561178657600080fd5b6117928782860161148e565b6060830152506117a5866080850161169a565b60808201526117b660c08401611267565b60a082015295945050505050565b6020815281511515602082015260006020830151604080840152611477606084018261140f565b6000815160408452611800604085018261140f565b602093840151949093019390935250919050565b60e08152600061182760e08301896117eb565b828103602084015261183981896117eb565b90506001600160401b038088166040850152838203606085015261185d828861140f565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b6000806000806060858703121561189f57600080fd5b84356001600160401b038111156118b557600080fd5b6118c1878288016111b8565b9095509350506020850135915060408501356118dc81611252565b939692955090935050565b600060e082840312156118f957600080fd5b50919050565b60006020828403121561191157600080fd5b81356001600160401b0381111561192757600080fd5b611477848285016118e7565b8015158114610e3657600080fd5b60008060008060008060008060a0898b03121561195d57600080fd5b88356001600160401b038082111561197457600080fd5b6119808c838d016111b8565b909a50985088915061199460208c0161147f565b975060408b013591506119a682611933565b90955060608a013590808211156119bc57600080fd5b818b0191508b601f8301126119d057600080fd5b8135818111156119df57600080fd5b8c60208260051b85010111156119f457600080fd5b6020830196508095505060808b0135915080821115611a1257600080fd5b50611a1f8b828c016111b8565b999c989b5096995094979396929594505050565b60008060408385031215611a4657600080fd5b82356001600160401b0380821115611a5d57600080fd5b611a69868387016118e7565b93506020850135915080821115611a7f57600080fd5b50830160408186031215611a9257600080fd5b809150509250929050565b60008060008060608587031215611ab357600080fd5b843593506020850135925060408501356001600160401b03811115611ad757600080fd5b611ae3878288016111b8565b95989497509550505050565b6001600160a01b0381168114610e3657600080fd5b600060208284031215611b1657600080fd5b813561105281611aef565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611b64606083018587611b21565b90506001600160401b038316604083015295945050505050565b600060208284031215611b9057600080fd5b815161105281611252565b634e487b7160e01b600052603260045260246000fd5b600060018201611bd157634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611bec57607f821691505b6020821081036118f957634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112611c2257600080fd5b9190910192915050565b6000808335601e19843603018112611c4357600080fd5b8301803591506001600160401b03821115611c5d57600080fd5b6020019150368190038213156111f957600080fd5b601f821115610ad557600081815260208120601f850160051c81016020861015611c995750805b601f850160051c820191505b81811015611cb857828155600101611ca5565b505050505050565b600019600383901b1c191660019190911b1790565b611cdf8283611c2c565b6001600160401b03811115611cf657611cf6611277565b611d0a81611d048554611bd8565b85611c72565b6000601f821160018114611d385760008315611d265750838201355b611d308482611cc0565b865550611d92565b600085815260209020601f19841690835b82811015611d695786850135825560209485019460019092019101611d49565b5084821015611d865760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611db181611252565b92915050565b6001600160401b03831115611dce57611dce611277565b611de283611ddc8354611bd8565b83611c72565b6000601f841160018114611e105760008515611dfe5750838201355b611e088682611cc0565b8455506105df565b600083815260209020601f19861690835b82811015611e415786850135825560209485019460019092019101611e21565b5086821015611e5e5760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611e7b81611252565b815467ffffffffffffffff19166001600160401b038216178255506020820135611ea481611252565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611ee18283611c0c565b611eeb8182611c2c565b6001600160401b03811115611f0257611f02611277565b611f1681611f108654611bd8565b86611c72565b6000601f821160018114611f445760008315611f325750838201355b611f3c8482611cc0565b875550611f9e565b600086815260209020601f19841690835b82811015611f755786850135825560209485019460019092019101611f55565b5084821015611f925760001960f88660031b161c19848701351681555b505060018360011b0186555b505050506020810135600183015550611fc6611fbd6020840184611c0c565b60028301611cd5565b611ff6611fd560408401611da4565b600483016001600160401b0382166001600160401b03198254161781555050565b6120036060830183611c2c565b612011818360058601611db7565b50506120236080830160068301611e70565b61205361203260c08401611da4565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b6003811061207557634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156120fd5782840389528135601e198836030181126120b457600080fd5b870185810190356001600160401b038111156120cf57600080fd5b8036038213156120de57600080fd5b6120e9868284611b21565b9a87019a9550505090840190600101612093565b5091979650505050505050565b60a08152600061211e60a083018a8c611b21565b61212b602084018a612057565b87151560408401528281036060840152612146818789612079565b9050828103608084015261215b818587611b21565b9b9a5050505050505050505050565b813561217581611933565b815490151560ff1660ff19919091161781556001808201602061219a85820186611c2c565b6001600160401b038111156121b1576121b1611277565b6121bf81611f108654611bd8565b6000601f8211600181146121ed57600083156121db5750838201355b6121e58482611cc0565b875550610b9b565b600086815260209020601f19841690835b8281101561221b57868501358255938701939089019087016121fe565b50848210156122385760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b60006020828403121561225c57600080fd5b815161105281611aef565b8060005b600281101561048457815184526020938401939091019060010161226b565b8481526001600160401b038416602082015260c081016122ad6040830185612267565b610a606080830184612267565b60008083546122c881611bd8565b600182811680156122e057600181146122f557612324565b60ff1984168752821515830287019450612324565b8760005260208060002060005b8581101561231b5781548a820152908401908201612302565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906123649083018961140f565b6123716040840189612057565b8281036060840152612384818789612079565b90508281036080840152612399818587611b21565b9a995050505050505050505056fea264697066735822122077f8ba515364578d4f981e8afdc27bb4e16a51023ccb2837f174c7c8264e3b5f64736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b5060405162002777380380620027778339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6123f480620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611204565b61045a565b005b61017a61017536600461137a565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611204565b61052b565b3480156101c357600080fd5b506101d76101d23660046113fa565b6105e7565b60405161018e929190611460565b3480156101f157600080fd5b50610205610200366004611501565b6106a3565b60405161018e919061163a565b34801561021e57600080fd5b5061023261022d3660046116e0565b6106e8565b60405161018e9291906117c8565b34801561024c57600080fd5b5061026061025b3660046113fa565b61072b565b60405161018e9695949392919061182b565b34801561027e57600080fd5b5061016561028d3660046113fa565b610988565b34801561029e57600080fd5b5061017a6102ad3660046118a0565b6109ea565b3480156102be57600080fd5b506101656102cd366004611916565b610a6d565b6101656102e0366004611958565b610ade565b3480156102f157600080fd5b50610165610baa565b34801561030657600080fd5b50610165610315366004611958565b610bbe565b34801561032657600080fd5b506102056103353660046113fa565b610c40565b34801561034657600080fd5b50610165610355366004611a4a565b610cec565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a73660046113fa565b610d58565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611ab4565b610d79565b34801561040657600080fd5b506102606104153660046113fa565b610daf565b34801561042657600080fd5b50610165610435366004611b1b565b610dbf565b34801561044657600080fd5b506101656104553660046113fa565b610e3d565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611b61565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611b95565b600154909150610521906001600160a01b031686838686610e68565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611bb2565b9060005260206000200154036105af576005818154811061059b5761059b611bb2565b6000918252602082200155600191506105c1565b806105b981611bc8565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611bef565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611bef565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc868484610f37565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b03163314610140576040516321bf7f4960e01b815260040160405180910390fd5b6004818154811061073b57600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461076e90611bef565b80601f016020809104026020016040519081016040528092919081815260200182805461079a90611bef565b80156107e75780601f106107bc576101008083540402835291602001916107e7565b820191906000526020600020905b8154815290600101906020018083116107ca57829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461081a90611bef565b80601f016020809104026020016040519081016040528092919081815260200182805461084690611bef565b80156108935780601f1061086857610100808354040283529160200191610893565b820191906000526020600020905b81548152906001019060200180831161087657829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b03909216926108ca90611bef565b80601f01602080910402602001604051908101604052809291908181526020018280546108f690611bef565b80156109435780601f1061091857610100808354040283529160200191610943565b820191906000526020600020905b81548152906001019060200180831161092657829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b61099061105d565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b1580156109d657600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a21908690899089908890600401611b61565b6020604051808303816000875af1158015610a40573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a649190611b95565b95945050505050565b6001546001600160a01b03163314610a98576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610ad98282611eee565b505050565b610ae661105d565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b26908c908c908c908c908c908c908c908c90600401612121565b600060405180830381600087803b158015610b4057600080fd5b505af1158015610b54573d6000803e3d6000fd5b50505050610b9f818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a915089905088886110b7565b505050505050505050565b610bb261105d565b610bbc600061116c565b565b610bc661105d565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c04908b908b908b908b908b908b908b908b90600401612121565b600060405180830381600087803b158015610c1e57600080fd5b505af1158015610c32573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c5057600080fd5b906000526020600020016000915090508054610c6b90611bef565b80601f0160208091040260200160405190810160405280929190818152602001828054610c9790611bef565b8015610ce45780601f10610cb957610100808354040283529160200191610ce4565b820191906000526020600020905b815481529060010190602001808311610cc757829003601f168201915b505050505081565b6001546001600160a01b03163314610d17576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b016104858282612181565b60058181548110610d6857600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610da4576040516321bf7f4960e01b815260040160405180910390fd5b6105e0848383610f37565b6002818154811061073b57600080fd5b610dc761105d565b6001600160a01b038116610e315760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610e3a8161116c565b50565b6001546001600160a01b03163314610e3a576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610ea8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ecc9190612261565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610efe94939291906122a1565b6000604051808303818588803b158015610f1757600080fd5b505af1158015610f2b573d6000803e3d6000fd5b50505050505050505050565b606060005b60065481101561103c5760068181548110610f5957610f59611bb2565b90600052602060002001604051602001610f7391906122d1565b604051602081830303815290604052805190602001208484604051602001610f9c929190612347565b604051602081830303815290604052805190602001200361102a57600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110569350505050565b8061103481611bc8565b915050610f3c565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610bbc5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610e28565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af11580156110f7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061111b9190612261565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016111539796959493929190612357565b6000604051808303818588803b158015610c1e57600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f8401126111ce57600080fd5b5081356001600160401b038111156111e557600080fd5b6020830191508360208285010111156111fd57600080fd5b9250929050565b6000806000806060858703121561121a57600080fd5b8435935060208501356001600160401b0381111561123757600080fd5b611243878288016111bc565b9598909750949560400135949350505050565b6001600160401b0381168114610e3a57600080fd5b803561127681611256565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156112b3576112b361127b565b60405290565b60405160c081016001600160401b03811182821017156112b3576112b361127b565b604051601f8201601f191681016001600160401b03811182821017156113035761130361127b565b604052919050565b600082601f83011261131c57600080fd5b604051604081018181106001600160401b038211171561133e5761133e61127b565b806040525080604084018581111561135557600080fd5b845b8181101561136f578035835260209283019201611357565b509195945050505050565b60008060008060008060e0878903121561139357600080fd5b86356001600160401b038111156113a957600080fd5b6113b589828a016111bc565b9097509550506020870135935060408701356113d081611256565b92506113df886060890161130b565b91506113ee8860a0890161130b565b90509295509295509295565b60006020828403121561140c57600080fd5b5035919050565b6000815180845260005b818110156114395760208185018101518683018201520161141d565b8181111561144b576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061147b6040830184611413565b949350505050565b80356003811061127657600080fd5b600082601f8301126114a357600080fd5b81356001600160401b038111156114bc576114bc61127b565b6114cf601f8201601f19166020016112db565b8181528460208386010111156114e457600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561151c57600080fd5b61152588611483565b965060208801356001600160401b038082111561154157600080fd5b818a0191508a601f83011261155557600080fd5b8135818111156115675761156761127b565b8060051b611577602082016112db565b9182526020818501810192908101908e84111561159357600080fd5b6020860192505b838310156115d15784833511156115b057600080fd5b6115c08f60208535890101611492565b82526020928301929091019061159a565b9a5050505060408a0135965060608a01359150808211156115f157600080fd5b6115fd8b838c01611492565b955060808a0135945060a08a013591508082111561161a57600080fd5b506116278a828b016111bc565b989b979a50959850939692959293505050565b6020815260006110566020830184611413565b60006040828403121561165f57600080fd5b611667611291565b905081356001600160401b0381111561167f57600080fd5b61168b84828501611492565b8252506020820135602082015292915050565b6000604082840312156116b057600080fd5b6116b8611291565b905081356116c581611256565b815260208201356116d581611256565b602082015292915050565b6000602082840312156116f257600080fd5b81356001600160401b038082111561170957600080fd5b9083019060e0828603121561171d57600080fd5b6117256112b9565b82358281111561173457600080fd5b6117408782860161164d565b82525060208301358281111561175557600080fd5b6117618782860161164d565b6020830152506117736040840161126b565b604082015260608301358281111561178a57600080fd5b61179687828601611492565b6060830152506117a9866080850161169e565b60808201526117ba60c0840161126b565b60a082015295945050505050565b6040815282511515604082015260006020840151604060608401526117f06080840182611413565b91505082151560208301529392505050565b60008151604084526118176040850182611413565b602093840151949093019390935250919050565b60e08152600061183e60e0830189611802565b82810360208401526118508189611802565b90506001600160401b03808816604085015283820360608501526118748288611413565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156118b657600080fd5b84356001600160401b038111156118cc57600080fd5b6118d8878288016111bc565b9095509350506020850135915060408501356118f381611256565b939692955090935050565b600060e0828403121561191057600080fd5b50919050565b60006020828403121561192857600080fd5b81356001600160401b0381111561193e57600080fd5b61147b848285016118fe565b8015158114610e3a57600080fd5b60008060008060008060008060a0898b03121561197457600080fd5b88356001600160401b038082111561198b57600080fd5b6119978c838d016111bc565b909a5098508891506119ab60208c01611483565b975060408b013591506119bd8261194a565b90955060608a013590808211156119d357600080fd5b818b0191508b601f8301126119e757600080fd5b8135818111156119f657600080fd5b8c60208260051b8501011115611a0b57600080fd5b6020830196508095505060808b0135915080821115611a2957600080fd5b50611a368b828c016111bc565b999c989b5096995094979396929594505050565b60008060408385031215611a5d57600080fd5b82356001600160401b0380821115611a7457600080fd5b611a80868387016118fe565b93506020850135915080821115611a9657600080fd5b50830160408186031215611aa957600080fd5b809150509250929050565b60008060008060608587031215611aca57600080fd5b843593506020850135925060408501356001600160401b03811115611aee57600080fd5b611afa878288016111bc565b95989497509550505050565b6001600160a01b0381168114610e3a57600080fd5b600060208284031215611b2d57600080fd5b813561105681611b06565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611b7b606083018587611b38565b90506001600160401b038316604083015295945050505050565b600060208284031215611ba757600080fd5b815161105681611256565b634e487b7160e01b600052603260045260246000fd5b600060018201611be857634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c0357607f821691505b60208210810361191057634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112611c3957600080fd5b9190910192915050565b6000808335601e19843603018112611c5a57600080fd5b8301803591506001600160401b03821115611c7457600080fd5b6020019150368190038213156111fd57600080fd5b601f821115610ad957600081815260208120601f850160051c81016020861015611cb05750805b601f850160051c820191505b81811015611ccf57828155600101611cbc565b505050505050565b600019600383901b1c191660019190911b1790565b611cf68283611c43565b6001600160401b03811115611d0d57611d0d61127b565b611d2181611d1b8554611bef565b85611c89565b6000601f821160018114611d4f5760008315611d3d5750838201355b611d478482611cd7565b865550611da9565b600085815260209020601f19841690835b82811015611d805786850135825560209485019460019092019101611d60565b5084821015611d9d5760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611dc881611256565b92915050565b6001600160401b03831115611de557611de561127b565b611df983611df38354611bef565b83611c89565b6000601f841160018114611e275760008515611e155750838201355b611e1f8682611cd7565b8455506105e0565b600083815260209020601f19861690835b82811015611e585786850135825560209485019460019092019101611e38565b5086821015611e755760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611e9281611256565b815467ffffffffffffffff19166001600160401b038216178255506020820135611ebb81611256565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611ef88283611c23565b611f028182611c43565b6001600160401b03811115611f1957611f1961127b565b611f2d81611f278654611bef565b86611c89565b6000601f821160018114611f5b5760008315611f495750838201355b611f538482611cd7565b875550611fb5565b600086815260209020601f19841690835b82811015611f8c5786850135825560209485019460019092019101611f6c565b5084821015611fa95760001960f88660031b161c19848701351681555b505060018360011b0186555b505050506020810135600183015550611fdd611fd46020840184611c23565b60028301611cec565b61200d611fec60408401611dbb565b600483016001600160401b0382166001600160401b03198254161781555050565b61201a6060830183611c43565b612028818360058601611dce565b505061203a6080830160068301611e87565b61206a61204960c08401611dbb565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b6003811061208c57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156121145782840389528135601e198836030181126120cb57600080fd5b870185810190356001600160401b038111156120e657600080fd5b8036038213156120f557600080fd5b612100868284611b38565b9a87019a95505050908401906001016120aa565b5091979650505050505050565b60a08152600061213560a083018a8c611b38565b612142602084018a61206e565b8715156040840152828103606084015261215d818789612090565b90508281036080840152612172818587611b38565b9b9a5050505050505050505050565b813561218c8161194a565b815490151560ff1660ff1991909116178155600180820160206121b185820186611c43565b6001600160401b038111156121c8576121c861127b565b6121d681611f278654611bef565b6000601f82116001811461220457600083156121f25750838201355b6121fc8482611cd7565b875550610b9f565b600086815260209020601f19841690835b828110156122325786850135825593870193908901908701612215565b508482101561224f5760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b60006020828403121561227357600080fd5b815161105681611b06565b8060005b6002811015610485578151845260209384019390910190600101612282565b8481526001600160401b038416602082015260c081016122c4604083018561227e565b610a64608083018461227e565b60008083546122df81611bef565b600182811680156122f7576001811461230c5761233b565b60ff198416875282151583028701945061233b565b8760005260208060002060005b858110156123325781548a820152908401908201612319565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a06020820181905260009061237b90830189611413565b612388604084018961206e565b828103606084015261239b818789612090565b905082810360808401526123b0818587611b38565b9a995050505050505050505056fea2646970667358221220742fdd1d9cf33219c05c879d20377908418cec13a06eacff947e27913087a8ed64736f6c634300080f0033"; type RevertingEmptyMarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Mars.sol/RevertingStringCloseChannelMars__factory.ts b/src/evm/contracts/factories/Mars.sol/RevertingStringCloseChannelMars__factory.ts index ca88e205..1578bad7 100644 --- a/src/evm/contracts/factories/Mars.sol/RevertingStringCloseChannelMars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/RevertingStringCloseChannelMars__factory.ts @@ -479,6 +479,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, @@ -891,7 +896,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b5060405162002968380380620029688339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6125e580620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611354565b610459565b005b61017a6101753660046114c5565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611354565b61052a565b3480156101c357600080fd5b506101d76101d2366004611545565b6105a2565b60405161018e9291906115ab565b3480156101f157600080fd5b5061020561020036600461164c565b61065e565b60405161018e9190611785565b34801561021e57600080fd5b5061023261022d36600461182b565b6106a3565b60405161018e9190611913565b34801561024b57600080fd5b5061025f61025a366004611545565b61087e565b60405161018e96959493929190611963565b34801561027d57600080fd5b5061016561028c366004611545565b610ad6565b34801561029d57600080fd5b5061017a6102ac3660046119d8565b610b3f565b3480156102bd57600080fd5b506101656102cc366004611a4e565b610bc2565b6101656102df366004611a90565b610c33565b3480156102f057600080fd5b50610165610cff565b34801561030557600080fd5b50610165610314366004611a90565b610d13565b34801561032557600080fd5b50610205610334366004611545565b610d95565b34801561034557600080fd5b50610165610354366004611b82565b610e41565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611545565b610ead565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611bec565b610ece565b34801561040557600080fd5b5061025f610414366004611545565b610f04565b34801561042557600080fd5b50610165610434366004611c53565b610f14565b34801561044557600080fd5b50610165610454366004611545565b610f8d565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611c99565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611ccd565b600154909150610520906001600160a01b031686838686610fb8565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152601e60248201527f636c6f736520696263206368616e6e656c20697320726576657274696e67000060448201526064015b60405180910390fd5b600381815481106105b257600080fd5b60009182526020909120600290910201805460018201805460ff9092169350906105db90611cea565b80601f016020809104026020016040519081016040528092919081815260200182805461060790611cea565b80156106545780601f1061062957610100808354040283529160200191610654565b820191906000526020600020905b81548152906001019060200180831161063757829003601f168201915b5050505050905082565b6001546060906001600160a01b0316331461068c576040516321bf7f4960e01b815260040160405180910390fd5b610697868484611087565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b031633146106e3576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528251805184926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace0191908290819061072e9082611d81565b506020918201516001909101558201518051600283019081906107519082611d81565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b039092169190911790556060820151600582019061079a9082611d81565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff19929092169190911790915560408051808201825260018152905190918281019161086491017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60405160208183030381529060405281525090505b919050565b6004818154811061088e57600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546108c190611cea565b80601f01602080910402602001604051908101604052809291908181526020018280546108ed90611cea565b801561093a5780601f1061090f5761010080835404028352916020019161093a565b820191906000526020600020905b81548152906001019060200180831161091d57829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461096d90611cea565b80601f016020809104026020016040519081016040528092919081815260200182805461099990611cea565b80156109e65780601f106109bb576101008083540402835291602001916109e6565b820191906000526020600020905b8154815290600101906020018083116109c957829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a1d90611cea565b80601f0160208091040260200160405190810160405280929190818152602001828054610a4990611cea565b8015610a965780601f10610a6b57610100808354040283529160200191610a96565b820191906000526020600020905b815481529060010190602001808311610a7957829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610ade6111ad565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b2457600080fd5b505af1158015610b38573d6000803e3d6000fd5b5050505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610b76908690899089908890600401611c99565b6020604051808303816000875af1158015610b95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bb99190611ccd565b95945050505050565b6001546001600160a01b03163314610bed576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c2e82826120a2565b505050565b610c3b6111ad565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610c7b908c908c908c908c908c908c908c908c906004016122d5565b600060405180830381600087803b158015610c9557600080fd5b505af1158015610ca9573d6000803e3d6000fd5b50505050610cf4818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a91508990508888611207565b505050505050505050565b610d076111ad565b610d1160006112bc565b565b610d1b6111ad565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d59908b908b908b908b908b908b908b908b906004016122d5565b600060405180830381600087803b158015610d7357600080fd5b505af1158015610d87573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610da557600080fd5b906000526020600020016000915090508054610dc090611cea565b80601f0160208091040260200160405190810160405280929190818152602001828054610dec90611cea565b8015610e395780601f10610e0e57610100808354040283529160200191610e39565b820191906000526020600020905b815481529060010190602001808311610e1c57829003601f168201915b505050505081565b6001546001600160a01b03163314610e6c576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b016104848282612335565b60058181548110610ebd57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610ef9576040516321bf7f4960e01b815260040160405180910390fd5b610b38848383611087565b6002818154811061088e57600080fd5b610f1c6111ad565b6001600160a01b038116610f815760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152608401610599565b610f8a816112bc565b50565b6001546001600160a01b03163314610f8a576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610ff8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101c9190612415565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b815260040161104e9493929190612455565b6000604051808303818588803b15801561106757600080fd5b505af115801561107b573d6000803e3d6000fd5b50505050505050505050565b606060005b60065481101561118c57600681815481106110a9576110a9612485565b906000526020600020016040516020016110c3919061249b565b6040516020818303038152906040528051906020012084846040516020016110ec929190612511565b604051602081830303815290604052805190602001200361117a57600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111a69350505050565b8061118481612521565b91505061108c565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d115760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610599565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611247573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061126b9190612415565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112a39796959493929190612548565b6000604051808303818588803b158015610d7357600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261131e57600080fd5b5081356001600160401b0381111561133557600080fd5b60208301915083602082850101111561134d57600080fd5b9250929050565b6000806000806060858703121561136a57600080fd5b8435935060208501356001600160401b0381111561138757600080fd5b6113938782880161130c565b9598909750949560400135949350505050565b6001600160401b0381168114610f8a57600080fd5b8035610879816113a6565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b03811182821017156113fe576113fe6113c6565b60405290565b60405160c081016001600160401b03811182821017156113fe576113fe6113c6565b604051601f8201601f191681016001600160401b038111828210171561144e5761144e6113c6565b604052919050565b600082601f83011261146757600080fd5b604051604081018181106001600160401b0382111715611489576114896113c6565b80604052508060408401858111156114a057600080fd5b845b818110156114ba5780358352602092830192016114a2565b509195945050505050565b60008060008060008060e087890312156114de57600080fd5b86356001600160401b038111156114f457600080fd5b61150089828a0161130c565b90975095505060208701359350604087013561151b816113a6565b925061152a8860608901611456565b91506115398860a08901611456565b90509295509295509295565b60006020828403121561155757600080fd5b5035919050565b6000815180845260005b8181101561158457602081850181015186830182015201611568565b81811115611596576000602083870101525b50601f01601f19169290920160200192915050565b82151581526040602082015260006115c6604083018461155e565b949350505050565b80356003811061087957600080fd5b600082601f8301126115ee57600080fd5b81356001600160401b03811115611607576116076113c6565b61161a601f8201601f1916602001611426565b81815284602083860101111561162f57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561166757600080fd5b611670886115ce565b965060208801356001600160401b038082111561168c57600080fd5b818a0191508a601f8301126116a057600080fd5b8135818111156116b2576116b26113c6565b8060051b6116c260208201611426565b9182526020818501810192908101908e8411156116de57600080fd5b6020860192505b8383101561171c5784833511156116fb57600080fd5b61170b8f602085358901016115dd565b8252602092830192909101906116e5565b9a5050505060408a0135965060608a013591508082111561173c57600080fd5b6117488b838c016115dd565b955060808a0135945060a08a013591508082111561176557600080fd5b506117728a828b0161130c565b989b979a50959850939692959293505050565b6020815260006111a6602083018461155e565b6000604082840312156117aa57600080fd5b6117b26113dc565b905081356001600160401b038111156117ca57600080fd5b6117d6848285016115dd565b8252506020820135602082015292915050565b6000604082840312156117fb57600080fd5b6118036113dc565b90508135611810816113a6565b81526020820135611820816113a6565b602082015292915050565b60006020828403121561183d57600080fd5b81356001600160401b038082111561185457600080fd5b9083019060e0828603121561186857600080fd5b611870611404565b82358281111561187f57600080fd5b61188b87828601611798565b8252506020830135828111156118a057600080fd5b6118ac87828601611798565b6020830152506118be604084016113bb565b60408201526060830135828111156118d557600080fd5b6118e1878286016115dd565b6060830152506118f486608085016117e9565b608082015261190560c084016113bb565b60a082015295945050505050565b60208152815115156020820152600060208301516040808401526115c6606084018261155e565b600081516040845261194f604085018261155e565b602093840151949093019390935250919050565b60e08152600061197660e083018961193a565b8281036020840152611988818961193a565b90506001600160401b03808816604085015283820360608501526119ac828861155e565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b600080600080606085870312156119ee57600080fd5b84356001600160401b03811115611a0457600080fd5b611a108782880161130c565b909550935050602085013591506040850135611a2b816113a6565b939692955090935050565b600060e08284031215611a4857600080fd5b50919050565b600060208284031215611a6057600080fd5b81356001600160401b03811115611a7657600080fd5b6115c684828501611a36565b8015158114610f8a57600080fd5b60008060008060008060008060a0898b031215611aac57600080fd5b88356001600160401b0380821115611ac357600080fd5b611acf8c838d0161130c565b909a509850889150611ae360208c016115ce565b975060408b01359150611af582611a82565b90955060608a01359080821115611b0b57600080fd5b818b0191508b601f830112611b1f57600080fd5b813581811115611b2e57600080fd5b8c60208260051b8501011115611b4357600080fd5b6020830196508095505060808b0135915080821115611b6157600080fd5b50611b6e8b828c0161130c565b999c989b5096995094979396929594505050565b60008060408385031215611b9557600080fd5b82356001600160401b0380821115611bac57600080fd5b611bb886838701611a36565b93506020850135915080821115611bce57600080fd5b50830160408186031215611be157600080fd5b809150509250929050565b60008060008060608587031215611c0257600080fd5b843593506020850135925060408501356001600160401b03811115611c2657600080fd5b611c328782880161130c565b95989497509550505050565b6001600160a01b0381168114610f8a57600080fd5b600060208284031215611c6557600080fd5b81356111a681611c3e565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611cb3606083018587611c70565b90506001600160401b038316604083015295945050505050565b600060208284031215611cdf57600080fd5b81516111a6816113a6565b600181811c90821680611cfe57607f821691505b602082108103611a4857634e487b7160e01b600052602260045260246000fd5b601f821115610c2e57600081815260208120601f850160051c81016020861015611d455750805b601f850160051c820191505b81811015611d6457828155600101611d51565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611d9a57611d9a6113c6565b611dae81611da88454611cea565b84611d1e565b602080601f831160018114611ddd5760008415611dcb5750858301515b611dd58582611d6c565b865550611d64565b600085815260208120601f198616915b82811015611e0c57888601518255948401946001909101908401611ded565b5085821015611e2a5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611e5057600080fd5b9190910192915050565b6000808335601e19843603018112611e7157600080fd5b8301803591506001600160401b03821115611e8b57600080fd5b60200191503681900382131561134d57600080fd5b611eaa8283611e5a565b6001600160401b03811115611ec157611ec16113c6565b611ed581611ecf8554611cea565b85611d1e565b6000601f821160018114611f035760008315611ef15750838201355b611efb8482611d6c565b865550611f5d565b600085815260209020601f19841690835b82811015611f345786850135825560209485019460019092019101611f14565b5084821015611f515760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611f7c816113a6565b92915050565b6001600160401b03831115611f9957611f996113c6565b611fad83611fa78354611cea565b83611d1e565b6000601f841160018114611fdb5760008515611fc95750838201355b611fd38682611d6c565b845550610b38565b600083815260209020601f19861690835b8281101561200c5786850135825560209485019460019092019101611fec565b50868210156120295760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135612046816113a6565b815467ffffffffffffffff19166001600160401b03821617825550602082013561206f816113a6565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b6120ac8283611e3a565b6120b68182611e5a565b6001600160401b038111156120cd576120cd6113c6565b6120e1816120db8654611cea565b86611d1e565b6000601f82116001811461210f57600083156120fd5750838201355b6121078482611d6c565b875550612169565b600086815260209020601f19841690835b828110156121405786850135825560209485019460019092019101612120565b508482101561215d5760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506121916121886020840184611e3a565b60028301611ea0565b6121c16121a060408401611f6f565b600483016001600160401b0382166001600160401b03198254161781555050565b6121ce6060830183611e5a565b6121dc818360058601611f82565b50506121ee608083016006830161203b565b61221e6121fd60c08401611f6f565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b6003811061224057634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156122c85782840389528135601e1988360301811261227f57600080fd5b870185810190356001600160401b0381111561229a57600080fd5b8036038213156122a957600080fd5b6122b4868284611c70565b9a87019a955050509084019060010161225e565b5091979650505050505050565b60a0815260006122e960a083018a8c611c70565b6122f6602084018a612222565b87151560408401528281036060840152612311818789612244565b90508281036080840152612326818587611c70565b9b9a5050505050505050505050565b813561234081611a82565b815490151560ff1660ff19919091161781556001808201602061236585820186611e5a565b6001600160401b0381111561237c5761237c6113c6565b61238a816120db8654611cea565b6000601f8211600181146123b857600083156123a65750838201355b6123b08482611d6c565b875550610cf4565b600086815260209020601f19841690835b828110156123e657868501358255938701939089019087016123c9565b50848210156124035760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b60006020828403121561242757600080fd5b81516111a681611c3e565b8060005b6002811015610484578151845260209384019390910190600101612436565b8481526001600160401b038416602082015260c081016124786040830185612432565b610bb96080830184612432565b634e487b7160e01b600052603260045260246000fd5b60008083546124a981611cea565b600182811680156124c157600181146124d657612505565b60ff1984168752821515830287019450612505565b8760005260208060002060005b858110156124fc5781548a8201529084019082016124e3565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b60006001820161254157634e487b7160e01b600052601160045260246000fd5b5060010190565b6001600160a01b038816815260a06020820181905260009061256c9083018961155e565b6125796040840189612222565b828103606084015261258c818789612244565b905082810360808401526125a1818587611c70565b9a995050505050505050505056fea2646970667358221220e2691e53f4131346ce3b3a5eb46e49515714beba8aa6eb631615f06e838d5e0c64736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b5060405162002986380380620029868339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61260380620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461135a565b61045a565b005b61017a6101753660046114d0565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461135a565b61052b565b3480156101c357600080fd5b506101d76101d2366004611550565b6105a3565b60405161018e9291906115b6565b3480156101f157600080fd5b50610205610200366004611657565b61065f565b60405161018e9190611790565b34801561021e57600080fd5b5061023261022d366004611836565b6106a4565b60405161018e92919061191e565b34801561024c57600080fd5b5061026061025b366004611550565b610884565b60405161018e96959493929190611981565b34801561027e57600080fd5b5061016561028d366004611550565b610adc565b34801561029e57600080fd5b5061017a6102ad3660046119f6565b610b45565b3480156102be57600080fd5b506101656102cd366004611a6c565b610bc8565b6101656102e0366004611aae565b610c39565b3480156102f157600080fd5b50610165610d05565b34801561030657600080fd5b50610165610315366004611aae565b610d19565b34801561032657600080fd5b50610205610335366004611550565b610d9b565b34801561034657600080fd5b50610165610355366004611ba0565b610e47565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a7366004611550565b610eb3565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611c0a565b610ed4565b34801561040657600080fd5b50610260610415366004611550565b610f0a565b34801561042657600080fd5b50610165610435366004611c71565b610f1a565b34801561044657600080fd5b50610165610455366004611550565b610f93565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611cb7565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611ceb565b600154909150610521906001600160a01b031686838686610fbe565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152601e60248201527f636c6f736520696263206368616e6e656c20697320726576657274696e67000060448201526064015b60405180910390fd5b600381815481106105b357600080fd5b60009182526020909120600290910201805460018201805460ff9092169350906105dc90611d08565b80601f016020809104026020016040519081016040528092919081815260200182805461060890611d08565b80156106555780601f1061062a57610100808354040283529160200191610655565b820191906000526020600020905b81548152906001019060200180831161063857829003601f168201915b5050505050905082565b6001546060906001600160a01b0316331461068d576040516321bf7f4960e01b815260040160405180910390fd5b61069886848461108d565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b031633146106e7576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528351805185926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace019190829081906107329082611d9f565b506020918201516001909101558201518051600283019081906107559082611d9f565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b039092169190911790556060820151600582019061079e9082611d9f565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff19929092169190911790915560408051808201825260018152905190918281019161086891017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60408051601f1981840301815291905290529360009350915050565b6004818154811061089457600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546108c790611d08565b80601f01602080910402602001604051908101604052809291908181526020018280546108f390611d08565b80156109405780601f1061091557610100808354040283529160200191610940565b820191906000526020600020905b81548152906001019060200180831161092357829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461097390611d08565b80601f016020809104026020016040519081016040528092919081815260200182805461099f90611d08565b80156109ec5780601f106109c1576101008083540402835291602001916109ec565b820191906000526020600020905b8154815290600101906020018083116109cf57829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a2390611d08565b80601f0160208091040260200160405190810160405280929190818152602001828054610a4f90611d08565b8015610a9c5780601f10610a7157610100808354040283529160200191610a9c565b820191906000526020600020905b815481529060010190602001808311610a7f57829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610ae46111b3565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b2a57600080fd5b505af1158015610b3e573d6000803e3d6000fd5b5050505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610b7c908690899089908890600401611cb7565b6020604051808303816000875af1158015610b9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bbf9190611ceb565b95945050505050565b6001546001600160a01b03163314610bf3576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c3482826120c0565b505050565b610c416111b3565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610c81908c908c908c908c908c908c908c908c906004016122f3565b600060405180830381600087803b158015610c9b57600080fd5b505af1158015610caf573d6000803e3d6000fd5b50505050610cfa818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a9150899050888861120d565b505050505050505050565b610d0d6111b3565b610d1760006112c2565b565b610d216111b3565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d5f908b908b908b908b908b908b908b908b906004016122f3565b600060405180830381600087803b158015610d7957600080fd5b505af1158015610d8d573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610dab57600080fd5b906000526020600020016000915090508054610dc690611d08565b80601f0160208091040260200160405190810160405280929190818152602001828054610df290611d08565b8015610e3f5780601f10610e1457610100808354040283529160200191610e3f565b820191906000526020600020905b815481529060010190602001808311610e2257829003601f168201915b505050505081565b6001546001600160a01b03163314610e72576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b016104858282612353565b60058181548110610ec357600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610eff576040516321bf7f4960e01b815260040160405180910390fd5b610b3e84838361108d565b6002818154811061089457600080fd5b610f226111b3565b6001600160a01b038116610f875760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b606482015260840161059a565b610f90816112c2565b50565b6001546001600160a01b03163314610f90576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610ffe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110229190612433565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b81526004016110549493929190612473565b6000604051808303818588803b15801561106d57600080fd5b505af1158015611081573d6000803e3d6000fd5b50505050505050505050565b606060005b60065481101561119257600681815481106110af576110af6124a3565b906000526020600020016040516020016110c991906124b9565b6040516020818303038152906040528051906020012084846040516020016110f292919061252f565b604051602081830303815290604052805190602001200361118057600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111ac9350505050565b8061118a8161253f565b915050611092565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d175760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161059a565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561124d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112719190612433565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112a99796959493929190612566565b6000604051808303818588803b158015610d7957600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261132457600080fd5b5081356001600160401b0381111561133b57600080fd5b60208301915083602082850101111561135357600080fd5b9250929050565b6000806000806060858703121561137057600080fd5b8435935060208501356001600160401b0381111561138d57600080fd5b61139987828801611312565b9598909750949560400135949350505050565b6001600160401b0381168114610f9057600080fd5b80356113cc816113ac565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b0381118282101715611409576114096113d1565b60405290565b60405160c081016001600160401b0381118282101715611409576114096113d1565b604051601f8201601f191681016001600160401b0381118282101715611459576114596113d1565b604052919050565b600082601f83011261147257600080fd5b604051604081018181106001600160401b0382111715611494576114946113d1565b80604052508060408401858111156114ab57600080fd5b845b818110156114c55780358352602092830192016114ad565b509195945050505050565b60008060008060008060e087890312156114e957600080fd5b86356001600160401b038111156114ff57600080fd5b61150b89828a01611312565b909750955050602087013593506040870135611526816113ac565b92506115358860608901611461565b91506115448860a08901611461565b90509295509295509295565b60006020828403121561156257600080fd5b5035919050565b6000815180845260005b8181101561158f57602081850181015186830182015201611573565b818111156115a1576000602083870101525b50601f01601f19169290920160200192915050565b82151581526040602082015260006115d16040830184611569565b949350505050565b8035600381106113cc57600080fd5b600082601f8301126115f957600080fd5b81356001600160401b03811115611612576116126113d1565b611625601f8201601f1916602001611431565b81815284602083860101111561163a57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a03121561167257600080fd5b61167b886115d9565b965060208801356001600160401b038082111561169757600080fd5b818a0191508a601f8301126116ab57600080fd5b8135818111156116bd576116bd6113d1565b8060051b6116cd60208201611431565b9182526020818501810192908101908e8411156116e957600080fd5b6020860192505b8383101561172757848335111561170657600080fd5b6117168f602085358901016115e8565b8252602092830192909101906116f0565b9a5050505060408a0135965060608a013591508082111561174757600080fd5b6117538b838c016115e8565b955060808a0135945060a08a013591508082111561177057600080fd5b5061177d8a828b01611312565b989b979a50959850939692959293505050565b6020815260006111ac6020830184611569565b6000604082840312156117b557600080fd5b6117bd6113e7565b905081356001600160401b038111156117d557600080fd5b6117e1848285016115e8565b8252506020820135602082015292915050565b60006040828403121561180657600080fd5b61180e6113e7565b9050813561181b816113ac565b8152602082013561182b816113ac565b602082015292915050565b60006020828403121561184857600080fd5b81356001600160401b038082111561185f57600080fd5b9083019060e0828603121561187357600080fd5b61187b61140f565b82358281111561188a57600080fd5b611896878286016117a3565b8252506020830135828111156118ab57600080fd5b6118b7878286016117a3565b6020830152506118c9604084016113c1565b60408201526060830135828111156118e057600080fd5b6118ec878286016115e8565b6060830152506118ff86608085016117f4565b608082015261191060c084016113c1565b60a082015295945050505050565b6040815282511515604082015260006020840151604060608401526119466080840182611569565b91505082151560208301529392505050565b600081516040845261196d6040850182611569565b602093840151949093019390935250919050565b60e08152600061199460e0830189611958565b82810360208401526119a68189611958565b90506001600160401b03808816604085015283820360608501526119ca8288611569565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b60008060008060608587031215611a0c57600080fd5b84356001600160401b03811115611a2257600080fd5b611a2e87828801611312565b909550935050602085013591506040850135611a49816113ac565b939692955090935050565b600060e08284031215611a6657600080fd5b50919050565b600060208284031215611a7e57600080fd5b81356001600160401b03811115611a9457600080fd5b6115d184828501611a54565b8015158114610f9057600080fd5b60008060008060008060008060a0898b031215611aca57600080fd5b88356001600160401b0380821115611ae157600080fd5b611aed8c838d01611312565b909a509850889150611b0160208c016115d9565b975060408b01359150611b1382611aa0565b90955060608a01359080821115611b2957600080fd5b818b0191508b601f830112611b3d57600080fd5b813581811115611b4c57600080fd5b8c60208260051b8501011115611b6157600080fd5b6020830196508095505060808b0135915080821115611b7f57600080fd5b50611b8c8b828c01611312565b999c989b5096995094979396929594505050565b60008060408385031215611bb357600080fd5b82356001600160401b0380821115611bca57600080fd5b611bd686838701611a54565b93506020850135915080821115611bec57600080fd5b50830160408186031215611bff57600080fd5b809150509250929050565b60008060008060608587031215611c2057600080fd5b843593506020850135925060408501356001600160401b03811115611c4457600080fd5b611c5087828801611312565b95989497509550505050565b6001600160a01b0381168114610f9057600080fd5b600060208284031215611c8357600080fd5b81356111ac81611c5c565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611cd1606083018587611c8e565b90506001600160401b038316604083015295945050505050565b600060208284031215611cfd57600080fd5b81516111ac816113ac565b600181811c90821680611d1c57607f821691505b602082108103611a6657634e487b7160e01b600052602260045260246000fd5b601f821115610c3457600081815260208120601f850160051c81016020861015611d635750805b601f850160051c820191505b81811015611d8257828155600101611d6f565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611db857611db86113d1565b611dcc81611dc68454611d08565b84611d3c565b602080601f831160018114611dfb5760008415611de95750858301515b611df38582611d8a565b865550611d82565b600085815260208120601f198616915b82811015611e2a57888601518255948401946001909101908401611e0b565b5085821015611e485787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611e6e57600080fd5b9190910192915050565b6000808335601e19843603018112611e8f57600080fd5b8301803591506001600160401b03821115611ea957600080fd5b60200191503681900382131561135357600080fd5b611ec88283611e78565b6001600160401b03811115611edf57611edf6113d1565b611ef381611eed8554611d08565b85611d3c565b6000601f821160018114611f215760008315611f0f5750838201355b611f198482611d8a565b865550611f7b565b600085815260209020601f19841690835b82811015611f525786850135825560209485019460019092019101611f32565b5084821015611f6f5760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611f9a816113ac565b92915050565b6001600160401b03831115611fb757611fb76113d1565b611fcb83611fc58354611d08565b83611d3c565b6000601f841160018114611ff95760008515611fe75750838201355b611ff18682611d8a565b845550610b3e565b600083815260209020601f19861690835b8281101561202a578685013582556020948501946001909201910161200a565b50868210156120475760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135612064816113ac565b815467ffffffffffffffff19166001600160401b03821617825550602082013561208d816113ac565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b6120ca8283611e58565b6120d48182611e78565b6001600160401b038111156120eb576120eb6113d1565b6120ff816120f98654611d08565b86611d3c565b6000601f82116001811461212d576000831561211b5750838201355b6121258482611d8a565b875550612187565b600086815260209020601f19841690835b8281101561215e578685013582556020948501946001909201910161213e565b508482101561217b5760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506121af6121a66020840184611e58565b60028301611ebe565b6121df6121be60408401611f8d565b600483016001600160401b0382166001600160401b03198254161781555050565b6121ec6060830183611e78565b6121fa818360058601611fa0565b505061220c6080830160068301612059565b61223c61221b60c08401611f8d565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b6003811061225e57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156122e65782840389528135601e1988360301811261229d57600080fd5b870185810190356001600160401b038111156122b857600080fd5b8036038213156122c757600080fd5b6122d2868284611c8e565b9a87019a955050509084019060010161227c565b5091979650505050505050565b60a08152600061230760a083018a8c611c8e565b612314602084018a612240565b8715156040840152828103606084015261232f818789612262565b90508281036080840152612344818587611c8e565b9b9a5050505050505050505050565b813561235e81611aa0565b815490151560ff1660ff19919091161781556001808201602061238385820186611e78565b6001600160401b0381111561239a5761239a6113d1565b6123a8816120f98654611d08565b6000601f8211600181146123d657600083156123c45750838201355b6123ce8482611d8a565b875550610cfa565b600086815260209020601f19841690835b8281101561240457868501358255938701939089019087016123e7565b50848210156124215760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b60006020828403121561244557600080fd5b81516111ac81611c5c565b8060005b6002811015610485578151845260209384019390910190600101612454565b8481526001600160401b038416602082015260c081016124966040830185612450565b610bbf6080830184612450565b634e487b7160e01b600052603260045260246000fd5b60008083546124c781611d08565b600182811680156124df57600181146124f457612523565b60ff1984168752821515830287019450612523565b8760005260208060002060005b8581101561251a5781548a820152908401908201612501565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b60006001820161255f57634e487b7160e01b600052601160045260246000fd5b5060010190565b6001600160a01b038816815260a06020820181905260009061258a90830189611569565b6125976040840189612240565b82810360608401526125aa818789612262565b905082810360808401526125bf818587611c8e565b9a995050505050505050505056fea26469706673582212204061df7459599aa86d3584877f5e09e8113e7ad81d2a2d0eef48e49af34c1eac64736f6c634300080f0033"; type RevertingStringCloseChannelMarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Mars.sol/RevertingStringMars__factory.ts b/src/evm/contracts/factories/Mars.sol/RevertingStringMars__factory.ts index 9047b0da..e36b3a10 100644 --- a/src/evm/contracts/factories/Mars.sol/RevertingStringMars__factory.ts +++ b/src/evm/contracts/factories/Mars.sol/RevertingStringMars__factory.ts @@ -479,6 +479,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "view", }, @@ -891,7 +896,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b506040516200270f3803806200270f8339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61238c80620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461129c565b610459565b005b61017a610175366004611412565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461129c565b61052a565b3480156101c357600080fd5b506101d76101d2366004611492565b6105e6565b60405161018e9291906114f8565b3480156101f157600080fd5b50610205610200366004611599565b6106a2565b60405161018e91906116d2565b34801561021e57600080fd5b5061023261022d366004611778565b6106e7565b60405161018e9190611860565b34801561024b57600080fd5b5061025f61025a366004611492565b610774565b60405161018e969594939291906118b0565b34801561027d57600080fd5b5061016561028c366004611492565b6109d1565b34801561029d57600080fd5b5061017a6102ac366004611925565b610a33565b3480156102bd57600080fd5b506101656102cc36600461199b565b610ab6565b6101656102df3660046119cf565b610b27565b3480156102f057600080fd5b50610165610bf3565b34801561030557600080fd5b506101656103143660046119cf565b610c07565b34801561032557600080fd5b50610205610334366004611492565b610c89565b34801561034557600080fd5b50610165610354366004611ac6565b610d35565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611492565b610db8565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611b30565b610dd9565b34801561040557600080fd5b5061025f610414366004611492565b610e4c565b34801561042557600080fd5b50610165610434366004611b97565b610e5c565b34801561044557600080fd5b50610165610454366004611492565b610ed5565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611bdd565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611c11565b600154909150610520906001600160a01b031686838686610f00565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611c2e565b9060005260206000200154036105ae576005818154811061059a5761059a611c2e565b6000918252602082200155600191506105c0565b806105b881611c44565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611c6b565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611c6b565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db868484610fcf565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610727576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152601b60248201527f6f6e2072656376207061636b657420697320726576657274696e67000000000060448201526064015b60405180910390fd5b6004818154811061078457600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546107b790611c6b565b80601f01602080910402602001604051908101604052809291908181526020018280546107e390611c6b565b80156108305780601f1061080557610100808354040283529160200191610830565b820191906000526020600020905b81548152906001019060200180831161081357829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461086390611c6b565b80601f016020809104026020016040519081016040528092919081815260200182805461088f90611c6b565b80156108dc5780601f106108b1576101008083540402835291602001916108dc565b820191906000526020600020905b8154815290600101906020018083116108bf57829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b039092169261091390611c6b565b80601f016020809104026020016040519081016040528092919081815260200182805461093f90611c6b565b801561098c5780601f106109615761010080835404028352916020019161098c565b820191906000526020600020905b81548152906001019060200180831161096f57829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109d96110f5565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a1f57600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a6a908690899089908890600401611bdd565b6020604051808303816000875af1158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aad9190611c11565b95945050505050565b6001546001600160a01b03163314610ae1576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610b228282611f6a565b505050565b610b2f6110f5565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b6f908c908c908c908c908c908c908c908c90600401612199565b600060405180830381600087803b158015610b8957600080fd5b505af1158015610b9d573d6000803e3d6000fd5b50505050610be8818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a9150899050888861114f565b505050505050505050565b610bfb6110f5565b610c056000611204565b565b610c0f6110f5565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c4d908b908b908b908b908b908b908b908b90600401612199565b600060405180830381600087803b158015610c6757600080fd5b505af1158015610c7b573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c9957600080fd5b906000526020600020016000915090508054610cb490611c6b565b80601f0160208091040260200160405190810160405280929190818152602001828054610ce090611c6b565b8015610d2d5780601f10610d0257610100808354040283529160200191610d2d565b820191906000526020600020905b815481529060010190602001808311610d1057829003601f168201915b505050505081565b6001546001600160a01b03163314610d60576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152602360248201527f61636b6e6f776c656467656d656e74207061636b657420697320726576657274604482015262696e6760e81b606482015260840161076b565b5050565b60058181548110610dc857600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610e04576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820181905260248201527f636f6e6e65637420696263206368616e6e656c20697320726576657274696e67604482015260640161076b565b6002818154811061078457600080fd5b610e646110f5565b6001600160a01b038116610ec95760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b606482015260840161076b565b610ed281611204565b50565b6001546001600160a01b03163314610ed2576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610f40573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f6491906121f9565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f969493929190612239565b6000604051808303818588803b158015610faf57600080fd5b505af1158015610fc3573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156110d45760068181548110610ff157610ff1611c2e565b9060005260206000200160405160200161100b9190612269565b6040516020818303038152906040528051906020012084846040516020016110349291906122df565b60405160208183030381529060405280519060200120036110c257600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110ee9350505050565b806110cc81611c44565b915050610fd4565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610c055760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161076b565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561118f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b391906121f9565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016111eb97969594939291906122ef565b6000604051808303818588803b158015610c6757600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261126657600080fd5b5081356001600160401b0381111561127d57600080fd5b60208301915083602082850101111561129557600080fd5b9250929050565b600080600080606085870312156112b257600080fd5b8435935060208501356001600160401b038111156112cf57600080fd5b6112db87828801611254565b9598909750949560400135949350505050565b6001600160401b0381168114610ed257600080fd5b803561130e816112ee565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561134b5761134b611313565b60405290565b60405160c081016001600160401b038111828210171561134b5761134b611313565b604051601f8201601f191681016001600160401b038111828210171561139b5761139b611313565b604052919050565b600082601f8301126113b457600080fd5b604051604081018181106001600160401b03821117156113d6576113d6611313565b80604052508060408401858111156113ed57600080fd5b845b818110156114075780358352602092830192016113ef565b509195945050505050565b60008060008060008060e0878903121561142b57600080fd5b86356001600160401b0381111561144157600080fd5b61144d89828a01611254565b909750955050602087013593506040870135611468816112ee565b925061147788606089016113a3565b91506114868860a089016113a3565b90509295509295509295565b6000602082840312156114a457600080fd5b5035919050565b6000815180845260005b818110156114d1576020818501810151868301820152016114b5565b818111156114e3576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061151360408301846114ab565b949350505050565b80356003811061130e57600080fd5b600082601f83011261153b57600080fd5b81356001600160401b0381111561155457611554611313565b611567601f8201601f1916602001611373565b81815284602083860101111561157c57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156115b457600080fd5b6115bd8861151b565b965060208801356001600160401b03808211156115d957600080fd5b818a0191508a601f8301126115ed57600080fd5b8135818111156115ff576115ff611313565b8060051b61160f60208201611373565b9182526020818501810192908101908e84111561162b57600080fd5b6020860192505b8383101561166957848335111561164857600080fd5b6116588f6020853589010161152a565b825260209283019290910190611632565b9a5050505060408a0135965060608a013591508082111561168957600080fd5b6116958b838c0161152a565b955060808a0135945060a08a01359150808211156116b257600080fd5b506116bf8a828b01611254565b989b979a50959850939692959293505050565b6020815260006110ee60208301846114ab565b6000604082840312156116f757600080fd5b6116ff611329565b905081356001600160401b0381111561171757600080fd5b6117238482850161152a565b8252506020820135602082015292915050565b60006040828403121561174857600080fd5b611750611329565b9050813561175d816112ee565b8152602082013561176d816112ee565b602082015292915050565b60006020828403121561178a57600080fd5b81356001600160401b03808211156117a157600080fd5b9083019060e082860312156117b557600080fd5b6117bd611351565b8235828111156117cc57600080fd5b6117d8878286016116e5565b8252506020830135828111156117ed57600080fd5b6117f9878286016116e5565b60208301525061180b60408401611303565b604082015260608301358281111561182257600080fd5b61182e8782860161152a565b6060830152506118418660808501611736565b608082015261185260c08401611303565b60a082015295945050505050565b602081528151151560208201526000602083015160408084015261151360608401826114ab565b600081516040845261189c60408501826114ab565b602093840151949093019390935250919050565b60e0815260006118c360e0830189611887565b82810360208401526118d58189611887565b90506001600160401b03808816604085015283820360608501526118f982886114ab565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b6000806000806060858703121561193b57600080fd5b84356001600160401b0381111561195157600080fd5b61195d87828801611254565b909550935050602085013591506040850135611978816112ee565b939692955090935050565b600060e0828403121561199557600080fd5b50919050565b6000602082840312156119ad57600080fd5b81356001600160401b038111156119c357600080fd5b61151384828501611983565b60008060008060008060008060a0898b0312156119eb57600080fd5b88356001600160401b0380821115611a0257600080fd5b611a0e8c838d01611254565b909a509850889150611a2260208c0161151b565b975060408b013591508115158214611a3957600080fd5b90955060608a01359080821115611a4f57600080fd5b818b0191508b601f830112611a6357600080fd5b813581811115611a7257600080fd5b8c60208260051b8501011115611a8757600080fd5b6020830196508095505060808b0135915080821115611aa557600080fd5b50611ab28b828c01611254565b999c989b5096995094979396929594505050565b60008060408385031215611ad957600080fd5b82356001600160401b0380821115611af057600080fd5b611afc86838701611983565b93506020850135915080821115611b1257600080fd5b50830160408186031215611b2557600080fd5b809150509250929050565b60008060008060608587031215611b4657600080fd5b843593506020850135925060408501356001600160401b03811115611b6a57600080fd5b611b7687828801611254565b95989497509550505050565b6001600160a01b0381168114610ed257600080fd5b600060208284031215611ba957600080fd5b81356110ee81611b82565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611bf7606083018587611bb4565b90506001600160401b038316604083015295945050505050565b600060208284031215611c2357600080fd5b81516110ee816112ee565b634e487b7160e01b600052603260045260246000fd5b600060018201611c6457634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c7f57607f821691505b60208210810361199557634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112611cb557600080fd5b9190910192915050565b6000808335601e19843603018112611cd657600080fd5b8301803591506001600160401b03821115611cf057600080fd5b60200191503681900382131561129557600080fd5b601f821115610b2257600081815260208120601f850160051c81016020861015611d2c5750805b601f850160051c820191505b81811015611d4b57828155600101611d38565b505050505050565b600019600383901b1c191660019190911b1790565b611d728283611cbf565b6001600160401b03811115611d8957611d89611313565b611d9d81611d978554611c6b565b85611d05565b6000601f821160018114611dcb5760008315611db95750838201355b611dc38482611d53565b865550611e25565b600085815260209020601f19841690835b82811015611dfc5786850135825560209485019460019092019101611ddc565b5084821015611e195760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611e44816112ee565b92915050565b6001600160401b03831115611e6157611e61611313565b611e7583611e6f8354611c6b565b83611d05565b6000601f841160018114611ea35760008515611e915750838201355b611e9b8682611d53565b8455506105df565b600083815260209020601f19861690835b82811015611ed45786850135825560209485019460019092019101611eb4565b5086821015611ef15760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611f0e816112ee565b815467ffffffffffffffff19166001600160401b038216178255506020820135611f37816112ee565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611f748283611c9f565b611f7e8182611cbf565b6001600160401b03811115611f9557611f95611313565b611fa981611fa38654611c6b565b86611d05565b6000601f821160018114611fd75760008315611fc55750838201355b611fcf8482611d53565b875550612031565b600086815260209020601f19841690835b828110156120085786850135825560209485019460019092019101611fe8565b50848210156120255760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506120596120506020840184611c9f565b60028301611d68565b61208961206860408401611e37565b600483016001600160401b0382166001600160401b03198254161781555050565b6120966060830183611cbf565b6120a4818360058601611e4a565b50506120b66080830160068301611f03565b610db46120c560c08401611e37565b600783016001600160401b0382166001600160401b03198254161781555050565b6003811061210457634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b8781101561218c5782840389528135601e1988360301811261214357600080fd5b870185810190356001600160401b0381111561215e57600080fd5b80360382131561216d57600080fd5b612178868284611bb4565b9a87019a9550505090840190600101612122565b5091979650505050505050565b60a0815260006121ad60a083018a8c611bb4565b6121ba602084018a6120e6565b871515604084015282810360608401526121d5818789612108565b905082810360808401526121ea818587611bb4565b9b9a5050505050505050505050565b60006020828403121561220b57600080fd5b81516110ee81611b82565b8060005b600281101561048457815184526020938401939091019060010161221a565b8481526001600160401b038416602082015260c0810161225c6040830185612216565b610aad6080830184612216565b600080835461227781611c6b565b6001828116801561228f57600181146122a4576122d3565b60ff19841687528215158302870194506122d3565b8760005260208060002060005b858110156122ca5781548a8201529084019082016122b1565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a060208201819052600090612313908301896114ab565b61232060408401896120e6565b8281036060840152612333818789612108565b90508281036080840152612348818587611bb4565b9a995050505050505050505056fea2646970667358221220a0727aff413a0ca939a2e281db6ff5546225b3f861af155f5f8eea8527fc331a64736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b5060405162002726380380620027268339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6123a380620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b506101656101603660046112a0565b61045a565b005b61017a610175366004611416565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b23660046112a0565b61052b565b3480156101c357600080fd5b506101d76101d2366004611496565b6105e7565b60405161018e9291906114fc565b3480156101f157600080fd5b5061020561020036600461159d565b6106a3565b60405161018e91906116d6565b34801561021e57600080fd5b5061023261022d36600461177c565b6106e8565b60405161018e929190611864565b34801561024c57600080fd5b5061026061025b366004611496565b610778565b60405161018e969594939291906118c7565b34801561027e57600080fd5b5061016561028d366004611496565b6109d5565b34801561029e57600080fd5b5061017a6102ad36600461193c565b610a37565b3480156102be57600080fd5b506101656102cd3660046119b2565b610aba565b6101656102e03660046119e6565b610b2b565b3480156102f157600080fd5b50610165610bf7565b34801561030657600080fd5b506101656103153660046119e6565b610c0b565b34801561032657600080fd5b50610205610335366004611496565b610c8d565b34801561034657600080fd5b50610165610355366004611add565b610d39565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a7366004611496565b610dbc565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611b47565b610ddd565b34801561040657600080fd5b50610260610415366004611496565b610e50565b34801561042657600080fd5b50610165610435366004611bae565b610e60565b34801561044657600080fd5b50610165610455366004611496565b610ed9565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611bf4565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611c28565b600154909150610521906001600160a01b031686838686610f04565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611c45565b9060005260206000200154036105af576005818154811061059b5761059b611c45565b6000918252602082200155600191506105c1565b806105b981611c5b565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611c82565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611c82565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc868484610fd3565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b0316331461072b576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152601b60248201527f6f6e2072656376207061636b657420697320726576657274696e67000000000060448201526064015b60405180910390fd5b6004818154811061078857600080fd5b9060005260206000209060080201600091509050806000016040518060400160405290816000820180546107bb90611c82565b80601f01602080910402602001604051908101604052809291908181526020018280546107e790611c82565b80156108345780601f1061080957610100808354040283529160200191610834565b820191906000526020600020905b81548152906001019060200180831161081757829003601f168201915b50505050508152602001600182015481525050908060020160405180604001604052908160008201805461086790611c82565b80601f016020809104026020016040519081016040528092919081815260200182805461089390611c82565b80156108e05780601f106108b5576101008083540402835291602001916108e0565b820191906000526020600020905b8154815290600101906020018083116108c357829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b039092169261091790611c82565b80601f016020809104026020016040519081016040528092919081815260200182805461094390611c82565b80156109905780601f1061096557610100808354040283529160200191610990565b820191906000526020600020905b81548152906001019060200180831161097357829003601f168201915b50506040805180820190915260068601546001600160401b03808216835268010000000000000000909104811660208301526007909601549495909416925088915050565b6109dd6110f9565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610a2357600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610a6e908690899089908890600401611bf4565b6020604051808303816000875af1158015610a8d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ab19190611c28565b95945050505050565b6001546001600160a01b03163314610ae5576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610b268282611f81565b505050565b610b336110f9565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610b73908c908c908c908c908c908c908c908c906004016121b0565b600060405180830381600087803b158015610b8d57600080fd5b505af1158015610ba1573d6000803e3d6000fd5b50505050610bec818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a91508990508888611153565b505050505050505050565b610bff6110f9565b610c096000611208565b565b610c136110f9565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610c51908b908b908b908b908b908b908b908b906004016121b0565b600060405180830381600087803b158015610c6b57600080fd5b505af1158015610c7f573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610c9d57600080fd5b906000526020600020016000915090508054610cb890611c82565b80601f0160208091040260200160405190810160405280929190818152602001828054610ce490611c82565b8015610d315780601f10610d0657610100808354040283529160200191610d31565b820191906000526020600020905b815481529060010190602001808311610d1457829003601f168201915b505050505081565b6001546001600160a01b03163314610d64576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820152602360248201527f61636b6e6f776c656467656d656e74207061636b657420697320726576657274604482015262696e6760e81b606482015260840161076f565b5050565b60058181548110610dcc57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610e08576040516321bf7f4960e01b815260040160405180910390fd5b60405162461bcd60e51b815260206004820181905260248201527f636f6e6e65637420696263206368616e6e656c20697320726576657274696e67604482015260640161076f565b6002818154811061078857600080fd5b610e686110f9565b6001600160a01b038116610ecd5760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b606482015260840161076f565b610ed681611208565b50565b6001546001600160a01b03163314610ed6576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015610f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f689190612210565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b8152600401610f9a9493929190612250565b6000604051808303818588803b158015610fb357600080fd5b505af1158015610fc7573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156110d85760068181548110610ff557610ff5611c45565b9060005260206000200160405160200161100f9190612280565b6040516020818303038152906040528051906020012084846040516020016110389291906122f6565b60405160208183030381529060405280519060200120036110c657600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506110f29350505050565b806110d081611c5b565b915050610fd8565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610c095760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161076f565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611193573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111b79190612210565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016111ef9796959493929190612306565b6000604051808303818588803b158015610c6b57600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261126a57600080fd5b5081356001600160401b0381111561128157600080fd5b60208301915083602082850101111561129957600080fd5b9250929050565b600080600080606085870312156112b657600080fd5b8435935060208501356001600160401b038111156112d357600080fd5b6112df87828801611258565b9598909750949560400135949350505050565b6001600160401b0381168114610ed657600080fd5b8035611312816112f2565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561134f5761134f611317565b60405290565b60405160c081016001600160401b038111828210171561134f5761134f611317565b604051601f8201601f191681016001600160401b038111828210171561139f5761139f611317565b604052919050565b600082601f8301126113b857600080fd5b604051604081018181106001600160401b03821117156113da576113da611317565b80604052508060408401858111156113f157600080fd5b845b8181101561140b5780358352602092830192016113f3565b509195945050505050565b60008060008060008060e0878903121561142f57600080fd5b86356001600160401b0381111561144557600080fd5b61145189828a01611258565b90975095505060208701359350604087013561146c816112f2565b925061147b88606089016113a7565b915061148a8860a089016113a7565b90509295509295509295565b6000602082840312156114a857600080fd5b5035919050565b6000815180845260005b818110156114d5576020818501810151868301820152016114b9565b818111156114e7576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061151760408301846114af565b949350505050565b80356003811061131257600080fd5b600082601f83011261153f57600080fd5b81356001600160401b0381111561155857611558611317565b61156b601f8201601f1916602001611377565b81815284602083860101111561158057600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156115b857600080fd5b6115c18861151f565b965060208801356001600160401b03808211156115dd57600080fd5b818a0191508a601f8301126115f157600080fd5b81358181111561160357611603611317565b8060051b61161360208201611377565b9182526020818501810192908101908e84111561162f57600080fd5b6020860192505b8383101561166d57848335111561164c57600080fd5b61165c8f6020853589010161152e565b825260209283019290910190611636565b9a5050505060408a0135965060608a013591508082111561168d57600080fd5b6116998b838c0161152e565b955060808a0135945060a08a01359150808211156116b657600080fd5b506116c38a828b01611258565b989b979a50959850939692959293505050565b6020815260006110f260208301846114af565b6000604082840312156116fb57600080fd5b61170361132d565b905081356001600160401b0381111561171b57600080fd5b6117278482850161152e565b8252506020820135602082015292915050565b60006040828403121561174c57600080fd5b61175461132d565b90508135611761816112f2565b81526020820135611771816112f2565b602082015292915050565b60006020828403121561178e57600080fd5b81356001600160401b03808211156117a557600080fd5b9083019060e082860312156117b957600080fd5b6117c1611355565b8235828111156117d057600080fd5b6117dc878286016116e9565b8252506020830135828111156117f157600080fd5b6117fd878286016116e9565b60208301525061180f60408401611307565b604082015260608301358281111561182657600080fd5b6118328782860161152e565b606083015250611845866080850161173a565b608082015261185660c08401611307565b60a082015295945050505050565b60408152825115156040820152600060208401516040606084015261188c60808401826114af565b91505082151560208301529392505050565b60008151604084526118b360408501826114af565b602093840151949093019390935250919050565b60e0815260006118da60e083018961189e565b82810360208401526118ec818961189e565b90506001600160401b038088166040850152838203606085015261191082886114af565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b6000806000806060858703121561195257600080fd5b84356001600160401b0381111561196857600080fd5b61197487828801611258565b90955093505060208501359150604085013561198f816112f2565b939692955090935050565b600060e082840312156119ac57600080fd5b50919050565b6000602082840312156119c457600080fd5b81356001600160401b038111156119da57600080fd5b6115178482850161199a565b60008060008060008060008060a0898b031215611a0257600080fd5b88356001600160401b0380821115611a1957600080fd5b611a258c838d01611258565b909a509850889150611a3960208c0161151f565b975060408b013591508115158214611a5057600080fd5b90955060608a01359080821115611a6657600080fd5b818b0191508b601f830112611a7a57600080fd5b813581811115611a8957600080fd5b8c60208260051b8501011115611a9e57600080fd5b6020830196508095505060808b0135915080821115611abc57600080fd5b50611ac98b828c01611258565b999c989b5096995094979396929594505050565b60008060408385031215611af057600080fd5b82356001600160401b0380821115611b0757600080fd5b611b138683870161199a565b93506020850135915080821115611b2957600080fd5b50830160408186031215611b3c57600080fd5b809150509250929050565b60008060008060608587031215611b5d57600080fd5b843593506020850135925060408501356001600160401b03811115611b8157600080fd5b611b8d87828801611258565b95989497509550505050565b6001600160a01b0381168114610ed657600080fd5b600060208284031215611bc057600080fd5b81356110f281611b99565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611c0e606083018587611bcb565b90506001600160401b038316604083015295945050505050565b600060208284031215611c3a57600080fd5b81516110f2816112f2565b634e487b7160e01b600052603260045260246000fd5b600060018201611c7b57634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611c9657607f821691505b6020821081036119ac57634e487b7160e01b600052602260045260246000fd5b60008235603e19833603018112611ccc57600080fd5b9190910192915050565b6000808335601e19843603018112611ced57600080fd5b8301803591506001600160401b03821115611d0757600080fd5b60200191503681900382131561129957600080fd5b601f821115610b2657600081815260208120601f850160051c81016020861015611d435750805b601f850160051c820191505b81811015611d6257828155600101611d4f565b505050505050565b600019600383901b1c191660019190911b1790565b611d898283611cd6565b6001600160401b03811115611da057611da0611317565b611db481611dae8554611c82565b85611d1c565b6000601f821160018114611de25760008315611dd05750838201355b611dda8482611d6a565b865550611e3c565b600085815260209020601f19841690835b82811015611e135786850135825560209485019460019092019101611df3565b5084821015611e305760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611e5b816112f2565b92915050565b6001600160401b03831115611e7857611e78611317565b611e8c83611e868354611c82565b83611d1c565b6000601f841160018114611eba5760008515611ea85750838201355b611eb28682611d6a565b8455506105e0565b600083815260209020601f19861690835b82811015611eeb5786850135825560209485019460019092019101611ecb565b5086821015611f085760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b8135611f25816112f2565b815467ffffffffffffffff19166001600160401b038216178255506020820135611f4e816112f2565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b611f8b8283611cb6565b611f958182611cd6565b6001600160401b03811115611fac57611fac611317565b611fc081611fba8654611c82565b86611d1c565b6000601f821160018114611fee5760008315611fdc5750838201355b611fe68482611d6a565b875550612048565b600086815260209020601f19841690835b8281101561201f5786850135825560209485019460019092019101611fff565b508482101561203c5760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506120706120676020840184611cb6565b60028301611d7f565b6120a061207f60408401611e4e565b600483016001600160401b0382166001600160401b03198254161781555050565b6120ad6060830183611cd6565b6120bb818360058601611e61565b50506120cd6080830160068301611f1a565b610db86120dc60c08401611e4e565b600783016001600160401b0382166001600160401b03198254161781555050565b6003811061211b57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156121a35782840389528135601e1988360301811261215a57600080fd5b870185810190356001600160401b0381111561217557600080fd5b80360382131561218457600080fd5b61218f868284611bcb565b9a87019a9550505090840190600101612139565b5091979650505050505050565b60a0815260006121c460a083018a8c611bcb565b6121d1602084018a6120fd565b871515604084015282810360608401526121ec81878961211f565b90508281036080840152612201818587611bcb565b9b9a5050505050505050505050565b60006020828403121561222257600080fd5b81516110f281611b99565b8060005b6002811015610485578151845260209384019390910190600101612231565b8481526001600160401b038416602082015260c08101612273604083018561222d565b610ab1608083018461222d565b600080835461228e81611c82565b600182811680156122a657600181146122bb576122ea565b60ff19841687528215158302870194506122ea565b8760005260208060002060005b858110156122e15781548a8201529084019082016122c8565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a06020820181905260009061232a908301896114af565b61233760408401896120fd565b828103606084015261234a81878961211f565b9050828103608084015261235f818587611bcb565b9a995050505050505050505056fea264697066735822122043f201b5987ef8571482d99062da08afd0c8ae893a3f45dc6649fa7cc681bbf964736f6c634300080f0033"; type RevertingStringMarsConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/Moon__factory.ts b/src/evm/contracts/factories/Moon__factory.ts index 2f43b365..2fce39af 100644 --- a/src/evm/contracts/factories/Moon__factory.ts +++ b/src/evm/contracts/factories/Moon__factory.ts @@ -476,6 +476,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, @@ -888,7 +893,7 @@ const _abi = [ ] as const; const _bytecode = - "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620029aa380380620029aa8339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61262780620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038b578063cb7e9057146103b9578063e847e280146103d9578063f12b758a146103f9578063f2fde38b14610419578063fad28a241461043957600080fd5b8063715018a6146102e45780637a805598146102f95780637d622184146103195780637e1d42b5146103395780638da5cb5b1461035957600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb73911461023f578063558850ac146102715780635bfd12b814610291578063602f9834146102b157806361995001146102d157600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b50610165610160366004611396565b610459565b005b61017a610175366004611507565b61048a565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b2366004611396565b61052a565b3480156101c357600080fd5b506101d76101d2366004611587565b6105e6565b60405161018e9291906115ed565b3480156101f157600080fd5b5061020561020036600461168e565b6106a2565b60405161018e91906117c7565b34801561021e57600080fd5b5061023261022d36600461186d565b6106e7565b60405161018e9190611955565b34801561024b57600080fd5b5061025f61025a366004611587565b6108c2565b60405161018e969594939291906119a5565b34801561027d57600080fd5b5061016561028c366004611587565b610b1a565b34801561029d57600080fd5b5061017a6102ac366004611a1a565b610b7c565b3480156102bd57600080fd5b506101656102cc366004611a90565b610bff565b6101656102df366004611ad2565b610c70565b3480156102f057600080fd5b50610165610d3c565b34801561030557600080fd5b50610165610314366004611ad2565b610d50565b34801561032557600080fd5b50610205610334366004611587565b610dd2565b34801561034557600080fd5b50610165610354366004611bc4565b610e7e565b34801561036557600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039757600080fd5b506103ab6103a6366004611587565b610eea565b60405190815260200161018e565b3480156103c557600080fd5b50600154610373906001600160a01b031681565b3480156103e557600080fd5b506101656103f4366004611c2e565b610f0b565b34801561040557600080fd5b5061025f610414366004611587565b610f41565b34801561042557600080fd5b50610165610434366004611c95565b610f51565b34801561044557600080fd5b50610165610454366004611587565b610fcf565b6001546001600160a01b03163314610484576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c19088908b908b908a90600401611cdb565b6020604051808303816000875af11580156104e0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105049190611d0f565b600154909150610520906001600160a01b031686838686610ffa565b9695505050505050565b6001546001600160a01b03163314610555576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c057856005828154811061057757610577611d2c565b9060005260206000200154036105ae576005818154811061059a5761059a611d2c565b6000918252602082200155600191506105c0565b806105b881611d42565b915050610559565b50806105df57604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f657600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061061f90611d69565b80601f016020809104026020016040519081016040528092919081815260200182805461064b90611d69565b80156106985780601f1061066d57610100808354040283529160200191610698565b820191906000526020600020905b81548152906001019060200180831161067b57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d0576040516321bf7f4960e01b815260040160405180910390fd5b6106db8684846110c9565b98975050505050505050565b6040805180820190915260008152606060208201526001546001600160a01b03163314610727576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528251805184926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace019190829081906107729082611e00565b506020918201516001909101558201518051600283019081906107959082611e00565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b03909216919091179055606082015160058201906107de9082611e00565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff1992909216919091179091556040805180820182526001815290519091828101916108a891017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60405160208183030381529060405281525090505b919050565b600481815481106108d257600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461090590611d69565b80601f016020809104026020016040519081016040528092919081815260200182805461093190611d69565b801561097e5780601f106109535761010080835404028352916020019161097e565b820191906000526020600020905b81548152906001019060200180831161096157829003601f168201915b5050505050815260200160018201548152505090806002016040518060400160405290816000820180546109b190611d69565b80601f01602080910402602001604051908101604052809291908181526020018280546109dd90611d69565b8015610a2a5780601f106109ff57610100808354040283529160200191610a2a565b820191906000526020600020905b815481529060010190602001808311610a0d57829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a6190611d69565b80601f0160208091040260200160405190810160405280929190818152602001828054610a8d90611d69565b8015610ada5780601f10610aaf57610100808354040283529160200191610ada565b820191906000526020600020905b815481529060010190602001808311610abd57829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610b226111ef565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b6857600080fd5b505af11580156105df573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610bb3908690899089908890600401611cdb565b6020604051808303816000875af1158015610bd2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bf69190611d0f565b95945050505050565b6001546001600160a01b03163314610c2a576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c6b8282612121565b505050565b610c786111ef565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610cb8908c908c908c908c908c908c908c908c90600401612354565b600060405180830381600087803b158015610cd257600080fd5b505af1158015610ce6573d6000803e3d6000fd5b50505050610d31818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a91508990508888611249565b505050505050505050565b610d446111ef565b610d4e60006112fe565b565b610d586111ef565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d96908b908b908b908b908b908b908b908b90600401612354565b600060405180830381600087803b158015610db057600080fd5b505af1158015610dc4573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610de257600080fd5b906000526020600020016000915090508054610dfd90611d69565b80601f0160208091040260200160405190810160405280929190818152602001828054610e2990611d69565b8015610e765780601f10610e4b57610100808354040283529160200191610e76565b820191906000526020600020905b815481529060010190602001808311610e5957829003601f168201915b505050505081565b6001546001600160a01b03163314610ea9576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048482826123b4565b60058181548110610efa57600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610f36576040516321bf7f4960e01b815260040160405180910390fd5b6105df8483836110c9565b600281815481106108d257600080fd5b610f596111ef565b6001600160a01b038116610fc35760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610fcc816112fe565b50565b6001546001600160a01b03163314610fcc576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561103a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061105e9190612494565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b815260040161109094939291906124d4565b6000604051808303818588803b1580156110a957600080fd5b505af11580156110bd573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156111ce57600681815481106110eb576110eb611d2c565b906000526020600020016040516020016111059190612504565b60405160208183030381529060405280519060200120848460405160200161112e92919061257a565b60405160208183030381529060405280519060200120036111bc57600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111e89350505050565b806111c681611d42565b9150506110ce565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d4e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610fba565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611289573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112ad9190612494565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112e5979695949392919061258a565b6000604051808303818588803b158015610db057600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261136057600080fd5b5081356001600160401b0381111561137757600080fd5b60208301915083602082850101111561138f57600080fd5b9250929050565b600080600080606085870312156113ac57600080fd5b8435935060208501356001600160401b038111156113c957600080fd5b6113d58782880161134e565b9598909750949560400135949350505050565b6001600160401b0381168114610fcc57600080fd5b80356108bd816113e8565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561144057611440611408565b60405290565b60405160c081016001600160401b038111828210171561144057611440611408565b604051601f8201601f191681016001600160401b038111828210171561149057611490611408565b604052919050565b600082601f8301126114a957600080fd5b604051604081018181106001600160401b03821117156114cb576114cb611408565b80604052508060408401858111156114e257600080fd5b845b818110156114fc5780358352602092830192016114e4565b509195945050505050565b60008060008060008060e0878903121561152057600080fd5b86356001600160401b0381111561153657600080fd5b61154289828a0161134e565b90975095505060208701359350604087013561155d816113e8565b925061156c8860608901611498565b915061157b8860a08901611498565b90509295509295509295565b60006020828403121561159957600080fd5b5035919050565b6000815180845260005b818110156115c6576020818501810151868301820152016115aa565b818111156115d8576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061160860408301846115a0565b949350505050565b8035600381106108bd57600080fd5b600082601f83011261163057600080fd5b81356001600160401b0381111561164957611649611408565b61165c601f8201601f1916602001611468565b81815284602083860101111561167157600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156116a957600080fd5b6116b288611610565b965060208801356001600160401b03808211156116ce57600080fd5b818a0191508a601f8301126116e257600080fd5b8135818111156116f4576116f4611408565b8060051b61170460208201611468565b9182526020818501810192908101908e84111561172057600080fd5b6020860192505b8383101561175e57848335111561173d57600080fd5b61174d8f6020853589010161161f565b825260209283019290910190611727565b9a5050505060408a0135965060608a013591508082111561177e57600080fd5b61178a8b838c0161161f565b955060808a0135945060a08a01359150808211156117a757600080fd5b506117b48a828b0161134e565b989b979a50959850939692959293505050565b6020815260006111e860208301846115a0565b6000604082840312156117ec57600080fd5b6117f461141e565b905081356001600160401b0381111561180c57600080fd5b6118188482850161161f565b8252506020820135602082015292915050565b60006040828403121561183d57600080fd5b61184561141e565b90508135611852816113e8565b81526020820135611862816113e8565b602082015292915050565b60006020828403121561187f57600080fd5b81356001600160401b038082111561189657600080fd5b9083019060e082860312156118aa57600080fd5b6118b2611446565b8235828111156118c157600080fd5b6118cd878286016117da565b8252506020830135828111156118e257600080fd5b6118ee878286016117da565b602083015250611900604084016113fd565b604082015260608301358281111561191757600080fd5b6119238782860161161f565b606083015250611936866080850161182b565b608082015261194760c084016113fd565b60a082015295945050505050565b602081528151151560208201526000602083015160408084015261160860608401826115a0565b600081516040845261199160408501826115a0565b602093840151949093019390935250919050565b60e0815260006119b860e083018961197c565b82810360208401526119ca818961197c565b90506001600160401b03808816604085015283820360608501526119ee82886115a0565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b60008060008060608587031215611a3057600080fd5b84356001600160401b03811115611a4657600080fd5b611a528782880161134e565b909550935050602085013591506040850135611a6d816113e8565b939692955090935050565b600060e08284031215611a8a57600080fd5b50919050565b600060208284031215611aa257600080fd5b81356001600160401b03811115611ab857600080fd5b61160884828501611a78565b8015158114610fcc57600080fd5b60008060008060008060008060a0898b031215611aee57600080fd5b88356001600160401b0380821115611b0557600080fd5b611b118c838d0161134e565b909a509850889150611b2560208c01611610565b975060408b01359150611b3782611ac4565b90955060608a01359080821115611b4d57600080fd5b818b0191508b601f830112611b6157600080fd5b813581811115611b7057600080fd5b8c60208260051b8501011115611b8557600080fd5b6020830196508095505060808b0135915080821115611ba357600080fd5b50611bb08b828c0161134e565b999c989b5096995094979396929594505050565b60008060408385031215611bd757600080fd5b82356001600160401b0380821115611bee57600080fd5b611bfa86838701611a78565b93506020850135915080821115611c1057600080fd5b50830160408186031215611c2357600080fd5b809150509250929050565b60008060008060608587031215611c4457600080fd5b843593506020850135925060408501356001600160401b03811115611c6857600080fd5b611c748782880161134e565b95989497509550505050565b6001600160a01b0381168114610fcc57600080fd5b600060208284031215611ca757600080fd5b81356111e881611c80565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611cf5606083018587611cb2565b90506001600160401b038316604083015295945050505050565b600060208284031215611d2157600080fd5b81516111e8816113e8565b634e487b7160e01b600052603260045260246000fd5b600060018201611d6257634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611d7d57607f821691505b602082108103611a8a57634e487b7160e01b600052602260045260246000fd5b601f821115610c6b57600081815260208120601f850160051c81016020861015611dc45750805b601f850160051c820191505b81811015611de357828155600101611dd0565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611e1957611e19611408565b611e2d81611e278454611d69565b84611d9d565b602080601f831160018114611e5c5760008415611e4a5750858301515b611e548582611deb565b865550611de3565b600085815260208120601f198616915b82811015611e8b57888601518255948401946001909101908401611e6c565b5085821015611ea95787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611ecf57600080fd5b9190910192915050565b6000808335601e19843603018112611ef057600080fd5b8301803591506001600160401b03821115611f0a57600080fd5b60200191503681900382131561138f57600080fd5b611f298283611ed9565b6001600160401b03811115611f4057611f40611408565b611f5481611f4e8554611d69565b85611d9d565b6000601f821160018114611f825760008315611f705750838201355b611f7a8482611deb565b865550611fdc565b600085815260209020601f19841690835b82811015611fb35786850135825560209485019460019092019101611f93565b5084821015611fd05760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135611ffb816113e8565b92915050565b6001600160401b0383111561201857612018611408565b61202c836120268354611d69565b83611d9d565b6000601f84116001811461205a57600085156120485750838201355b6120528682611deb565b8455506105df565b600083815260209020601f19861690835b8281101561208b578685013582556020948501946001909201910161206b565b50868210156120a85760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b81356120c5816113e8565b815467ffffffffffffffff19166001600160401b0382161782555060208201356120ee816113e8565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b61212b8283611eb9565b6121358182611ed9565b6001600160401b0381111561214c5761214c611408565b6121608161215a8654611d69565b86611d9d565b6000601f82116001811461218e576000831561217c5750838201355b6121868482611deb565b8755506121e8565b600086815260209020601f19841690835b828110156121bf578685013582556020948501946001909201910161219f565b50848210156121dc5760001960f88660031b161c19848701351681555b505060018360011b0186555b5050505060208101356001830155506122106122076020840184611eb9565b60028301611f1f565b61224061221f60408401611fee565b600483016001600160401b0382166001600160401b03198254161781555050565b61224d6060830183611ed9565b61225b818360058601612001565b505061226d60808301600683016120ba565b61229d61227c60c08401611fee565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106122bf57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156123475782840389528135601e198836030181126122fe57600080fd5b870185810190356001600160401b0381111561231957600080fd5b80360382131561232857600080fd5b612333868284611cb2565b9a87019a95505050908401906001016122dd565b5091979650505050505050565b60a08152600061236860a083018a8c611cb2565b612375602084018a6122a1565b871515604084015282810360608401526123908187896122c3565b905082810360808401526123a5818587611cb2565b9b9a5050505050505050505050565b81356123bf81611ac4565b815490151560ff1660ff1991909116178155600180820160206123e485820186611ed9565b6001600160401b038111156123fb576123fb611408565b6124098161215a8654611d69565b6000601f82116001811461243757600083156124255750838201355b61242f8482611deb565b875550610d31565b600086815260209020601f19841690835b828110156124655786850135825593870193908901908701612448565b50848210156124825760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156124a657600080fd5b81516111e881611c80565b8060005b60028110156104845781518452602093840193909101906001016124b5565b8481526001600160401b038416602082015260c081016124f760408301856124b1565b610bf660808301846124b1565b600080835461251281611d69565b6001828116801561252a576001811461253f5761256e565b60ff198416875282151583028701945061256e565b8760005260208060002060005b858110156125655781548a82015290840190820161254c565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906125ae908301896115a0565b6125bb60408401896122a1565b82810360608401526125ce8187896122c3565b905082810360808401526125e3818587611cb2565b9a995050505050505050505056fea2646970667358221220bd8e8798dec6eda1b1549ccbe60cd907e635c8443bff1f43234f49f18c1bb3ed64736f6c634300080f0033"; + "0x600360c0818152620312e360ec1b60e0526080908152610140604052610100918252620322e360ec1b6101205260a09190915262000042906006906002620000f9565b503480156200005057600080fd5b50604051620029c8380380620029c88339810160408190526200007391620001d0565b80806200008033620000a9565b600180546001600160a01b0319166001600160a01b039290921691909117905550620003739050565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b82805482825590600052602060002090810192821562000144579160200282015b82811115620001445782518290620001339082620002a7565b50916020019190600101906200011a565b506200015292915062000156565b5090565b80821115620001525760006200016d828262000177565b5060010162000156565b508054620001859062000218565b6000825580601f1062000196575050565b601f016020900490600052602060002090810190620001b69190620001b9565b50565b5b80821115620001525760008155600101620001ba565b600060208284031215620001e357600080fd5b81516001600160a01b0381168114620001fb57600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200022d57607f821691505b6020821081036200024e57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620002a257600081815260208120601f850160051c810160208610156200027d5750805b601f850160051c820191505b818110156200029e5782815560010162000289565b5050505b505050565b81516001600160401b03811115620002c357620002c362000202565b620002db81620002d4845462000218565b8462000254565b602080601f831160018114620003135760008415620002fa5750858301515b600019600386901b1c1916600185901b1785556200029e565b600085815260208120601f198616915b82811015620003445788860151825594840194600190910190840162000323565b5085821015620003635787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b61264580620003836000396000f3fe6080604052600436106101395760003560e01c8063715018a6116100ab578063bb3f9f8d1161006f578063bb3f9f8d1461038c578063cb7e9057146103ba578063e847e280146103da578063f12b758a146103fa578063f2fde38b1461041a578063fad28a241461043a57600080fd5b8063715018a6146102e55780637a805598146102fa5780637d6221841461031a5780637e1d42b51461033a5780638da5cb5b1461035a57600080fd5b80634dcc0aa6116100fd5780634dcc0aa6146102125780634eeb739114610240578063558850ac146102725780635bfd12b814610292578063602f9834146102b257806361995001146102d257600080fd5b80631eb7dd5e146101455780633513a995146101675780633f9fdbe4146101975780634252ae9b146101b75780634bdb5597146101e557600080fd5b3661014057005b600080fd5b34801561015157600080fd5b5061016561016036600461139c565b61045a565b005b61017a610175366004611512565b61048b565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101a357600080fd5b506101656101b236600461139c565b61052b565b3480156101c357600080fd5b506101d76101d2366004611592565b6105e7565b60405161018e9291906115f8565b3480156101f157600080fd5b50610205610200366004611699565b6106a3565b60405161018e91906117d2565b34801561021e57600080fd5b5061023261022d366004611878565b6106e8565b60405161018e929190611960565b34801561024c57600080fd5b5061026061025b366004611592565b6108c8565b60405161018e969594939291906119c3565b34801561027e57600080fd5b5061016561028d366004611592565b610b20565b34801561029e57600080fd5b5061017a6102ad366004611a38565b610b82565b3480156102be57600080fd5b506101656102cd366004611aae565b610c05565b6101656102e0366004611af0565b610c76565b3480156102f157600080fd5b50610165610d42565b34801561030657600080fd5b50610165610315366004611af0565b610d56565b34801561032657600080fd5b50610205610335366004611592565b610dd8565b34801561034657600080fd5b50610165610355366004611be2565b610e84565b34801561036657600080fd5b506000546001600160a01b03165b6040516001600160a01b03909116815260200161018e565b34801561039857600080fd5b506103ac6103a7366004611592565b610ef0565b60405190815260200161018e565b3480156103c657600080fd5b50600154610374906001600160a01b031681565b3480156103e657600080fd5b506101656103f5366004611c4c565b610f11565b34801561040657600080fd5b50610260610415366004611592565b610f47565b34801561042657600080fd5b50610165610435366004611cb3565b610f57565b34801561044657600080fd5b50610165610455366004611592565b610fd5565b6001546001600160a01b03163314610485576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c906104c29088908b908b908a90600401611cf9565b6020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190611d2d565b600154909150610521906001600160a01b031686838686611000565b9695505050505050565b6001546001600160a01b03163314610556576040516321bf7f4960e01b815260040160405180910390fd5b6000805b6005548110156105c157856005828154811061057857610578611d4a565b9060005260206000200154036105af576005818154811061059b5761059b611d4a565b6000918252602082200155600191506105c1565b806105b981611d60565b91505061055a565b50806105e057604051630781f76560e21b815260040160405180910390fd5b5050505050565b600381815481106105f757600080fd5b60009182526020909120600290910201805460018201805460ff90921693509061062090611d87565b80601f016020809104026020016040519081016040528092919081815260200182805461064c90611d87565b80156106995780601f1061066e57610100808354040283529160200191610699565b820191906000526020600020905b81548152906001019060200180831161067c57829003601f168201915b5050505050905082565b6001546060906001600160a01b031633146106d1576040516321bf7f4960e01b815260040160405180910390fd5b6106dc8684846110cf565b98975050505050505050565b6040805180820190915260008152606060208201526001546000906001600160a01b0316331461072b576040516321bf7f4960e01b815260040160405180910390fd5b600280546001810182556000919091528351805185926008027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace019190829081906107769082611e1e565b506020918201516001909101558201518051600283019081906107999082611e1e565b5060209190910151600190910155604082015160048201805467ffffffffffffffff19166001600160401b03909216919091179055606082015160058201906107e29082611e1e565b50608082015180516006830180546020938401516001600160401b03908116600160401b026fffffffffffffffffffffffffffffffff199092169381169390931717905560a090930151600790920180549290931667ffffffffffffffff1992909216919091179091556040805180820182526001815290519091828101916108ac91017f7b20226163636f756e74223a20226163636f756e74222c20227265706c79223a8152732022676f7420746865206d65737361676522207d60601b602082015260340190565b60408051601f1981840301815291905290529360009350915050565b600481815481106108d857600080fd5b90600052602060002090600802016000915090508060000160405180604001604052908160008201805461090b90611d87565b80601f016020809104026020016040519081016040528092919081815260200182805461093790611d87565b80156109845780601f1061095957610100808354040283529160200191610984565b820191906000526020600020905b81548152906001019060200180831161096757829003601f168201915b5050505050815260200160018201548152505090806002016040518060400160405290816000820180546109b790611d87565b80601f01602080910402602001604051908101604052809291908181526020018280546109e390611d87565b8015610a305780601f10610a0557610100808354040283529160200191610a30565b820191906000526020600020905b815481529060010190602001808311610a1357829003601f168201915b505050918352505060019190910154602090910152600482015460058301805492936001600160401b0390921692610a6790611d87565b80601f0160208091040260200160405190810160405280929190818152602001828054610a9390611d87565b8015610ae05780601f10610ab557610100808354040283529160200191610ae0565b820191906000526020600020905b815481529060010190602001808311610ac357829003601f168201915b50506040805180820190915260068601546001600160401b038082168352600160401b909104811660208301526007909601549495909416925088915050565b610b286111f5565b6001546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b158015610b6e57600080fd5b505af11580156105e0573d6000803e3d6000fd5b6001546040516330f8455760e21b81526000916001600160a01b03169063c3e1155c90610bb9908690899089908890600401611cf9565b6020604051808303816000875af1158015610bd8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bfc9190611d2d565b95945050505050565b6001546001600160a01b03163314610c30576040516321bf7f4960e01b815260040160405180910390fd5b6004805460018101825560009190915281906008027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01610c71828261213f565b505050565b610c7e6111f5565b60015460405163418925b760e01b81526001600160a01b0390911690819063418925b790610cbe908c908c908c908c908c908c908c908c90600401612372565b600060405180830381600087803b158015610cd857600080fd5b505af1158015610cec573d6000803e3d6000fd5b50505050610d37818a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152508c92508a9150899050888861124f565b505050505050505050565b610d4a6111f5565b610d546000611304565b565b610d5e6111f5565b60015460405163418925b760e01b81526001600160a01b039091169063418925b790610d9c908b908b908b908b908b908b908b908b90600401612372565b600060405180830381600087803b158015610db657600080fd5b505af1158015610dca573d6000803e3d6000fd5b505050505050505050505050565b60068181548110610de857600080fd5b906000526020600020016000915090508054610e0390611d87565b80601f0160208091040260200160405190810160405280929190818152602001828054610e2f90611d87565b8015610e7c5780601f10610e5157610100808354040283529160200191610e7c565b820191906000526020600020905b815481529060010190602001808311610e5f57829003601f168201915b505050505081565b6001546001600160a01b03163314610eaf576040516321bf7f4960e01b815260040160405180910390fd5b6003805460018101825560009190915281906002027fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b0161048582826123d2565b60058181548110610f0057600080fd5b600091825260209091200154905081565b6001546001600160a01b03163314610f3c576040516321bf7f4960e01b815260040160405180910390fd5b6105e08483836110cf565b600281815481106108d857600080fd5b610f5f6111f5565b6001600160a01b038116610fc95760405162461bcd60e51b815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b60648201526084015b60405180910390fd5b610fd281611304565b50565b6001546001600160a01b03163314610fd2576040516321bf7f4960e01b815260040160405180910390fd5b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611040573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061106491906124b2565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b815260040161109694939291906124f2565b6000604051808303818588803b1580156110af57600080fd5b505af11580156110c3573d6000803e3d6000fd5b50505050505050505050565b606060005b6006548110156111d457600681815481106110f1576110f1611d4a565b9060005260206000200160405160200161110b9190612522565b604051602081830303815290604052805190602001208484604051602001611134929190612598565b60405160208183030381529060405280519060200120036111c257600580546001810182556000919091527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db001859055604080516020601f86018190048102820181019092528481529085908590819084018382808284376000920191909152509294506111ee9350505050565b806111cc81611d60565b9150506110d4565b5060405163b01318a560e01b815260040160405180910390fd5b9392505050565b6000546001600160a01b03163314610d545760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610fc0565b866001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af115801561128f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112b391906124b2565b6001600160a01b031663fce34e4034308989898989896040518963ffffffff1660e01b81526004016112eb97969594939291906125a8565b6000604051808303818588803b158015610db657600080fd5b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b60008083601f84011261136657600080fd5b5081356001600160401b0381111561137d57600080fd5b60208301915083602082850101111561139557600080fd5b9250929050565b600080600080606085870312156113b257600080fd5b8435935060208501356001600160401b038111156113cf57600080fd5b6113db87828801611354565b9598909750949560400135949350505050565b6001600160401b0381168114610fd257600080fd5b803561140e816113ee565b919050565b634e487b7160e01b600052604160045260246000fd5b604080519081016001600160401b038111828210171561144b5761144b611413565b60405290565b60405160c081016001600160401b038111828210171561144b5761144b611413565b604051601f8201601f191681016001600160401b038111828210171561149b5761149b611413565b604052919050565b600082601f8301126114b457600080fd5b604051604081018181106001600160401b03821117156114d6576114d6611413565b80604052508060408401858111156114ed57600080fd5b845b818110156115075780358352602092830192016114ef565b509195945050505050565b60008060008060008060e0878903121561152b57600080fd5b86356001600160401b0381111561154157600080fd5b61154d89828a01611354565b909750955050602087013593506040870135611568816113ee565b925061157788606089016114a3565b91506115868860a089016114a3565b90509295509295509295565b6000602082840312156115a457600080fd5b5035919050565b6000815180845260005b818110156115d1576020818501810151868301820152016115b5565b818111156115e3576000602083870101525b50601f01601f19169290920160200192915050565b821515815260406020820152600061161360408301846115ab565b949350505050565b80356003811061140e57600080fd5b600082601f83011261163b57600080fd5b81356001600160401b0381111561165457611654611413565b611667601f8201601f1916602001611473565b81815284602083860101111561167c57600080fd5b816020850160208301376000918101602001919091529392505050565b600080600080600080600060c0888a0312156116b457600080fd5b6116bd8861161b565b965060208801356001600160401b03808211156116d957600080fd5b818a0191508a601f8301126116ed57600080fd5b8135818111156116ff576116ff611413565b8060051b61170f60208201611473565b9182526020818501810192908101908e84111561172b57600080fd5b6020860192505b8383101561176957848335111561174857600080fd5b6117588f6020853589010161162a565b825260209283019290910190611732565b9a5050505060408a0135965060608a013591508082111561178957600080fd5b6117958b838c0161162a565b955060808a0135945060a08a01359150808211156117b257600080fd5b506117bf8a828b01611354565b989b979a50959850939692959293505050565b6020815260006111ee60208301846115ab565b6000604082840312156117f757600080fd5b6117ff611429565b905081356001600160401b0381111561181757600080fd5b6118238482850161162a565b8252506020820135602082015292915050565b60006040828403121561184857600080fd5b611850611429565b9050813561185d816113ee565b8152602082013561186d816113ee565b602082015292915050565b60006020828403121561188a57600080fd5b81356001600160401b03808211156118a157600080fd5b9083019060e082860312156118b557600080fd5b6118bd611451565b8235828111156118cc57600080fd5b6118d8878286016117e5565b8252506020830135828111156118ed57600080fd5b6118f9878286016117e5565b60208301525061190b60408401611403565b604082015260608301358281111561192257600080fd5b61192e8782860161162a565b6060830152506119418660808501611836565b608082015261195260c08401611403565b60a082015295945050505050565b60408152825115156040820152600060208401516040606084015261198860808401826115ab565b91505082151560208301529392505050565b60008151604084526119af60408501826115ab565b602093840151949093019390935250919050565b60e0815260006119d660e083018961199a565b82810360208401526119e8818961199a565b90506001600160401b0380881660408501528382036060850152611a0c82886115ab565b92508086511660808501528060208701511660a085015280851660c08501525050979650505050505050565b60008060008060608587031215611a4e57600080fd5b84356001600160401b03811115611a6457600080fd5b611a7087828801611354565b909550935050602085013591506040850135611a8b816113ee565b939692955090935050565b600060e08284031215611aa857600080fd5b50919050565b600060208284031215611ac057600080fd5b81356001600160401b03811115611ad657600080fd5b61161384828501611a96565b8015158114610fd257600080fd5b60008060008060008060008060a0898b031215611b0c57600080fd5b88356001600160401b0380821115611b2357600080fd5b611b2f8c838d01611354565b909a509850889150611b4360208c0161161b565b975060408b01359150611b5582611ae2565b90955060608a01359080821115611b6b57600080fd5b818b0191508b601f830112611b7f57600080fd5b813581811115611b8e57600080fd5b8c60208260051b8501011115611ba357600080fd5b6020830196508095505060808b0135915080821115611bc157600080fd5b50611bce8b828c01611354565b999c989b5096995094979396929594505050565b60008060408385031215611bf557600080fd5b82356001600160401b0380821115611c0c57600080fd5b611c1886838701611a96565b93506020850135915080821115611c2e57600080fd5b50830160408186031215611c4157600080fd5b809150509250929050565b60008060008060608587031215611c6257600080fd5b843593506020850135925060408501356001600160401b03811115611c8657600080fd5b611c9287828801611354565b95989497509550505050565b6001600160a01b0381168114610fd257600080fd5b600060208284031215611cc557600080fd5b81356111ee81611c9e565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b848152606060208201526000611d13606083018587611cd0565b90506001600160401b038316604083015295945050505050565b600060208284031215611d3f57600080fd5b81516111ee816113ee565b634e487b7160e01b600052603260045260246000fd5b600060018201611d8057634e487b7160e01b600052601160045260246000fd5b5060010190565b600181811c90821680611d9b57607f821691505b602082108103611aa857634e487b7160e01b600052602260045260246000fd5b601f821115610c7157600081815260208120601f850160051c81016020861015611de25750805b601f850160051c820191505b81811015611e0157828155600101611dee565b505050505050565b600019600383901b1c191660019190911b1790565b81516001600160401b03811115611e3757611e37611413565b611e4b81611e458454611d87565b84611dbb565b602080601f831160018114611e7a5760008415611e685750858301515b611e728582611e09565b865550611e01565b600085815260208120601f198616915b82811015611ea957888601518255948401946001909101908401611e8a565b5085821015611ec75787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b60008235603e19833603018112611eed57600080fd5b9190910192915050565b6000808335601e19843603018112611f0e57600080fd5b8301803591506001600160401b03821115611f2857600080fd5b60200191503681900382131561139557600080fd5b611f478283611ef7565b6001600160401b03811115611f5e57611f5e611413565b611f7281611f6c8554611d87565b85611dbb565b6000601f821160018114611fa05760008315611f8e5750838201355b611f988482611e09565b865550611ffa565b600085815260209020601f19841690835b82811015611fd15786850135825560209485019460019092019101611fb1565b5084821015611fee5760001960f88660031b161c19848701351681555b505060018360011b0185555b50505050602082013560018201555050565b60008135612019816113ee565b92915050565b6001600160401b0383111561203657612036611413565b61204a836120448354611d87565b83611dbb565b6000601f84116001811461207857600085156120665750838201355b6120708682611e09565b8455506105e0565b600083815260209020601f19861690835b828110156120a95786850135825560209485019460019092019101612089565b50868210156120c65760001960f88860031b161c19848701351681555b505060018560011b0183555050505050565b81356120e3816113ee565b815467ffffffffffffffff19166001600160401b03821617825550602082013561210c816113ee565b81546fffffffffffffffff0000000000000000191660409190911b6fffffffffffffffff00000000000000001617905550565b6121498283611ed7565b6121538182611ef7565b6001600160401b0381111561216a5761216a611413565b61217e816121788654611d87565b86611dbb565b6000601f8211600181146121ac576000831561219a5750838201355b6121a48482611e09565b875550612206565b600086815260209020601f19841690835b828110156121dd57868501358255602094850194600190920191016121bd565b50848210156121fa5760001960f88660031b161c19848701351681555b505060018360011b0186555b50505050602081013560018301555061222e6122256020840184611ed7565b60028301611f3d565b61225e61223d6040840161200c565b600483016001600160401b0382166001600160401b03198254161781555050565b61226b6060830183611ef7565b61227981836005860161201f565b505061228b60808301600683016120d8565b6122bb61229a60c0840161200c565b600783016001600160401b0382166001600160401b03198254161781555050565b5050565b600381106122dd57634e487b7160e01b600052602160045260246000fd5b9052565b81835260006020808501808196508560051b810191508460005b878110156123655782840389528135601e1988360301811261231c57600080fd5b870185810190356001600160401b0381111561233757600080fd5b80360382131561234657600080fd5b612351868284611cd0565b9a87019a95505050908401906001016122fb565b5091979650505050505050565b60a08152600061238660a083018a8c611cd0565b612393602084018a6122bf565b871515604084015282810360608401526123ae8187896122e1565b905082810360808401526123c3818587611cd0565b9b9a5050505050505050505050565b81356123dd81611ae2565b815490151560ff1660ff19919091161781556001808201602061240285820186611ef7565b6001600160401b0381111561241957612419611413565b612427816121788654611d87565b6000601f82116001811461245557600083156124435750838201355b61244d8482611e09565b875550610d37565b600086815260209020601f19841690835b828110156124835786850135825593870193908901908701612466565b50848210156124a05760001960f88660031b161c19848701351681555b50505050841b90930190915550505050565b6000602082840312156124c457600080fd5b81516111ee81611c9e565b8060005b60028110156104855781518452602093840193909101906001016124d3565b8481526001600160401b038416602082015260c0810161251560408301856124cf565b610bfc60808301846124cf565b600080835461253081611d87565b60018281168015612548576001811461255d5761258c565b60ff198416875282151583028701945061258c565b8760005260208060002060005b858110156125835781548a82015290840190820161256a565b50505082870194505b50929695505050505050565b8183823760009101908152919050565b6001600160a01b038816815260a0602082018190526000906125cc908301896115ab565b6125d960408401896122bf565b82810360608401526125ec8187896122e1565b90508281036080840152612601818587611cd0565b9a995050505050505050505056fea264697066735822122058c743a9823643f8acb98a6599310039ee422f74fb658e4b09a589547224a9e664736f6c634300080f0033"; type MoonConstructorParams = | [signer?: Signer] diff --git a/src/evm/contracts/factories/UniversalChannelHandler__factory.ts b/src/evm/contracts/factories/UniversalChannelHandler__factory.ts index 70c61306..361c7740 100644 --- a/src/evm/contracts/factories/UniversalChannelHandler__factory.ts +++ b/src/evm/contracts/factories/UniversalChannelHandler__factory.ts @@ -416,6 +416,11 @@ const _abi = [ }, ], }, + { + name: "skipAck", + type: "bool", + internalType: "bool", + }, ], stateMutability: "nonpayable", }, @@ -857,7 +862,7 @@ const _abi = [ ] as const; const _bytecode = - "0x60a0604052306080523480156200001557600080fd5b506200002062000030565b6200002a62000030565b620000f1565b600054610100900460ff16156200009d5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811614620000ef576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b60805161266562000129600039600081816105ff0152818161064801528181610a8e01528181610ace0152610b6101526126656000f3fe60806040526004361061016a5760003560e01c806379ba5097116100d1578063c4d66de81161008a578063e847e28011610064578063e847e28014610407578063f2fde38b14610427578063fad28a2414610447578063ffa1ad741461046757600080fd5b8063c4d66de8146103a9578063cb7e9057146103c9578063e30c3978146103e957600080fd5b806379ba5097146102ed5780637e1d42b5146103025780638da5cb5b14610322578063ace02de714610354578063ba22bd7614610374578063c1cb44e51461039457600080fd5b80634c2ee09d116101235780634c2ee09d146102355780634dcc0aa6146102555780634f1ef2861461028257806352d1902d14610295578063602f9834146102b8578063715018a6146102d857600080fd5b80631eb7dd5e146101765780631f3a5830146101985780633659cfe6146101d55780633f9fdbe414610176578063462fdf83146101f55780634bdb55971461020857600080fd5b3661017157005b600080fd5b34801561018257600080fd5b50610196610191366004611945565b610496565b005b3480156101a457600080fd5b506101b86101b33660046119ac565b6104c7565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101e157600080fd5b506101966101f0366004611a2b565b6105f5565b6101b8610203366004611a59565b6106dd565b34801561021457600080fd5b50610228610223366004611bbf565b61086f565b6040516101cc9190611d50565b34801561024157600080fd5b50610196610250366004611d63565b6108b4565b34801561026157600080fd5b50610275610270366004611d94565b61091d565b6040516101cc9190611dc8565b610196610290366004611def565b610a84565b3480156102a157600080fd5b506102aa610b54565b6040519081526020016101cc565b3480156102c457600080fd5b506101966102d3366004611d94565b610c07565b3480156102e457600080fd5b50610196610d3c565b3480156102f957600080fd5b50610196610d50565b34801561030e57600080fd5b5061019661031d366004611e52565b610dc7565b34801561032e57600080fd5b506033546001600160a01b03165b6040516001600160a01b0390911681526020016101cc565b34801561036057600080fd5b5061019661036f366004611eca565b610eff565b34801561038057600080fd5b5061019661038f366004611a2b565b610f81565b3480156103a057600080fd5b506102aa600181565b3480156103b557600080fd5b506101966103c4366004611a2b565b610fab565b3480156103d557600080fd5b5060975461033c906001600160a01b031681565b3480156103f557600080fd5b506065546001600160a01b031661033c565b34801561041357600080fd5b50610196610422366004611fbc565b6110bd565b34801561043357600080fd5b50610196610442366004611a2b565b6110f3565b34801561045357600080fd5b50610196610462366004611d63565b611164565b34801561047357600080fd5b50610228604051806040016040528060038152602001620312e360ec1b81525081565b6097546001600160a01b031633146104c1576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b60008061053760405180608001604052806104e8336001600160a01b031690565b81526020016001815260200188815260200187878080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505091525061118f565b60408051338152602081018990529192507f9831d8c66285bfd33de069ced58ad437d6bf08f63446bf06c3713e40b4b7e873910160405180910390a16097546040516330f8455760e21b81526001600160a01b039091169063c3e1155c906105a7908a908590889060040161200e565b6020604051808303816000875af11580156105c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105ea9190612040565b979650505050505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036106465760405162461bcd60e51b815260040161063d9061205d565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661068f6000805160206125e9833981519152546001600160a01b031690565b6001600160a01b0316146106b55760405162461bcd60e51b815260040161063d906120a9565b6106be816111cb565b604080516000808252602082019092526106da918391906111d3565b50565b60975460408051608081019091526000916001600160a01b031690829061074f9080338152602001600181526020018b81526020018a8a8080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250505091525061118f565b60408051338152602081018c90529192507f9831d8c66285bfd33de069ced58ad437d6bf08f63446bf06c3713e40b4b7e873910160405180910390a16040516330f8455760e21b81526001600160a01b0383169063c3e1155c906107bb908d9085908b9060040161200e565b6020604051808303816000875af11580156107da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107fe9190612040565b609754604080518082018252929550610862926001600160a01b03909216918d918791908a9060029083908390808284376000920191909152505060408051808201825291508a906002908390839080828437600092019190915250611343915050565b5050979650505050505050565b6097546060906001600160a01b0316331461089d576040516321bf7f4960e01b815260040160405180910390fd5b6108a8868484611412565b98975050505050505050565b6108bc6114dc565b6097546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b15801561090257600080fd5b505af1158015610916573d6000803e3d6000fd5b5050505050565b6040805180820190915260008152606060208201526097546001600160a01b0316331461095d576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d61098660608601866120f5565b6040518363ffffffff1660e01b81526004016109a3929190612164565b600060405180830381865af41580156109c0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109e891908101906121bd565b90506109f78160400151611536565b6001600160a01b0316635b761585610a12602086018661225f565b60200135836040518363ffffffff1660e01b8152600401610a349291906122b2565b6000604051808303816000875af1158015610a53573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a7b91908101906122cb565b9150505b919050565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610acc5760405162461bcd60e51b815260040161063d9061205d565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b156000805160206125e9833981519152546001600160a01b031690565b6001600160a01b031614610b3b5760405162461bcd60e51b815260040161063d906120a9565b610b44826111cb565b610b50828260016111d3565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610bf45760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c0000000000000000606482015260840161063d565b506000805160206125e983398151915290565b6097546001600160a01b03163314610c32576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d610c5b60608501856120f5565b6040518363ffffffff1660e01b8152600401610c78929190612164565b600060405180830381865af4158015610c95573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610cbd91908101906121bd565b9050610ccc8160000151611536565b6001600160a01b031663400d9f5d610ce4848061225f565b60200135836040518363ffffffff1660e01b8152600401610d069291906122b2565b600060405180830381600087803b158015610d2057600080fd5b505af1158015610d34573d6000803e3d6000fd5b505050505050565b610d446114dc565b610d4e6000611547565b565b60655433906001600160a01b03168114610dbe5760405162461bcd60e51b815260206004820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b606482015260840161063d565b6106da81611547565b6097546001600160a01b03163314610df2576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d610e1b60608601866120f5565b6040518363ffffffff1660e01b8152600401610e38929190612164565b600060405180830381865af4158015610e55573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e7d91908101906121bd565b9050610e8c8160000151611536565b6001600160a01b031663588152ca610ea4858061225f565b6020013583856040518463ffffffff1660e01b8152600401610ec8939291906123a5565b600060405180830381600087803b158015610ee257600080fd5b505af1158015610ef6573d6000803e3d6000fd5b50505050505050565b610f076114dc565b60975460405163418925b760e01b81526001600160a01b039091169063418925b790610f45908b908b908b908b908b908b908b908b906004016123f7565b600060405180830381600087803b158015610f5f57600080fd5b505af1158015610f73573d6000803e3d6000fd5b505050505050505050505050565b610f896114dc565b609780546001600160a01b0319166001600160a01b0392909216919091179055565b600054610100900460ff1615808015610fcb5750600054600160ff909116105b80610fe55750303b158015610fe5575060005460ff166001145b6110485760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161063d565b6000805460ff19166001179055801561106b576000805461ff0019166101001790555b61107482611560565b8015610b50576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b6097546001600160a01b031633146110e8576040516321bf7f4960e01b815260040160405180910390fd5b610916848383611412565b6110fb6114dc565b606580546001600160a01b0383166001600160a01b0319909116811790915561112c6033546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b6097546001600160a01b031633146106da576040516321bf7f4960e01b815260040160405180910390fd5b8051602080830151604080850151606086810151925190956111b59590949391016124b5565b6040516020818303038152906040529050919050565b6106da6114dc565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff161561120b576112068361158f565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa925050508015611265575060408051601f3d908101601f19168201909252611262918101906124e9565b60015b6112c85760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161063d565b6000805160206125e983398151915281146113375760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161063d565b5061120683838361162b565b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611383573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113a79190612502565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b81526004016113d99493929190612542565b6000604051808303818588803b1580156113f257600080fd5b505af1158015611406573d6000803e3d6000fd5b50505050505050505050565b6060604051806040016040528060038152602001620312e360ec1b815250604051602001611440919061257b565b60405160208183030381529060405280519060200120838360405160200161146992919061258d565b604051602081830303815290604052805190602001201461149d5760405163b01318a560e01b815260040160405180910390fd5b82828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092979650505050505050565b6033546001600160a01b03163314610d4e5760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161063d565b600061154182611650565b92915050565b606580546001600160a01b03191690556106da816116bd565b600054610100900460ff166115875760405162461bcd60e51b815260040161063d9061259d565b610f8961170f565b6001600160a01b0381163b6115fc5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161063d565b6000805160206125e983398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6116348361173e565b6000825111806116415750805b15611206576104c1838361177e565b60006001600160a01b038211156116b95760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663630206269747360c81b606482015260840161063d565b5090565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff166117365760405162461bcd60e51b815260040161063d9061259d565b610d4e6117aa565b6117478161158f565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606117a38383604051806060016040528060278152602001612609602791396117da565b9392505050565b600054610100900460ff166117d15760405162461bcd60e51b815260040161063d9061259d565b610d4e33611547565b6060600080856001600160a01b0316856040516117f7919061257b565b600060405180830381855af49150503d8060008114611832576040519150601f19603f3d011682016040523d82523d6000602084013e611837565b606091505b509150915061184886838387611852565b9695505050505050565b606083156118c15782516000036118ba576001600160a01b0385163b6118ba5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161063d565b50816118cb565b6118cb83836118d3565b949350505050565b8151156118e35781518083602001fd5b8060405162461bcd60e51b815260040161063d9190611d50565b60008083601f84011261190f57600080fd5b5081356001600160401b0381111561192657600080fd5b60208301915083602082850101111561193e57600080fd5b9250929050565b6000806000806060858703121561195b57600080fd5b8435935060208501356001600160401b0381111561197857600080fd5b611984878288016118fd565b9598909750949560400135949350505050565b6001600160401b03811681146106da57600080fd5b6000806000806000608086880312156119c457600080fd5b853594506020860135935060408601356001600160401b038111156119e857600080fd5b6119f4888289016118fd565b9094509250506060860135611a0881611997565b809150509295509295909350565b6001600160a01b03811681146106da57600080fd5b600060208284031215611a3d57600080fd5b81356117a381611a16565b806040810183101561154157600080fd5b6000806000806000806000610100888a031215611a7557600080fd5b873596506020880135955060408801356001600160401b03811115611a9957600080fd5b611aa58a828b016118fd565b9096509450506060880135611ab981611997565b9250611ac88960808a01611a48565b9150611ad78960c08a01611a48565b905092959891949750929550565b803560038110610a7f57600080fd5b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611b3257611b32611af4565b604052919050565b60006001600160401b03821115611b5357611b53611af4565b50601f01601f191660200190565b6000611b74611b6f84611b3a565b611b0a565b9050828152838383011115611b8857600080fd5b828260208301376000602084830101529392505050565b600082601f830112611bb057600080fd5b6117a383833560208501611b61565b600080600080600080600060c0888a031215611bda57600080fd5b611be388611ae5565b965060208801356001600160401b0380821115611bff57600080fd5b818a0191508a601f830112611c1357600080fd5b813581811115611c2557611c25611af4565b8060051b611c3560208201611b0a565b9182526020818501810192908101908e841115611c5157600080fd5b6020860192505b83831015611c8f578483351115611c6e57600080fd5b611c7e8f60208535890101611b9f565b825260209283019290910190611c58565b9a5050505060408a0135965060608a0135915080821115611caf57600080fd5b611cbb8b838c01611b9f565b955060808a0135945060a08a0135915080821115611cd857600080fd5b50611ce58a828b016118fd565b989b979a50959850939692959293505050565b60005b83811015611d13578181015183820152602001611cfb565b838111156104c15750506000910152565b60008151808452611d3c816020860160208601611cf8565b601f01601f19169290920160200192915050565b6020815260006117a36020830184611d24565b600060208284031215611d7557600080fd5b5035919050565b600060e08284031215611d8e57600080fd5b50919050565b600060208284031215611da657600080fd5b81356001600160401b03811115611dbc57600080fd5b6118cb84828501611d7c565b60208152815115156020820152600060208301516040808401526118cb6060840182611d24565b60008060408385031215611e0257600080fd5b8235611e0d81611a16565b915060208301356001600160401b03811115611e2857600080fd5b8301601f81018513611e3957600080fd5b611e4885823560208401611b61565b9150509250929050565b60008060408385031215611e6557600080fd5b82356001600160401b0380821115611e7c57600080fd5b611e8886838701611d7c565b93506020850135915080821115611e9e57600080fd5b50830160408186031215611eb157600080fd5b809150509250929050565b80151581146106da57600080fd5b60008060008060008060008060a0898b031215611ee657600080fd5b88356001600160401b0380821115611efd57600080fd5b611f098c838d016118fd565b909a509850889150611f1d60208c01611ae5565b975060408b01359150611f2f82611ebc565b90955060608a01359080821115611f4557600080fd5b818b0191508b601f830112611f5957600080fd5b813581811115611f6857600080fd5b8c60208260051b8501011115611f7d57600080fd5b6020830196508095505060808b0135915080821115611f9b57600080fd5b50611fa88b828c016118fd565b999c989b5096995094979396929594505050565b60008060008060608587031215611fd257600080fd5b843593506020850135925060408501356001600160401b03811115611ff657600080fd5b612002878288016118fd565b95989497509550505050565b8381526060602082015260006120276060830185611d24565b90506001600160401b0383166040830152949350505050565b60006020828403121561205257600080fd5b81516117a381611997565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b6000808335601e1984360301811261210c57600080fd5b8301803591506001600160401b0382111561212657600080fd5b60200191503681900382131561193e57600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6020815260006118cb60208301848661213b565b600082601f83011261218957600080fd5b8151612197611b6f82611b3a565b8181528460208386010111156121ac57600080fd5b6118cb826020830160208701611cf8565b6000602082840312156121cf57600080fd5b81516001600160401b03808211156121e657600080fd5b90830190608082860312156121fa57600080fd5b60405160808101818110838211171561221557612215611af4565b806040525082518152602083015160208201526040830151604082015260608301518281111561224457600080fd5b61225087828601612178565b60608301525095945050505050565b60008235603e1983360301811261227557600080fd5b9190910192915050565b80518252602081015160208301526040810151604083015260006060820151608060608501526118cb6080850182611d24565b8281526040602082015260006118cb604083018461227f565b6000602082840312156122dd57600080fd5b81516001600160401b03808211156122f457600080fd5b908301906040828603121561230857600080fd5b60405160408101818110838211171561232357612323611af4565b604052825161233181611ebc565b815260208301518281111561234557600080fd5b61235187828601612178565b60208301525095945050505050565b6000808335601e1984360301811261237757600080fd5b83016020810192503590506001600160401b0381111561239657600080fd5b80360382131561193e57600080fd5b8381526060602082015260006123be606083018561227f565b828103604084015283356123d181611ebc565b151581526123e26020850185612360565b604060208401526108a860408401828461213b565b60a08152600061240b60a083018a8c61213b565b602060038a1061242b57634e487b7160e01b600052602160045260246000fd5b8381018a905288151560408501528382036060850152868252818101600588901b830182018960005b8a81101561248e57858303601f1901845261246f828d612360565b61247a85828461213b565b958701959450505090840190600101612454565b505085810360808701526124a381888a61213b565b9e9d5050505050505050505050505050565b848152836020820152826040820152600082516124d9816060850160208701611cf8565b9190910160600195945050505050565b6000602082840312156124fb57600080fd5b5051919050565b60006020828403121561251457600080fd5b81516117a381611a16565b8060005b60028110156104c1578151845260209384019390910190600101612523565b8481526001600160401b038416602082015260c08101612565604083018561251f565b612572608083018461251f565b95945050505050565b60008251612275818460208701611cf8565b8183823760009101908152919050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b60608201526080019056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220b0d42a714925a2c0421d29405818e7f299b2a3a78e6e22f01d1d6e3382fc3f0364736f6c634300080f0033"; + "0x60a0604052306080523480156200001557600080fd5b506200002062000030565b6200002a62000030565b620000f1565b600054610100900460ff16156200009d5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811614620000ef576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b60805161268e62000129600039600081816106000152818161064901528181610a9301528181610ad30152610b66015261268e6000f3fe60806040526004361061016a5760003560e01c806379ba5097116100d1578063c4d66de81161008a578063e847e28011610064578063e847e28014610408578063f2fde38b14610428578063fad28a2414610448578063ffa1ad741461046857600080fd5b8063c4d66de8146103aa578063cb7e9057146103ca578063e30c3978146103ea57600080fd5b806379ba5097146102ee5780637e1d42b5146103035780638da5cb5b14610323578063ace02de714610355578063ba22bd7614610375578063c1cb44e51461039557600080fd5b80634c2ee09d116101235780634c2ee09d146102355780634dcc0aa6146102555780634f1ef2861461028357806352d1902d14610296578063602f9834146102b9578063715018a6146102d957600080fd5b80631eb7dd5e146101765780631f3a5830146101985780633659cfe6146101d55780633f9fdbe414610176578063462fdf83146101f55780634bdb55971461020857600080fd5b3661017157005b600080fd5b34801561018257600080fd5b5061019661019136600461194a565b610497565b005b3480156101a457600080fd5b506101b86101b33660046119b1565b6104c8565b6040516001600160401b0390911681526020015b60405180910390f35b3480156101e157600080fd5b506101966101f0366004611a30565b6105f6565b6101b8610203366004611a5e565b6106de565b34801561021457600080fd5b50610228610223366004611bc9565b610870565b6040516101cc9190611d5a565b34801561024157600080fd5b50610196610250366004611d6d565b6108b5565b34801561026157600080fd5b50610275610270366004611d9e565b61091e565b6040516101cc929190611dd2565b610196610291366004611e0c565b610a89565b3480156102a257600080fd5b506102ab610b59565b6040519081526020016101cc565b3480156102c557600080fd5b506101966102d4366004611d9e565b610c0c565b3480156102e557600080fd5b50610196610d41565b3480156102fa57600080fd5b50610196610d55565b34801561030f57600080fd5b5061019661031e366004611e6f565b610dcc565b34801561032f57600080fd5b506033546001600160a01b03165b6040516001600160a01b0390911681526020016101cc565b34801561036157600080fd5b50610196610370366004611ee7565b610f04565b34801561038157600080fd5b50610196610390366004611a30565b610f86565b3480156103a157600080fd5b506102ab600181565b3480156103b657600080fd5b506101966103c5366004611a30565b610fb0565b3480156103d657600080fd5b5060975461033d906001600160a01b031681565b3480156103f657600080fd5b506065546001600160a01b031661033d565b34801561041457600080fd5b50610196610423366004611fd9565b6110c2565b34801561043457600080fd5b50610196610443366004611a30565b6110f8565b34801561045457600080fd5b50610196610463366004611d6d565b611169565b34801561047457600080fd5b50610228604051806040016040528060038152602001620312e360ec1b81525081565b6097546001600160a01b031633146104c2576040516321bf7f4960e01b815260040160405180910390fd5b50505050565b60008061053860405180608001604052806104e9336001600160a01b031690565b81526020016001815260200188815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050915250611194565b60408051338152602081018990529192507f9831d8c66285bfd33de069ced58ad437d6bf08f63446bf06c3713e40b4b7e873910160405180910390a16097546040516330f8455760e21b81526001600160a01b039091169063c3e1155c906105a8908a908590889060040161202b565b6020604051808303816000875af11580156105c7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105eb919061205d565b979650505050505050565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630036106475760405162461bcd60e51b815260040161063e9061207a565b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610690600080516020612612833981519152546001600160a01b031690565b6001600160a01b0316146106b65760405162461bcd60e51b815260040161063e906120c6565b6106bf816111d0565b604080516000808252602082019092526106db918391906111d8565b50565b60975460408051608081019091526000916001600160a01b03169082906107509080338152602001600181526020018b81526020018a8a8080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152505050915250611194565b60408051338152602081018c90529192507f9831d8c66285bfd33de069ced58ad437d6bf08f63446bf06c3713e40b4b7e873910160405180910390a16040516330f8455760e21b81526001600160a01b0383169063c3e1155c906107bc908d9085908b9060040161202b565b6020604051808303816000875af11580156107db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ff919061205d565b609754604080518082018252929550610863926001600160a01b03909216918d918791908a9060029083908390808284376000920191909152505060408051808201825291508a906002908390839080828437600092019190915250611348915050565b5050979650505050505050565b6097546060906001600160a01b0316331461089e576040516321bf7f4960e01b815260040160405180910390fd5b6108a9868484611417565b98975050505050505050565b6108bd6114e1565b6097546040516381bc079b60e01b8152600481018390526001600160a01b03909116906381bc079b90602401600060405180830381600087803b15801561090357600080fd5b505af1158015610917573d6000803e3d6000fd5b5050505050565b6040805180820190915260008152606060208201526097546000906001600160a01b03163314610961576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d61098a6060870187612112565b6040518363ffffffff1660e01b81526004016109a7929190612181565b600060405180830381865af41580156109c4573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109ec91908101906121da565b90506109fb816040015161153b565b6001600160a01b0316635b761585610a16602087018761227c565b60200135836040518363ffffffff1660e01b8152600401610a389291906122cf565b6000604051808303816000875af1158015610a57573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610a7f91908101906122e8565b9250925050915091565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610ad15760405162461bcd60e51b815260040161063e9061207a565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610b1a600080516020612612833981519152546001600160a01b031690565b6001600160a01b031614610b405760405162461bcd60e51b815260040161063e906120c6565b610b49826111d0565b610b55828260016111d8565b5050565b6000306001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614610bf95760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c60448201527f6c6564207468726f7567682064656c656761746563616c6c0000000000000000606482015260840161063e565b5060008051602061261283398151915290565b6097546001600160a01b03163314610c37576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d610c606060850185612112565b6040518363ffffffff1660e01b8152600401610c7d929190612181565b600060405180830381865af4158015610c9a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610cc291908101906121da565b9050610cd1816000015161153b565b6001600160a01b031663400d9f5d610ce9848061227c565b60200135836040518363ffffffff1660e01b8152600401610d0b9291906122cf565b600060405180830381600087803b158015610d2557600080fd5b505af1158015610d39573d6000803e3d6000fd5b505050505050565b610d496114e1565b610d53600061154c565b565b60655433906001600160a01b03168114610dc35760405162461bcd60e51b815260206004820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b606482015260840161063e565b6106db8161154c565b6097546001600160a01b03163314610df7576040516321bf7f4960e01b815260040160405180910390fd5b600073__$f61eb90c6f674e787d51c07f105fa231e2$__63d5c39a9d610e206060860186612112565b6040518363ffffffff1660e01b8152600401610e3d929190612181565b600060405180830381865af4158015610e5a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e8291908101906121da565b9050610e91816000015161153b565b6001600160a01b031663588152ca610ea9858061227c565b6020013583856040518463ffffffff1660e01b8152600401610ecd939291906123ce565b600060405180830381600087803b158015610ee757600080fd5b505af1158015610efb573d6000803e3d6000fd5b50505050505050565b610f0c6114e1565b60975460405163418925b760e01b81526001600160a01b039091169063418925b790610f4a908b908b908b908b908b908b908b908b90600401612420565b600060405180830381600087803b158015610f6457600080fd5b505af1158015610f78573d6000803e3d6000fd5b505050505050505050505050565b610f8e6114e1565b609780546001600160a01b0319166001600160a01b0392909216919091179055565b600054610100900460ff1615808015610fd05750600054600160ff909116105b80610fea5750303b158015610fea575060005460ff166001145b61104d5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161063e565b6000805460ff191660011790558015611070576000805461ff0019166101001790555b61107982611565565b8015610b55576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b6097546001600160a01b031633146110ed576040516321bf7f4960e01b815260040160405180910390fd5b610917848383611417565b6111006114e1565b606580546001600160a01b0383166001600160a01b031990911681179091556111316033546001600160a01b031690565b6001600160a01b03167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e2270060405160405180910390a350565b6097546001600160a01b031633146106db576040516321bf7f4960e01b815260040160405180910390fd5b8051602080830151604080850151606086810151925190956111ba9590949391016124de565b6040516020818303038152906040529050919050565b6106db6114e1565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff16156112105761120b83611594565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa92505050801561126a575060408051601f3d908101601f1916820190925261126791810190612512565b60015b6112cd5760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161063e565b600080516020612612833981519152811461133c5760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161063e565b5061120b838383611630565b846001600160a01b031663478222c26040518163ffffffff1660e01b81526004016020604051808303816000875af1158015611388573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906113ac919061252b565b6001600160a01b03166318e3404b34868686866040518663ffffffff1660e01b81526004016113de949392919061256b565b6000604051808303818588803b1580156113f757600080fd5b505af115801561140b573d6000803e3d6000fd5b50505050505050505050565b6060604051806040016040528060038152602001620312e360ec1b81525060405160200161144591906125a4565b60405160208183030381529060405280519060200120838360405160200161146e9291906125b6565b60405160208183030381529060405280519060200120146114a25760405163b01318a560e01b815260040160405180910390fd5b82828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525092979650505050505050565b6033546001600160a01b03163314610d535760405162461bcd60e51b815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161063e565b600061154682611655565b92915050565b606580546001600160a01b03191690556106db816116c2565b600054610100900460ff1661158c5760405162461bcd60e51b815260040161063e906125c6565b610f8e611714565b6001600160a01b0381163b6116015760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161063e565b60008051602061261283398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b61163983611743565b6000825111806116465750805b1561120b576104c28383611783565b60006001600160a01b038211156116be5760405162461bcd60e51b815260206004820152602760248201527f53616665436173743a2076616c756520646f65736e27742066697420696e20316044820152663630206269747360c81b606482015260840161063e565b5090565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff1661173b5760405162461bcd60e51b815260040161063e906125c6565b610d536117af565b61174c81611594565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b60606117a88383604051806060016040528060278152602001612632602791396117df565b9392505050565b600054610100900460ff166117d65760405162461bcd60e51b815260040161063e906125c6565b610d533361154c565b6060600080856001600160a01b0316856040516117fc91906125a4565b600060405180830381855af49150503d8060008114611837576040519150601f19603f3d011682016040523d82523d6000602084013e61183c565b606091505b509150915061184d86838387611857565b9695505050505050565b606083156118c65782516000036118bf576001600160a01b0385163b6118bf5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161063e565b50816118d0565b6118d083836118d8565b949350505050565b8151156118e85781518083602001fd5b8060405162461bcd60e51b815260040161063e9190611d5a565b60008083601f84011261191457600080fd5b5081356001600160401b0381111561192b57600080fd5b60208301915083602082850101111561194357600080fd5b9250929050565b6000806000806060858703121561196057600080fd5b8435935060208501356001600160401b0381111561197d57600080fd5b61198987828801611902565b9598909750949560400135949350505050565b6001600160401b03811681146106db57600080fd5b6000806000806000608086880312156119c957600080fd5b853594506020860135935060408601356001600160401b038111156119ed57600080fd5b6119f988828901611902565b9094509250506060860135611a0d8161199c565b809150509295509295909350565b6001600160a01b03811681146106db57600080fd5b600060208284031215611a4257600080fd5b81356117a881611a1b565b806040810183101561154657600080fd5b6000806000806000806000610100888a031215611a7a57600080fd5b873596506020880135955060408801356001600160401b03811115611a9e57600080fd5b611aaa8a828b01611902565b9096509450506060880135611abe8161199c565b9250611acd8960808a01611a4d565b9150611adc8960c08a01611a4d565b905092959891949750929550565b803560038110611af957600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b0381118282101715611b3c57611b3c611afe565b604052919050565b60006001600160401b03821115611b5d57611b5d611afe565b50601f01601f191660200190565b6000611b7e611b7984611b44565b611b14565b9050828152838383011115611b9257600080fd5b828260208301376000602084830101529392505050565b600082601f830112611bba57600080fd5b6117a883833560208501611b6b565b600080600080600080600060c0888a031215611be457600080fd5b611bed88611aea565b965060208801356001600160401b0380821115611c0957600080fd5b818a0191508a601f830112611c1d57600080fd5b813581811115611c2f57611c2f611afe565b8060051b611c3f60208201611b14565b9182526020818501810192908101908e841115611c5b57600080fd5b6020860192505b83831015611c99578483351115611c7857600080fd5b611c888f60208535890101611ba9565b825260209283019290910190611c62565b9a5050505060408a0135965060608a0135915080821115611cb957600080fd5b611cc58b838c01611ba9565b955060808a0135945060a08a0135915080821115611ce257600080fd5b50611cef8a828b01611902565b989b979a50959850939692959293505050565b60005b83811015611d1d578181015183820152602001611d05565b838111156104c25750506000910152565b60008151808452611d46816020860160208601611d02565b601f01601f19169290920160200192915050565b6020815260006117a86020830184611d2e565b600060208284031215611d7f57600080fd5b5035919050565b600060e08284031215611d9857600080fd5b50919050565b600060208284031215611db057600080fd5b81356001600160401b03811115611dc657600080fd5b6118d084828501611d86565b604081528251151560408201526000602084015160406060840152611dfa6080840182611d2e565b91505082151560208301529392505050565b60008060408385031215611e1f57600080fd5b8235611e2a81611a1b565b915060208301356001600160401b03811115611e4557600080fd5b8301601f81018513611e5657600080fd5b611e6585823560208401611b6b565b9150509250929050565b60008060408385031215611e8257600080fd5b82356001600160401b0380821115611e9957600080fd5b611ea586838701611d86565b93506020850135915080821115611ebb57600080fd5b50830160408186031215611ece57600080fd5b809150509250929050565b80151581146106db57600080fd5b60008060008060008060008060a0898b031215611f0357600080fd5b88356001600160401b0380821115611f1a57600080fd5b611f268c838d01611902565b909a509850889150611f3a60208c01611aea565b975060408b01359150611f4c82611ed9565b90955060608a01359080821115611f6257600080fd5b818b0191508b601f830112611f7657600080fd5b813581811115611f8557600080fd5b8c60208260051b8501011115611f9a57600080fd5b6020830196508095505060808b0135915080821115611fb857600080fd5b50611fc58b828c01611902565b999c989b5096995094979396929594505050565b60008060008060608587031215611fef57600080fd5b843593506020850135925060408501356001600160401b0381111561201357600080fd5b61201f87828801611902565b95989497509550505050565b8381526060602082015260006120446060830185611d2e565b90506001600160401b0383166040830152949350505050565b60006020828403121561206f57600080fd5b81516117a88161199c565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c908201527f46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682060408201526b6163746976652070726f787960a01b606082015260800190565b6000808335601e1984360301811261212957600080fd5b8301803591506001600160401b0382111561214357600080fd5b60200191503681900382131561194357600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6020815260006118d0602083018486612158565b600082601f8301126121a657600080fd5b81516121b4611b7982611b44565b8181528460208386010111156121c957600080fd5b6118d0826020830160208701611d02565b6000602082840312156121ec57600080fd5b81516001600160401b038082111561220357600080fd5b908301906080828603121561221757600080fd5b60405160808101818110838211171561223257612232611afe565b806040525082518152602083015160208201526040830151604082015260608301518281111561226157600080fd5b61226d87828601612195565b60608301525095945050505050565b60008235603e1983360301811261229257600080fd5b9190910192915050565b80518252602081015160208301526040810151604083015260006060820151608060608501526118d06080850182611d2e565b8281526040602082015260006118d0604083018461229c565b600080604083850312156122fb57600080fd5b82516001600160401b038082111561231257600080fd5b908401906040828703121561232657600080fd5b60405160408101818110838211171561234157612341611afe565b604052825161234f81611ed9565b815260208301518281111561236357600080fd5b61236f88828601612195565b6020830152508094505050506020830151611ece81611ed9565b6000808335601e198436030181126123a057600080fd5b83016020810192503590506001600160401b038111156123bf57600080fd5b80360382131561194357600080fd5b8381526060602082015260006123e7606083018561229c565b828103604084015283356123fa81611ed9565b1515815261240b6020850185612389565b604060208401526108a9604084018284612158565b60a08152600061243460a083018a8c612158565b602060038a1061245457634e487b7160e01b600052602160045260246000fd5b8381018a905288151560408501528382036060850152868252818101600588901b830182018960005b8a8110156124b757858303601f19018452612498828d612389565b6124a3858284612158565b95870195945050509084019060010161247d565b505085810360808701526124cc81888a612158565b9e9d5050505050505050505050505050565b84815283602082015282604082015260008251612502816060850160208701611d02565b9190910160600195945050505050565b60006020828403121561252457600080fd5b5051919050565b60006020828403121561253d57600080fd5b81516117a881611a1b565b8060005b60028110156104c257815184526020938401939091019060010161254c565b8481526001600160401b038416602082015260c0810161258e6040830185612548565b61259b6080830184612548565b95945050505050565b60008251612292818460208701611d02565b8183823760009101908152919050565b6020808252602b908201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960408201526a6e697469616c697a696e6760a81b60608201526080019056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122073f8b90c242e6914fc1897bed4ad6a878fc6995243c6209b5438ffc072e3f9b364736f6c634300080f0033"; type UniversalChannelHandlerConstructorParams = | [ diff --git a/test/Dispatcher/Dispatcher.t.sol b/test/Dispatcher/Dispatcher.t.sol index e6fcc276..7e01a58a 100644 --- a/test/Dispatcher/Dispatcher.t.sol +++ b/test/Dispatcher/Dispatcher.t.sol @@ -10,6 +10,7 @@ import {IbcReceiver} from "../../contracts/interfaces/IbcReceiver.sol"; import {DummyLightClient} from "../../contracts/utils/DummyLightClient.sol"; import {Base} from "../utils/Dispatcher.base.t.sol"; import "../../contracts/examples/Mars.sol"; +import "../../contracts/examples/Pluto.sol"; import "../../contracts/core/OptimisticLightClient.sol"; import {LocalEnd, ChannelHandshakeSetting, Base} from "../utils/Dispatcher.base.t.sol"; import {Earth} from "../../contracts/examples/Earth.sol"; @@ -339,6 +340,8 @@ contract DispatcherRecvPacketTestSuite is ChannelOpenTestBaseSetup { bytes payload = bytes("msgPayload"); bytes appAck = abi.encodePacked('{ "account": "account", "reply": "got the message" }'); + event DummyEvent(uint32 id, string message); + function setUp() public override { super.setUp(); string memory marsPort = string(abi.encodePacked(portPrefix, getHexBytes(address(mars)))); @@ -356,6 +359,27 @@ contract DispatcherRecvPacketTestSuite is ChannelOpenTestBaseSetup { } } + function test_skip_ack() public { + uint64 packetSeq = 1; + Pluto pluto = new Pluto(dispatcherProxy); + string memory plutoPort = string(abi.encodePacked(portPrefix, getHexBytes(address(pluto)))); + IbcEndpoint memory plutoDest = IbcEndpoint(plutoPort, channelId); + + // test that dummy event, not writeAckPacket, occurs immediately after RecvPacket + vm.expectEmit(true, true, true, true, address(dispatcherProxy)); + emit RecvPacket(address(pluto), channelId, packetSeq); + vm.expectEmit(true, true, true, true, address(this)); + emit DummyEvent(1, "dummy event"); + this.batch_expected_events(packetSeq, plutoDest); + + // test _ackPacketCommitment is not set to true + uint32 ackPacketCommitmentSlot = 257; + bytes32 slot1 = keccak256(abi.encode(address(pluto), ackPacketCommitmentSlot)); + bytes32 slot2 = keccak256(abi.encode(channelId, slot1)); + bytes32 slot = keccak256(abi.encode(packetSeq, slot2)); + assert(vm.load(address(dispatcherProxy), slot) == 0); + } + // recvPacket emits a WriteTimeoutPacket if timestamp passes chain B's block time function test_timeout_timestamp() public { uint64 packetSeq = 1; @@ -385,6 +409,12 @@ contract DispatcherRecvPacketTestSuite is ChannelOpenTestBaseSetup { dispatcherProxy.recvPacket(IbcPacket(src, dest, 3, payload, ZERO_HEIGHT, maxTimeout), validProof); } + // put events into a function to batch expected events into one transaction for testing order + function batch_expected_events(uint64 packetSeq, IbcEndpoint memory plutoDest) external { + dispatcherProxy.recvPacket(IbcPacket(src, plutoDest, packetSeq, payload, ZERO_HEIGHT, maxTimeout), validProof); + emit DummyEvent(1, "dummy event"); + } + // Can't spoof a timeed out packet function test_writeTimeoutPacket_cannot_Spoof_Packet() public { IbcPacket memory spoofedPacket = IbcPacket(src, dest, 1, payload, ZERO_HEIGHT, 1); diff --git a/test/mocks/GasUsingMars.sol b/test/mocks/GasUsingMars.sol index a84aa7ca..a2b68d71 100644 --- a/test/mocks/GasUsingMars.sol +++ b/test/mocks/GasUsingMars.sol @@ -30,13 +30,13 @@ contract GasUsingMars is Mars { virtual override onlyIbcDispatcher - returns (AckPacket memory ackPacket) + returns (AckPacket memory ackPacket, bool skipAck) { recvedPackets.push(packet); _useGas(); // solhint-disable-next-line quotes - return AckPacket(true, abi.encodePacked('{ "account": "account", "reply": "got the message" }')); + return (AckPacket(true, abi.encodePacked('{ "account": "account", "reply": "got the message" }')), false); } function _useGas() internal view {