From 3caaa659fe663aafd17d2a6ec38158cb740f9a68 Mon Sep 17 00:00:00 2001 From: fabtreb <70035807+fabtreb@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:18:22 +0200 Subject: [PATCH 1/5] chore(contracts): fix typo --- contracts/core/src/pkg/XGasPump.sol | 4 ++-- contracts/core/src/token/OmniGasPump.sol | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/core/src/pkg/XGasPump.sol b/contracts/core/src/pkg/XGasPump.sol index b43c1703b..42a527e77 100644 --- a/contracts/core/src/pkg/XGasPump.sol +++ b/contracts/core/src/pkg/XGasPump.sol @@ -42,9 +42,9 @@ abstract contract XGasPump { } function _fillUpOrRefund(address refundTo, address recipient, uint256 amtETH) internal { - (, bool succes, string memory reason) = omniGasPump.dryFillUp(amtETH); + (, bool success, string memory reason) = omniGasPump.dryFillUp(amtETH); - if (!succes) { + if (!success) { emit Refunded(refundTo, amtETH, reason); payable(refundTo).transfer(amtETH); return; diff --git a/contracts/core/src/token/OmniGasPump.sol b/contracts/core/src/token/OmniGasPump.sol index 685b1bc6a..1ee474c2c 100644 --- a/contracts/core/src/token/OmniGasPump.sol +++ b/contracts/core/src/token/OmniGasPump.sol @@ -51,7 +51,7 @@ contract OmniGasPump is XAppUpgradeable, OwnableUpgradeable, PausableUpgradeable /// @notice Max amt (in native token) that can be swapped in a single tx uint256 public maxSwap; - /// @notice Percentage toll taken by this contract for each swap, to disencentivize spamming + /// @notice Percentage toll taken by this contract for each swap, to disincentivize spamming uint256 public toll; /// @notice Map recipient to total owed (sum of historical fillUps()), denominated in OMNI. From 6ba600c6c28565fd078da899ef5d31c0b423b0d0 Mon Sep 17 00:00:00 2001 From: fabtreb <70035807+fabtreb@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:33:53 +0200 Subject: [PATCH 2/5] forge install: openzeppelin-contracts v5.0.2 --- .gitmodules | 3 +++ lib/openzeppelin-contracts | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 lib/openzeppelin-contracts diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..140ea9eed --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lib/openzeppelin-contracts"] + path = lib/openzeppelin-contracts + url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts new file mode 160000 index 000000000..dbb6104ce --- /dev/null +++ b/lib/openzeppelin-contracts @@ -0,0 +1 @@ +Subproject commit dbb6104ce834628e473d2173bbc9d47f81a9eec3 From e974e56d771a3881e6eaaa3c1874ddd85b414eff Mon Sep 17 00:00:00 2001 From: fabtreb <70035807+fabtreb@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:35:36 +0200 Subject: [PATCH 3/5] forge install: forge-std v1.9.2 --- .gitmodules | 3 +++ lib/forge-std | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/forge-std diff --git a/.gitmodules b/.gitmodules index 140ea9eed..f5a571c9e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts +[submodule "lib/forge-std"] + path = lib/forge-std + url = https://github.com/foundry-rs/forge-std diff --git a/lib/forge-std b/lib/forge-std new file mode 160000 index 000000000..1714bee72 --- /dev/null +++ b/lib/forge-std @@ -0,0 +1 @@ +Subproject commit 1714bee72e286e73f76e320d110e0eaf5c4e649d From 6ced9dbbe313917566a519b9acf5225a5918ac73 Mon Sep 17 00:00:00 2001 From: fabtreb <70035807+fabtreb@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:50:24 +0200 Subject: [PATCH 4/5] chore(contracts): update bindings --- contracts/bindings/omnigaspump.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/bindings/omnigaspump.go b/contracts/bindings/omnigaspump.go index f79109328..3aa9d1c02 100644 --- a/contracts/bindings/omnigaspump.go +++ b/contracts/bindings/omnigaspump.go @@ -42,7 +42,7 @@ type OmniGasPumpInitParams struct { // OmniGasPumpMetaData contains all meta data concerning the OmniGasPump contract. var OmniGasPumpMetaData = &bind.MetaData{ ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"SETTLE_GAS\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"TOLL_DENOM\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"defaultConfLevel\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint8\",\"internalType\":\"uint8\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"dryFillUp\",\"inputs\":[{\"name\":\"amtETH\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"},{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"fillUp\",\"inputs\":[{\"name\":\"recipient\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"gasStation\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"p\",\"type\":\"tuple\",\"internalType\":\"structOmniGasPump.InitParams\",\"components\":[{\"name\":\"gasStation\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"oracle\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"portal\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"owner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"maxSwap\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"toll\",\"type\":\"uint256\",\"internalType\":\"uint256\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"maxSwap\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"omni\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIOmniPortal\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"oracle\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIConversionRateOracle\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owed\",\"inputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"pause\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"paused\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"quote\",\"inputs\":[{\"name\":\"amtOMNI\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasStation\",\"inputs\":[{\"name\":\"station\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setMaxSwap\",\"inputs\":[{\"name\":\"max\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setOracle\",\"inputs\":[{\"name\":\"oracle_\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setToll\",\"inputs\":[{\"name\":\"pct\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"toll\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"unpause\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"withdraw\",\"inputs\":[{\"name\":\"to\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"xfee\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"event\",\"name\":\"DefaultConfLevelSet\",\"inputs\":[{\"name\":\"conf\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"FilledUp\",\"inputs\":[{\"name\":\"recipient\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"owed\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"},{\"name\":\"amtETH\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"},{\"name\":\"fee\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"},{\"name\":\"toll\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"},{\"name\":\"amtOMNI\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"GasStationSet\",\"inputs\":[{\"name\":\"station\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint64\",\"indexed\":false,\"internalType\":\"uint64\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"MaxSwapSet\",\"inputs\":[{\"name\":\"max\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OmniPortalSet\",\"inputs\":[{\"name\":\"omni\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OracleSet\",\"inputs\":[{\"name\":\"oracle\",\"type\":\"address\",\"indexed\":false,\"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\":\"Paused\",\"inputs\":[{\"name\":\"account\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"TollSet\",\"inputs\":[{\"name\":\"pct\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Unpaused\",\"inputs\":[{\"name\":\"account\",\"type\":\"address\",\"indexed\":false,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"EnforcedPause\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"ExpectedPause\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"InvalidInitialization\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"NotInitializing\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"OwnableInvalidOwner\",\"inputs\":[{\"name\":\"owner\",\"type\":\"address\",\"internalType\":\"address\"}]},{\"type\":\"error\",\"name\":\"OwnableUnauthorizedAccount\",\"inputs\":[{\"name\":\"account\",\"type\":\"address\",\"internalType\":\"address\"}]}]", - Bin: "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6117ef806100df6000396000f3fe6080604052600436106101665760003560e01c80637adbf973116100d1578063a67265b11161008a578063dbb602fd11610064578063dbb602fd14610440578063df18e04714610460578063ed1bd76c1461048d578063f2fde38b146104ad57600080fd5b8063a67265b1146103da578063c4918b4e146103fa578063ca48b20b1461041057600080fd5b80637adbf973146103135780637dc0d1d0146103335780638456cb59146103535780638aec67fe146103685780638da5cb5b1461037d578063a3dace5d146103ba57600080fd5b80634b260981116101235780634b2609811461023657806351cff8d91461024c57806355e0af6b1461026c5780635c975abb1461029b578063715018a6146102cb57806374eeb847146102e057600080fd5b806308a957a91461016b5780630e6e91d81461018d578063285aaa20146101ad57806339acf9f1146101d65780633f4ba83a1461020e5780634ae809ee14610223575b600080fd5b34801561017757600080fd5b5061018b610186366004611590565b6104cd565b005b34801561019957600080fd5b5061018b6101a83660046115b9565b6104e1565b3480156101b957600080fd5b506101c360355481565b6040519081526020015b60405180910390f35b3480156101e257600080fd5b506000546101f6906001600160a01b031681565b6040516001600160a01b0390911681526020016101cd565b34801561021a57600080fd5b5061018b6104f2565b6101c3610231366004611590565b610504565b34801561024257600080fd5b506101c36103e881565b34801561025857600080fd5b5061018b610267366004611590565b61071c565b34801561027857600080fd5b5061028c6102873660046115b9565b6107cb565b6040516101cd93929190611618565b3480156102a757600080fd5b5060008051602061179a8339815191525460ff1660405190151581526020016101cd565b3480156102d757600080fd5b5061018b6108ad565b3480156102ec57600080fd5b5060005461030190600160a01b900460ff1681565b60405160ff90911681526020016101cd565b34801561031f57600080fd5b5061018b61032e366004611590565b6108bf565b34801561033f57600080fd5b506032546101f6906001600160a01b031681565b34801561035f57600080fd5b5061018b6108d0565b34801561037457600080fd5b506101c36108e0565b34801561038957600080fd5b507f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b03166101f6565b3480156103c657600080fd5b5061018b6103d53660046115b9565b61094e565b3480156103e657600080fd5b5061018b6103f5366004611642565b61095f565b34801561040657600080fd5b506101c360345481565b34801561041c57600080fd5b50610427620186a081565b60405167ffffffffffffffff90911681526020016101cd565b34801561044c57600080fd5b506033546101f6906001600160a01b031681565b34801561046c57600080fd5b506101c361047b366004611590565b60366020526000908152604090205481565b34801561049957600080fd5b506101c36104a83660046115b9565b610adf565b3480156104b957600080fd5b5061018b6104c8366004611590565b610b38565b6104d5610b73565b6104de81610bce565b50565b6104e9610b73565b6104de81610c79565b6104fa610b73565b610502610cf6565b565b600061050e610d50565b60006105186108e0565b90508034101561056f5760405162461bcd60e51b815260206004820152601d60248201527f4f6d6e6947617350756d703a20696e73756666696369656e742066656500000060448201526064015b60405180910390fd5b600061057b8234611670565b90506034548111156105c75760405162461bcd60e51b815260206004820152601560248201527409edadcd28ec2e6a0eadae07440deeccae440dac2f605b1b6044820152606401610566565b60006103e8603554836105da9190611683565b6105e4919061169a565b90506105f08183611670565b915060006105fd83610d81565b6001600160a01b03871660009081526036602052604081208054929350839290919061062a9084906116bc565b909155506106a7905061063b610e97565b6033546001600160a01b038981166000818152603660205260409081902054905160248101929092526044820152600192919091169060640160408051601f198184030181529190526020810180516001600160e01b0316631decdcfb60e11b179052620186a0610f14565b506001600160a01b038616600081815260366020908152604091829020548251908152349181019190915290810186905260608101849052608081018390527f7737fe59897f758714c24688a6470bb05235f01af1f4293edd0c290e651dd8319060a00160405180910390a295945050505050565b610724610b73565b6000816001600160a01b03164760405160006040518083038185875af1925050503d8060008114610771576040519150601f19603f3d011682016040523d82523d6000602084013e610776565b606091505b50509050806107c75760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e6947617350756d703a207769746864726177206661696c6564000000006044820152606401610566565b5050565b600080606060006107da6108e0565b90508085101561081957505060408051808201909152601081526f696e73756666696369656e742066656560801b6020820152600092508291506108a6565b6108238186611670565b945060345485111561085c5750506040805180820190915260088152670deeccae440dac2f60c31b6020820152600092508291506108a6565b6103e86035548661086d9190611683565b610877919061169a565b6108819086611670565b945061088c85610d81565b600160405180602001604052806000815250935093509350505b9193909250565b6108b5610b73565b610502600061105e565b6108c7610b73565b6104de816110cf565b6108d8610b73565b610502611173565b60006001600160a01b036000196109476108f8610e97565b6040516001600160a01b03851660248201526044810184905260640160408051601f198184030181529190526020810180516001600160e01b0316631decdcfb60e11b179052620186a06111bc565b9250505090565b610956610b73565b6104de8161123a565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156109a55750825b905060008267ffffffffffffffff1660011480156109c25750303b155b9050811580156109d0575080155b156109ee5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a1857845460ff60401b1916600160401b1785555b610a30610a2b6040880160208901611590565b6110cf565b610a45610a406020880188611590565b610bce565b610a528660800135610c79565b610a5f8660a0013561123a565b610a79610a726060880160408901611590565b60016112c0565b610a91610a8c6080880160608901611590565b6112da565b8315610ad757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b600080610aeb836112eb565b90506035546103e8610afd9190611670565b610b096103e883611683565b610b13919061169a565b610b1d90826116bc565b9050610b276108e0565b610b3190826116bc565b9392505050565b610b40610b73565b6001600160a01b038116610b6a57604051631e4fbdf760e01b815260006004820152602401610566565b6104de8161105e565b33610ba57f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b031690565b6001600160a01b0316146105025760405163118cdaa760e01b8152336004820152602401610566565b6001600160a01b038116610c245760405162461bcd60e51b815260206004820152601960248201527f4f6d6e6947617350756d703a207a65726f2061646472657373000000000000006044820152606401610566565b603380546001600160a01b0319166001600160a01b0383169081179091556040519081527ffd263e3b7583e8397be8a61710d1105cf8c0f111bbac1014d0ec7dbcd1e422f1906020015b60405180910390a150565b60008111610cc15760405162461bcd60e51b815260206004820152601560248201527409edadcd28ec2e6a0eadae07440f4cae4de40dac2f605b1b6044820152606401610566565b60348190556040518181527f343ecf9262f8cafd2e9b0ffdab9f14bf18a17899eeef3e41133e84c354e5298390602001610c6e565b610cfe6113b7565b60008051602061179a833981519152805460ff191681557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b039091168152602001610c6e565b60008051602061179a8339815191525460ff16156105025760405163d93c066560e01b815260040160405180910390fd5b6032546000906001600160a01b0316638b7bfd70610d9d610e97565b6040516001600160e01b031960e084901b16815267ffffffffffffffff9091166004820152602401602060405180830381865afa158015610de2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0691906116cf565b603260009054906101000a90046001600160a01b03166001600160a01b0316638f9d6ace6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e7d91906116cf565b610e879084611683565b610e91919061169a565b92915050565b60008060009054906101000a90046001600160a01b03166001600160a01b031663110ff5f16040518163ffffffff1660e01b8152600401602060405180830381865afa158015610eeb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f0f91906116e8565b905090565b60008054604051632376548f60e21b815282916001600160a01b031690638dd9523c90610f49908a9088908890600401611712565b602060405180830381865afa158015610f66573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8a91906116cf565b90508047101580610f9b5750803410155b610fe75760405162461bcd60e51b815260206004820152601860248201527f584170703a20696e73756666696369656e742066756e647300000000000000006044820152606401610566565b60005460405163c21dda4f60e01b81526001600160a01b039091169063c21dda4f908390611021908b908b908b908b908b90600401611749565b6000604051808303818588803b15801561103a57600080fd5b505af115801561104e573d6000803e3d6000fd5b50939a9950505050505050505050565b7f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c19930080546001600160a01b031981166001600160a01b03848116918217845560405192169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b6001600160a01b0381166111255760405162461bcd60e51b815260206004820152601860248201527f4f6d6e6947617350756d703a207a65726f206f7261636c6500000000000000006044820152606401610566565b603280546001600160a01b0319166001600160a01b0383169081179091556040519081527f3f32684a32a11dabdbb8c0177de80aa3ae36a004d75210335b49e544e48cd0aa90602001610c6e565b61117b610d50565b60008051602061179a833981519152805460ff191660011781557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a25833610d38565b60008054604051632376548f60e21b81526001600160a01b0390911690638dd9523c906111f190879087908790600401611712565b602060405180830381865afa15801561120e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123291906116cf565b949350505050565b6103e8811061128b5760405162461bcd60e51b815260206004820152601960248201527f4f6d6e6947617350756d703a2070637420746f6f2068696768000000000000006044820152606401610566565b60358190556040518181527f0b3d400288f60ce0f5632cd941b5748faa91ebea844cbe78c5180b7838a0933f90602001610c6e565b6112c86113e7565b6112d182611430565b6107c7816114c9565b6112e26113e7565b6104de8161156c565b603254604080516347ceb56760e11b815290516000926001600160a01b031691638f9d6ace9160048083019260209291908290030181865afa158015611335573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135991906116cf565b6032546001600160a01b0316638b7bfd70611372610e97565b6040516001600160e01b031960e084901b16815267ffffffffffffffff9091166004820152602401602060405180830381865afa158015610e59573d6000803e3d6000fd5b60008051602061179a8339815191525460ff1661050257604051638dfc202b60e01b815260040160405180910390fd5b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661050257604051631afcd79f60e31b815260040160405180910390fd5b6001600160a01b03811661147b5760405162461bcd60e51b8152602060048201526012602482015271584170703a206e6f207a65726f206f6d6e6960701b6044820152606401610566565b600080546001600160a01b0319166001600160a01b0383169081179091556040519081527f79162c8d053a07e70cdc1ccc536f0440b571f8508377d2bef51094fadab98f4790602001610c6e565b6114d281611574565b61151e5760405162461bcd60e51b815260206004820152601860248201527f584170703a20696e76616c696420636f6e66206c6576656c00000000000000006044820152606401610566565b6000805460ff60a01b1916600160a01b60ff8416908102919091179091556040519081527f8de08a798b4e50b4f351c1eaa91a11530043802be3ffac2df87db0c45a2e848390602001610c6e565b610b406113e7565b600060ff821660011480610e91575060ff821660041492915050565b6000602082840312156115a257600080fd5b81356001600160a01b0381168114610b3157600080fd5b6000602082840312156115cb57600080fd5b5035919050565b6000815180845260005b818110156115f8576020818501810151868301820152016115dc565b506000602082860101526020601f19601f83011685010191505092915050565b838152821515602082015260606040820152600061163960608301846115d2565b95945050505050565b600060c0828403121561165457600080fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610e9157610e9161165a565b8082028115828204841417610e9157610e9161165a565b6000826116b757634e487b7160e01b600052601260045260246000fd5b500490565b80820180821115610e9157610e9161165a565b6000602082840312156116e157600080fd5b5051919050565b6000602082840312156116fa57600080fd5b815167ffffffffffffffff81168114610b3157600080fd5b600067ffffffffffffffff80861683526060602084015261173660608401866115d2565b9150808416604084015250949350505050565b600067ffffffffffffffff808816835260ff8716602084015260018060a01b038616604084015260a0606084015261178460a08401866115d2565b9150808416608084015250969550505050505056fecd5ed15c6e187e77e9aee88184c21f4f2182ab5827cb3b7e07fbedcd63f03300a2646970667358221220590150f42c4b3651dcceb7d1073c968bfa083fd836e37612833b815e8700ce4e64736f6c63430008180033", + Bin: "0x608060405234801561001057600080fd5b5061001961001e565b6100d0565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff161561006e5760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b03908116146100cd5780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6117ef806100df6000396000f3fe6080604052600436106101665760003560e01c80637adbf973116100d1578063a67265b11161008a578063dbb602fd11610064578063dbb602fd14610440578063df18e04714610460578063ed1bd76c1461048d578063f2fde38b146104ad57600080fd5b8063a67265b1146103da578063c4918b4e146103fa578063ca48b20b1461041057600080fd5b80637adbf973146103135780637dc0d1d0146103335780638456cb59146103535780638aec67fe146103685780638da5cb5b1461037d578063a3dace5d146103ba57600080fd5b80634b260981116101235780634b2609811461023657806351cff8d91461024c57806355e0af6b1461026c5780635c975abb1461029b578063715018a6146102cb57806374eeb847146102e057600080fd5b806308a957a91461016b5780630e6e91d81461018d578063285aaa20146101ad57806339acf9f1146101d65780633f4ba83a1461020e5780634ae809ee14610223575b600080fd5b34801561017757600080fd5b5061018b610186366004611590565b6104cd565b005b34801561019957600080fd5b5061018b6101a83660046115b9565b6104e1565b3480156101b957600080fd5b506101c360355481565b6040519081526020015b60405180910390f35b3480156101e257600080fd5b506000546101f6906001600160a01b031681565b6040516001600160a01b0390911681526020016101cd565b34801561021a57600080fd5b5061018b6104f2565b6101c3610231366004611590565b610504565b34801561024257600080fd5b506101c36103e881565b34801561025857600080fd5b5061018b610267366004611590565b61071c565b34801561027857600080fd5b5061028c6102873660046115b9565b6107cb565b6040516101cd93929190611618565b3480156102a757600080fd5b5060008051602061179a8339815191525460ff1660405190151581526020016101cd565b3480156102d757600080fd5b5061018b6108ad565b3480156102ec57600080fd5b5060005461030190600160a01b900460ff1681565b60405160ff90911681526020016101cd565b34801561031f57600080fd5b5061018b61032e366004611590565b6108bf565b34801561033f57600080fd5b506032546101f6906001600160a01b031681565b34801561035f57600080fd5b5061018b6108d0565b34801561037457600080fd5b506101c36108e0565b34801561038957600080fd5b507f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b03166101f6565b3480156103c657600080fd5b5061018b6103d53660046115b9565b61094e565b3480156103e657600080fd5b5061018b6103f5366004611642565b61095f565b34801561040657600080fd5b506101c360345481565b34801561041c57600080fd5b50610427620186a081565b60405167ffffffffffffffff90911681526020016101cd565b34801561044c57600080fd5b506033546101f6906001600160a01b031681565b34801561046c57600080fd5b506101c361047b366004611590565b60366020526000908152604090205481565b34801561049957600080fd5b506101c36104a83660046115b9565b610adf565b3480156104b957600080fd5b5061018b6104c8366004611590565b610b38565b6104d5610b73565b6104de81610bce565b50565b6104e9610b73565b6104de81610c79565b6104fa610b73565b610502610cf6565b565b600061050e610d50565b60006105186108e0565b90508034101561056f5760405162461bcd60e51b815260206004820152601d60248201527f4f6d6e6947617350756d703a20696e73756666696369656e742066656500000060448201526064015b60405180910390fd5b600061057b8234611670565b90506034548111156105c75760405162461bcd60e51b815260206004820152601560248201527409edadcd28ec2e6a0eadae07440deeccae440dac2f605b1b6044820152606401610566565b60006103e8603554836105da9190611683565b6105e4919061169a565b90506105f08183611670565b915060006105fd83610d81565b6001600160a01b03871660009081526036602052604081208054929350839290919061062a9084906116bc565b909155506106a7905061063b610e97565b6033546001600160a01b038981166000818152603660205260409081902054905160248101929092526044820152600192919091169060640160408051601f198184030181529190526020810180516001600160e01b0316631decdcfb60e11b179052620186a0610f14565b506001600160a01b038616600081815260366020908152604091829020548251908152349181019190915290810186905260608101849052608081018390527f7737fe59897f758714c24688a6470bb05235f01af1f4293edd0c290e651dd8319060a00160405180910390a295945050505050565b610724610b73565b6000816001600160a01b03164760405160006040518083038185875af1925050503d8060008114610771576040519150601f19603f3d011682016040523d82523d6000602084013e610776565b606091505b50509050806107c75760405162461bcd60e51b815260206004820152601c60248201527f4f6d6e6947617350756d703a207769746864726177206661696c6564000000006044820152606401610566565b5050565b600080606060006107da6108e0565b90508085101561081957505060408051808201909152601081526f696e73756666696369656e742066656560801b6020820152600092508291506108a6565b6108238186611670565b945060345485111561085c5750506040805180820190915260088152670deeccae440dac2f60c31b6020820152600092508291506108a6565b6103e86035548661086d9190611683565b610877919061169a565b6108819086611670565b945061088c85610d81565b600160405180602001604052806000815250935093509350505b9193909250565b6108b5610b73565b610502600061105e565b6108c7610b73565b6104de816110cf565b6108d8610b73565b610502611173565b60006001600160a01b036000196109476108f8610e97565b6040516001600160a01b03851660248201526044810184905260640160408051601f198184030181529190526020810180516001600160e01b0316631decdcfb60e11b179052620186a06111bc565b9250505090565b610956610b73565b6104de8161123a565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156109a55750825b905060008267ffffffffffffffff1660011480156109c25750303b155b9050811580156109d0575080155b156109ee5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a1857845460ff60401b1916600160401b1785555b610a30610a2b6040880160208901611590565b6110cf565b610a45610a406020880188611590565b610bce565b610a528660800135610c79565b610a5f8660a0013561123a565b610a79610a726060880160408901611590565b60016112c0565b610a91610a8c6080880160608901611590565b6112da565b8315610ad757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b600080610aeb836112eb565b90506035546103e8610afd9190611670565b610b096103e883611683565b610b13919061169a565b610b1d90826116bc565b9050610b276108e0565b610b3190826116bc565b9392505050565b610b40610b73565b6001600160a01b038116610b6a57604051631e4fbdf760e01b815260006004820152602401610566565b6104de8161105e565b33610ba57f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c199300546001600160a01b031690565b6001600160a01b0316146105025760405163118cdaa760e01b8152336004820152602401610566565b6001600160a01b038116610c245760405162461bcd60e51b815260206004820152601960248201527f4f6d6e6947617350756d703a207a65726f2061646472657373000000000000006044820152606401610566565b603380546001600160a01b0319166001600160a01b0383169081179091556040519081527ffd263e3b7583e8397be8a61710d1105cf8c0f111bbac1014d0ec7dbcd1e422f1906020015b60405180910390a150565b60008111610cc15760405162461bcd60e51b815260206004820152601560248201527409edadcd28ec2e6a0eadae07440f4cae4de40dac2f605b1b6044820152606401610566565b60348190556040518181527f343ecf9262f8cafd2e9b0ffdab9f14bf18a17899eeef3e41133e84c354e5298390602001610c6e565b610cfe6113b7565b60008051602061179a833981519152805460ff191681557f5db9ee0a495bf2e6ff9c91a7834c1ba4fdd244a5e8aa4e537bd38aeae4b073aa335b6040516001600160a01b039091168152602001610c6e565b60008051602061179a8339815191525460ff16156105025760405163d93c066560e01b815260040160405180910390fd5b6032546000906001600160a01b0316638b7bfd70610d9d610e97565b6040516001600160e01b031960e084901b16815267ffffffffffffffff9091166004820152602401602060405180830381865afa158015610de2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0691906116cf565b603260009054906101000a90046001600160a01b03166001600160a01b0316638f9d6ace6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e7d91906116cf565b610e879084611683565b610e91919061169a565b92915050565b60008060009054906101000a90046001600160a01b03166001600160a01b031663110ff5f16040518163ffffffff1660e01b8152600401602060405180830381865afa158015610eeb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f0f91906116e8565b905090565b60008054604051632376548f60e21b815282916001600160a01b031690638dd9523c90610f49908a9088908890600401611712565b602060405180830381865afa158015610f66573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8a91906116cf565b90508047101580610f9b5750803410155b610fe75760405162461bcd60e51b815260206004820152601860248201527f584170703a20696e73756666696369656e742066756e647300000000000000006044820152606401610566565b60005460405163c21dda4f60e01b81526001600160a01b039091169063c21dda4f908390611021908b908b908b908b908b90600401611749565b6000604051808303818588803b15801561103a57600080fd5b505af115801561104e573d6000803e3d6000fd5b50939a9950505050505050505050565b7f9016d09d72d40fdae2fd8ceac6b6234c7706214fd39c1cd1e609a0528c19930080546001600160a01b031981166001600160a01b03848116918217845560405192169182907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a3505050565b6001600160a01b0381166111255760405162461bcd60e51b815260206004820152601860248201527f4f6d6e6947617350756d703a207a65726f206f7261636c6500000000000000006044820152606401610566565b603280546001600160a01b0319166001600160a01b0383169081179091556040519081527f3f32684a32a11dabdbb8c0177de80aa3ae36a004d75210335b49e544e48cd0aa90602001610c6e565b61117b610d50565b60008051602061179a833981519152805460ff191660011781557f62e78cea01bee320cd4e420270b5ea74000d11b0c9f74754ebdbfc544b05a25833610d38565b60008054604051632376548f60e21b81526001600160a01b0390911690638dd9523c906111f190879087908790600401611712565b602060405180830381865afa15801561120e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061123291906116cf565b949350505050565b6103e8811061128b5760405162461bcd60e51b815260206004820152601960248201527f4f6d6e6947617350756d703a2070637420746f6f2068696768000000000000006044820152606401610566565b60358190556040518181527f0b3d400288f60ce0f5632cd941b5748faa91ebea844cbe78c5180b7838a0933f90602001610c6e565b6112c86113e7565b6112d182611430565b6107c7816114c9565b6112e26113e7565b6104de8161156c565b603254604080516347ceb56760e11b815290516000926001600160a01b031691638f9d6ace9160048083019260209291908290030181865afa158015611335573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061135991906116cf565b6032546001600160a01b0316638b7bfd70611372610e97565b6040516001600160e01b031960e084901b16815267ffffffffffffffff9091166004820152602401602060405180830381865afa158015610e59573d6000803e3d6000fd5b60008051602061179a8339815191525460ff1661050257604051638dfc202b60e01b815260040160405180910390fd5b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661050257604051631afcd79f60e31b815260040160405180910390fd5b6001600160a01b03811661147b5760405162461bcd60e51b8152602060048201526012602482015271584170703a206e6f207a65726f206f6d6e6960701b6044820152606401610566565b600080546001600160a01b0319166001600160a01b0383169081179091556040519081527f79162c8d053a07e70cdc1ccc536f0440b571f8508377d2bef51094fadab98f4790602001610c6e565b6114d281611574565b61151e5760405162461bcd60e51b815260206004820152601860248201527f584170703a20696e76616c696420636f6e66206c6576656c00000000000000006044820152606401610566565b6000805460ff60a01b1916600160a01b60ff8416908102919091179091556040519081527f8de08a798b4e50b4f351c1eaa91a11530043802be3ffac2df87db0c45a2e848390602001610c6e565b610b406113e7565b600060ff821660011480610e91575060ff821660041492915050565b6000602082840312156115a257600080fd5b81356001600160a01b0381168114610b3157600080fd5b6000602082840312156115cb57600080fd5b5035919050565b6000815180845260005b818110156115f8576020818501810151868301820152016115dc565b506000602082860101526020601f19601f83011685010191505092915050565b838152821515602082015260606040820152600061163960608301846115d2565b95945050505050565b600060c0828403121561165457600080fd5b50919050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610e9157610e9161165a565b8082028115828204841417610e9157610e9161165a565b6000826116b757634e487b7160e01b600052601260045260246000fd5b500490565b80820180821115610e9157610e9161165a565b6000602082840312156116e157600080fd5b5051919050565b6000602082840312156116fa57600080fd5b815167ffffffffffffffff81168114610b3157600080fd5b600067ffffffffffffffff80861683526060602084015261173660608401866115d2565b9150808416604084015250949350505050565b600067ffffffffffffffff808816835260ff8716602084015260018060a01b038616604084015260a0606084015261178460a08401866115d2565b9150808416608084015250969550505050505056fecd5ed15c6e187e77e9aee88184c21f4f2182ab5827cb3b7e07fbedcd63f03300a26469706673582212203c627f4af6a46147533f47a4c3a9ae87b84ba76816bc2af977daa60e385550e364736f6c63430008180033", } // OmniGasPumpABI is the input ABI used to generate the binding from. From 1cef786444817c7de402b3fd1a9edc9ad2cc8571 Mon Sep 17 00:00:00 2001 From: fabtreb <70035807+fabtreb@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:02:20 +0200 Subject: [PATCH 5/5] chore(contracts): cleanup --- .gitmodules | 6 ------ lib/forge-std | 1 - lib/openzeppelin-contracts | 1 - 3 files changed, 8 deletions(-) delete mode 100644 .gitmodules delete mode 160000 lib/forge-std delete mode 160000 lib/openzeppelin-contracts diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f5a571c9e..000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "lib/openzeppelin-contracts"] - path = lib/openzeppelin-contracts - url = https://github.com/OpenZeppelin/openzeppelin-contracts -[submodule "lib/forge-std"] - path = lib/forge-std - url = https://github.com/foundry-rs/forge-std diff --git a/lib/forge-std b/lib/forge-std deleted file mode 160000 index 1714bee72..000000000 --- a/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1714bee72e286e73f76e320d110e0eaf5c4e649d diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts deleted file mode 160000 index dbb6104ce..000000000 --- a/lib/openzeppelin-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dbb6104ce834628e473d2173bbc9d47f81a9eec3