commit 3186f0b58ee27b0217180ec1952175883839e010
parent 7bc32123cf58a0869b965d81f741623c64efdf84
Author: lash <dev@holbrook.no>
Date: Thu, 3 Aug 2023 16:01:13 +0100
Remove declaration from contract, interface
Diffstat:
10 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
@@ -16,12 +16,10 @@ It satisfies the [CIC TokenSwap](https://git.grassecon.net/cicnet/cic-contracts/
## Publishing the contract
-There are six constructor arguments.
+There are five constructor arguments.
The first three, `name`, `symbol` and `decimals` have matching getter methods, are analogous to the ERC20 methods of the same name.
-The `declaration` parameter is optional and can be any arbitrary content. Typically it defines a content hash of data describing the pool resource. A value of `bytes32(0x0)` means "no declaration defined."
-
The `tokenRegistry` parameter takes an address to a smart contract controlling which tokens are allowed in the pool. See "Token approval" below. A value of `address(0x0)` deactivates this control, and allows the pool to hold all tokens by default (although they may still be subject to value limits).
The `tokenLimiter` parameter takes an address to a smart contract controlling value limits of tokens in the pool. See "Token limits" below. A value of `address(0x0)` deactivates this control, and allows any value of (approved) tokens to be held by the pool.
@@ -86,17 +84,24 @@ Fee is defined in _parts-per-million_, i.e. `1000000` equals `100%`. Any value l
By default, all deducted fees are credited to the pool contract.
-Using the `setFeeAddress` method, an external beneficiary for the fees may be defined. That beneficiary will be eligible to receive all fees pending external payment _from that moment on_. Note that this does also include any fees that were not already claimed by a previous beneficiary.
+Using the `setFeeAddress` method, an external beneficiary for the fees may be defined. That beneficiary will be eligible to receive all fees pending external payment _from that moment on_.
+
+**Important!** Note that this does also include any fees that were not already claimed by a previous beneficiary.
#### Withdrawing fees
-Fees to be paid externally are accounted for internally in the contract, and may be withdrawn at any time using either the `withdraw(outToken)` or `withdraw(outToken, value)` method. (Note the difference in method signature from the exchange method: `withdraw(outToken, inToken, value)`.
+Fees to be paid externally are accounted for internally in the contract, and may be withdrawn at any time using either the `withdraw(outToken)` or `withdraw(outToken, value)` method.
+
+Note the difference between the fee withdrawal methods, and the method signature from the exchange method: `withdraw(outToken, inToken, value)`.
-## Sealing the contract
+
+## Sealing contract properties
The contract implements the [CIC Seal](https://git.grassecon.net/cicnet/cic-contracts/#seal) interface for the following properties:
- Fee value
- Fee address
- Quoter contract address
+
+Sealing allowed token lists and/or their respective value limits is the responsibility of the provider contracts themselves.
diff --git a/python/erc20_pool/data/DecimalQuote.bin b/python/erc20_pool/data/DecimalQuote.bin
@@ -1 +1 @@
-608060405234801561001057600080fd5b50610959806100206000396000f3fe608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063dbb21d401461004d575b600080fd5b6100676004803603810190610062919061044b565b61007d565b60405161007491906104ad565b60405180910390f35b600080600080600060608873ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161012e9190610539565b6000604051808303816000865af19150503d806000811461016b576040519150601f19603f3d011682016040523d82523d6000602084013e610170565b606091505b508092508193505050816101b9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101b0906105ad565b60405180910390fd5b808060200190518101906101cd9190610606565b94508773ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516102769190610539565b6000604051808303816000865af19150503d80600081146102b3576040519150601f19603f3d011682016040523d82523d6000602084013e6102b8565b606091505b50809250819350505081610301576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102f89061067f565b60405180910390fd5b808060200190518101906103159190610606565b93508460ff168460ff16036103315786955050505050506103ab565b8460ff168460ff16111561037757848461034b91906106ce565b60ff16925082600a61035d9190610836565b9250828761036b91906108b0565b955050505050506103ab565b838561038391906106ce565b60ff16925082600a6103959190610836565b925082876103a391906108e1565b955050505050505b9392505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103e2826103b7565b9050919050565b6103f2816103d7565b81146103fd57600080fd5b50565b60008135905061040f816103e9565b92915050565b6000819050919050565b61042881610415565b811461043357600080fd5b50565b6000813590506104458161041f565b92915050565b600080600060608486031215610464576104636103b2565b5b600061047286828701610400565b935050602061048386828701610400565b925050604061049486828701610436565b9150509250925092565b6104a781610415565b82525050565b60006020820190506104c2600083018461049e565b92915050565b600081519050919050565b600081905092915050565b60005b838110156104fc5780820151818401526020810190506104e1565b60008484015250505050565b6000610513826104c8565b61051d81856104d3565b935061052d8185602086016104de565b80840191505092915050565b60006105458284610508565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e5f4f555400000000000000000000000000000000000000600082015250565b6000610597600d83610550565b91506105a282610561565b602082019050919050565b600060208201905081810360008301526105c68161058a565b9050919050565b600060ff82169050919050565b6105e3816105cd565b81146105ee57600080fd5b50565b600081519050610600816105da565b92915050565b60006020828403121561061c5761061b6103b2565b5b600061062a848285016105f1565b91505092915050565b7f4552525f544f4b454e5f494e0000000000000000000000000000000000000000600082015250565b6000610669600c83610550565b915061067482610633565b602082019050919050565b600060208201905081810360008301526106988161065c565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006106d9826105cd565b91506106e4836105cd565b9250828203905060ff8111156106fd576106fc61069f565b5b92915050565b6000600282049050919050565b6000808291508390505b600185111561075a578086048111156107365761073561069f565b5b60018516156107455780820291505b808102905061075385610703565b945061071a565b94509492505050565b600082610773576001905061082f565b81610781576000905061082f565b816001811461079757600281146107a1576107d0565b600191505061082f565b60ff8411156107b3576107b261069f565b5b8360020a9150848211156107ca576107c961069f565b5b5061082f565b5060208310610133831016604e8410600b84101617156108055782820a905083811115610800576107ff61069f565b5b61082f565b6108128484846001610710565b925090508184048111156108295761082861069f565b5b81810290505b9392505050565b600061084182610415565b915061084c83610415565b92506108797fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610763565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b60006108bb82610415565b91506108c683610415565b9250826108d6576108d5610881565b5b828204905092915050565b60006108ec82610415565b91506108f783610415565b925082820261090581610415565b9150828204841483151761091c5761091b61069f565b5b509291505056fea2646970667358221220d5158317b909ae1dff296180a23a193937699a60bd3432fb19c10b242cd54d4c64736f6c63430008130033
-\ No newline at end of file
+608060405234801561001057600080fd5b50610aff806100206000396000f3fe608060405234801561001057600080fd5b5060043610610053576000357c01000000000000000000000000000000000000000000000000000000009004806301ffc9a714610058578063dbb21d4014610088575b600080fd5b610072600480360381019061006d91906104fa565b6100b8565b60405161007f9190610542565b60405180910390f35b6100a2600480360381019061009d91906105f1565b610168565b6040516100af9190610653565b60405180910390f35b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361010c5760019050610163565b63dbb21d407c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361015e5760019050610163565b600090505b919050565b600080600080600060608873ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161021991906106df565b6000604051808303816000865af19150503d8060008114610256576040519150601f19603f3d011682016040523d82523d6000602084013e61025b565b606091505b508092508193505050816102a4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161029b90610753565b60405180910390fd5b808060200190518101906102b891906107ac565b94508773ffffffffffffffffffffffffffffffffffffffff166040516024016040516020818303038152906040527f313ce567000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161036191906106df565b6000604051808303816000865af19150503d806000811461039e576040519150601f19603f3d011682016040523d82523d6000602084013e6103a3565b606091505b508092508193505050816103ec576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103e390610825565b60405180910390fd5b8080602001905181019061040091906107ac565b93508460ff168460ff160361041c578695505050505050610496565b8460ff168460ff1611156104625784846104369190610874565b60ff16925082600a61044891906109dc565b925082876104569190610a56565b95505050505050610496565b838561046e9190610874565b60ff16925082600a61048091906109dc565b9250828761048e9190610a87565b955050505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6104d7816104a2565b81146104e257600080fd5b50565b6000813590506104f4816104ce565b92915050565b6000602082840312156105105761050f61049d565b5b600061051e848285016104e5565b91505092915050565b60008115159050919050565b61053c81610527565b82525050565b60006020820190506105576000830184610533565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006105888261055d565b9050919050565b6105988161057d565b81146105a357600080fd5b50565b6000813590506105b58161058f565b92915050565b6000819050919050565b6105ce816105bb565b81146105d957600080fd5b50565b6000813590506105eb816105c5565b92915050565b60008060006060848603121561060a5761060961049d565b5b6000610618868287016105a6565b9350506020610629868287016105a6565b925050604061063a868287016105dc565b9150509250925092565b61064d816105bb565b82525050565b60006020820190506106686000830184610644565b92915050565b600081519050919050565b600081905092915050565b60005b838110156106a2578082015181840152602081019050610687565b60008484015250505050565b60006106b98261066e565b6106c38185610679565b93506106d3818560208601610684565b80840191505092915050565b60006106eb82846106ae565b915081905092915050565b600082825260208201905092915050565b7f4552525f544f4b454e5f4f555400000000000000000000000000000000000000600082015250565b600061073d600d836106f6565b915061074882610707565b602082019050919050565b6000602082019050818103600083015261076c81610730565b9050919050565b600060ff82169050919050565b61078981610773565b811461079457600080fd5b50565b6000815190506107a681610780565b92915050565b6000602082840312156107c2576107c161049d565b5b60006107d084828501610797565b91505092915050565b7f4552525f544f4b454e5f494e0000000000000000000000000000000000000000600082015250565b600061080f600c836106f6565b915061081a826107d9565b602082019050919050565b6000602082019050818103600083015261083e81610802565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061087f82610773565b915061088a83610773565b9250828203905060ff8111156108a3576108a2610845565b5b92915050565b6000600282049050919050565b6000808291508390505b6001851115610900578086048111156108dc576108db610845565b5b60018516156108eb5780820291505b80810290506108f9856108a9565b94506108c0565b94509492505050565b60008261091957600190506109d5565b8161092757600090506109d5565b816001811461093d576002811461094757610976565b60019150506109d5565b60ff84111561095957610958610845565b5b8360020a9150848211156109705761096f610845565b5b506109d5565b5060208310610133831016604e8410600b84101617156109ab5782820a9050838111156109a6576109a5610845565b5b6109d5565b6109b884848460016108b6565b925090508184048111156109cf576109ce610845565b5b81810290505b9392505050565b60006109e7826105bb565b91506109f2836105bb565b9250610a1f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610909565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b6000610a61826105bb565b9150610a6c836105bb565b925082610a7c57610a7b610a27565b5b828204905092915050565b6000610a92826105bb565b9150610a9d836105bb565b9250828202610aab816105bb565b91508282048414831517610ac257610ac1610845565b5b509291505056fea2646970667358221220a6b8fddaa75c73235586d42c8a9005589297f778906457325b66b18ddcebbeed64736f6c63430008130033
+\ No newline at end of file
diff --git a/python/erc20_pool/data/DecimalQuote.json b/python/erc20_pool/data/DecimalQuote.json
@@ -1 +1 @@
-[{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
diff --git a/python/erc20_pool/data/DecimalQuote.metadata.json b/python/erc20_pool/data/DecimalQuote.metadata.json
@@ -1 +1 @@
-{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"DecimalQuote.sol":"DecimalQuote"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"DecimalQuote.sol":{"keccak256":"0x453d0df7b322f881762fad835815cd2355542655bbff0747ba24733d46ef3efa","license":"AGPL-3.0-or-later","urls":["bzz-raw://0ae7c5b7e66ecdc9c63c4ce71a0a556cae7e9dd9fd8500ed0d8af406e3b2166c","dweb:/ipfs/QmWGJ7mBr14yEn1PnKtMj3PNTtBaCP6TnwPosJ3oXYkUan"]}},"version":1}
+{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"valueFor","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"DecimalQuote.sol":"DecimalQuote"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"DecimalQuote.sol":{"keccak256":"0x4053ab914f5f3b89b17af0e091de359c808058461d12502cf53d495b5abc31b4","license":"AGPL-3.0-or-later","urls":["bzz-raw://496e4f4a2039dc9447d04db14ce8624b4caf2038cf017c56f632157a50f69cae","dweb:/ipfs/QmWDRaBfANxZrKb73AziafrbB5tZkgYjvd1ym1vGje47Ui"]}},"version":1}
diff --git a/python/erc20_pool/data/SwapPool.bin b/python/erc20_pool/data/SwapPool.bin
@@ -1 +1 @@
-60a06040523480156200001157600080fd5b5060405162003116380380620031168339818101604052810190620000379190620003ac565b8560079081620000489190620006d7565b5084600890816200005a9190620006d7565b508360ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600681905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505050620007be565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b620001a48262000159565b810181811067ffffffffffffffff82111715620001c657620001c56200016a565b5b80604052505050565b6000620001db6200013b565b9050620001e9828262000199565b919050565b600067ffffffffffffffff8211156200020c576200020b6200016a565b5b620002178262000159565b9050602081019050919050565b60005b838110156200024457808201518184015260208101905062000227565b60008484015250505050565b6000620002676200026184620001ee565b620001cf565b90508281526020810184848401111562000286576200028562000154565b5b6200029384828562000224565b509392505050565b600082601f830112620002b357620002b26200014f565b5b8151620002c584826020860162000250565b91505092915050565b600060ff82169050919050565b620002e681620002ce565b8114620002f257600080fd5b50565b6000815190506200030681620002db565b92915050565b6000819050919050565b62000321816200030c565b81146200032d57600080fd5b50565b600081519050620003418162000316565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003748262000347565b9050919050565b620003868162000367565b81146200039257600080fd5b50565b600081519050620003a6816200037b565b92915050565b60008060008060008060c08789031215620003cc57620003cb62000145565b5b600087015167ffffffffffffffff811115620003ed57620003ec6200014a565b5b620003fb89828a016200029b565b965050602087015167ffffffffffffffff8111156200041f576200041e6200014a565b5b6200042d89828a016200029b565b95505060406200044089828a01620002f5565b94505060606200045389828a0162000330565b93505060806200046689828a0162000395565b92505060a06200047989828a0162000395565b9150509295509295509295565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620004d957607f821691505b602082108103620004ef57620004ee62000491565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b6000600883026200055c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826200051a565b6200056886836200051a565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620005b5620005af620005a98462000580565b6200058a565b62000580565b9050919050565b6000819050919050565b620005d18362000594565b620005e9620005e082620005bc565b8484546200052a565b825550505050565b600090565b62000600620005f1565b6200060d818484620005c6565b505050565b5b81811015620006355762000629600082620005f6565b60018101905062000613565b5050565b601f82111562000684576200064e81620004f5565b62000659846200050a565b8101602085101562000669578190505b6200068162000678856200050a565b83018262000612565b50505b505050565b60008160020a8304905092915050565b6000620006ac6000198460080262000689565b1980831691505092915050565b6000620006c7838362000699565b9150826002028217905092915050565b620006e28262000486565b67ffffffffffffffff811115620006fe57620006fd6200016a565b5b6200070a8254620004c0565b6200071782828562000639565b600060209050601f8311600181146200074f57600084156200073a578287015190505b620007468582620006b9565b865550620007b6565b601f1984166200075f86620004f5565b60005b82811015620007895784890151825560018201915060208501945060208101905062000762565b86831015620007a95784890151620007a5601f89168262000699565b8355505b6001600288020188555050505b505050505050565b60805161293c620007da6000396000610586015261293c6000f3fe608060405234801561001057600080fd5b5060043610610133576000357c01000000000000000000000000000000000000000000000000000000009004806369fe0e2d116100bf57806395d89b411161008e57806395d89b4114610300578063d9caed121461031e578063f2fde38b1461033a578063f3fef3a31461036a578063f912c64b1461039a57610133565b806369fe0e2d1461027a57806386fe212d146102965780638705fcd4146102c65780638da5cb5b146102e257610133565b80632c1758c1116101065780632c1758c1146101c2578063313ce567146101f257806331a5995d1461021057806347e7ef241461022e57806351cff8d91461024a57610133565b806301ffc9a71461013857806306fdde031461016857806318160ddd1461018657806318cbbcfc146101a4575b600080fd5b610152600480360381019061014d9190611cd4565b6103b6565b60405161015f9190611d1c565b60405180910390f35b6101706104b8565b60405161017d9190611dc7565b60405180910390f35b61018e610546565b60405161019b9190611e02565b60405180910390f35b6101ac61054c565b6040516101b99190611e02565b60405180910390f35b6101dc60048036038101906101d79190611e49565b610551565b6040516101e99190611d1c565b60405180910390f35b6101fa610584565b6040516102079190611e02565b60405180910390f35b6102186105a8565b6040516102259190611e02565b60405180910390f35b61024860048036038101906102439190611ed4565b6105ae565b005b610264600480360381019061025f9190611f14565b61079e565b6040516102719190611e02565b60405180910390f35b610294600480360381019061028f9190611e49565b61083a565b005b6102b060048036038101906102ab9190611e49565b610964565b6040516102bd9190611e02565b60405180910390f35b6102e060048036038101906102db9190611f14565b610a4c565b005b6102ea610b6b565b6040516102f79190611f50565b60405180910390f35b610308610b8f565b6040516103159190611dc7565b60405180910390f35b61033860048036038101906103339190611f6b565b610c1d565b005b610354600480360381019061034f9190611f14565b611043565b6040516103619190611d1c565b60405180910390f35b610384600480360381019061037f9190611ed4565b611185565b6040516103919190611e02565b60405180910390f35b6103b460048036038101906103af9190611f14565b6113dd565b005b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361040a57600190506104b3565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361045c57600190506104b3565b630d7491f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104ae57600190506104b3565b600090505b919050565b600780546104c590611fed565b80601f01602080910402602001604051908101604052809291908181526020018280546104f190611fed565b801561053e5780601f106105135761010080835404028352916020019161053e565b820191906000526020600020905b81548152906001019060200180831161052157829003601f168201915b505050505081565b60095481565b600781565b60006007821061056057600080fd5b60008203610575576007600b5414905061057f565b81600b5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600b5481565b600060606105de84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166114fc565b6105e884846116d5565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106149392919061207d565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161069e91906120fb565b6000604051808303816000865af19150503d80600081146106db576040519150601f19603f3d011682016040523d82523d6000602084013e6106e0565b606091505b50809250819350505081610729576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107209061215e565b60405180910390fd5b8080602001905181019061073d91906121aa565b91508161077f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161077690612223565b60405180910390fd5b82600960008282546107919190612272565b9250508190555050505050565b600080600a60008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600a60008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108328382611185565b915050919050565b610847600160ff16610551565b15610887576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161087e906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610915576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090c9061235e565b60405180910390fd5b620f4240811061095a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610951906123ca565b60405180910390fd5b8060048190555050565b600060078211156109aa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a190612436565b60405180910390fd5b6000600b548316146109f1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e8906124a2565b60405180910390fd5b81600b600082825417925050819055506007600b541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600b54604051610a3a9190611e02565b60405180910390a2600b549050919050565b610a59600260ff16610551565b15610a99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a90906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b27576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b1e9061235e565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60088054610b9c90611fed565b80601f0160208091040260200160405190810160405280929190818152602001828054610bc890611fed565b8015610c155780601f10610bea57610100808354040283529160200191610c15565b820191906000526020600020905b815481529060010190602001808311610bf857829003601f168201915b505050505081565b600060606000806000610c2f86611a5c565b90508086610c3d91906124c2565b9250610c4a888885611a89565b92508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610c7491906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cfe91906120fb565b6000604051808303816000865af19150503d8060008114610d3b576040519150601f19603f3d011682016040523d82523d6000602084013e610d40565b606091505b50809550819650505084610d89576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d809061215e565b60405180910390fd5b83806020019051810190610d9d9190612526565b91508083610dab9190612272565b821015610ded576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de49061259f565b60405180910390fd5b610df787876105ae565b8773ffffffffffffffffffffffffffffffffffffffff163384604051602401610e219291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eab91906120fb565b6000604051808303816000865af19150503d8060008114610ee8576040519150601f19603f3d011682016040523d82523d6000602084013e610eed565b606091505b50809550819650505084610f36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f2d9061215e565b60405180910390fd5b83806020019051810190610f4a91906121aa565b945084610f8c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f8390612223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146110395780600a60008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110319190612272565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461109e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361121b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112129061235e565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016112679291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112f191906120fb565b6000604051808303816000865af19150503d806000811461132e576040519150601f19603f3d011682016040523d82523d6000602084013e611333565b606091505b5080925081935050508161137c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113739061215e565b60405180910390fd5b8080602001905181019061139091906121aa565b9150816113d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113c990612223565b60405180910390fd5b839250505092915050565b6113ea600460ff16610551565b1561142a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611421906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114b8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114af9061235e565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361153b5750506116d1565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016115639190611f50565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115ed91906120fb565b6000604051808303816000865af19150503d806000811461162a576040519150601f19603f3d011682016040523d82523d6000602084013e61162f565b606091505b50809250819350505081611678576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161166f90612634565b60405180910390fd5b8080602001905181019061168c91906121aa565b9150816116ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116c5906126a0565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361173b5750505050611a58565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686306040516024016117879291906126c0565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161181191906120fb565b6000604051808303816000865af19150503d806000811461184e576040519150601f19603f3d011682016040523d82523d6000602084013e611853565b606091505b5080945081955050508361189c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161189390612735565b60405180910390fd5b828060200190518101906118b09190612526565b91508573ffffffffffffffffffffffffffffffffffffffff16306040516024016118da91906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161196491906120fb565b6000604051808303816000865af19150503d80600081146119a1576040519150601f19603f3d011682016040523d82523d6000602084013e6119a6565b606091505b508094508195505050836119ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119e69061215e565b60405180910390fd5b82806020019051810190611a039190612526565b9050818582611a129190612272565b1115611a53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a4a906127a1565b60405180910390fd5b505050505b5050565b60008060045483611a6d91906127c1565b9050620f424081611a7e9190612832565b905080915050919050565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611af057849350505050611c70565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401611b3e93929190612863565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bc891906120fb565b6000604051808303816000865af19150503d8060008114611c05576040519150601f19603f3d011682016040523d82523d6000602084013e611c0a565b606091505b50809350819450505082611c53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4a906128e6565b60405180910390fd5b81806020019051810190611c679190612526565b90508093505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611cb181611c7c565b8114611cbc57600080fd5b50565b600081359050611cce81611ca8565b92915050565b600060208284031215611cea57611ce9611c77565b5b6000611cf884828501611cbf565b91505092915050565b60008115159050919050565b611d1681611d01565b82525050565b6000602082019050611d316000830184611d0d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611d71578082015181840152602081019050611d56565b60008484015250505050565b6000601f19601f8301169050919050565b6000611d9982611d37565b611da38185611d42565b9350611db3818560208601611d53565b611dbc81611d7d565b840191505092915050565b60006020820190508181036000830152611de18184611d8e565b905092915050565b6000819050919050565b611dfc81611de9565b82525050565b6000602082019050611e176000830184611df3565b92915050565b611e2681611de9565b8114611e3157600080fd5b50565b600081359050611e4381611e1d565b92915050565b600060208284031215611e5f57611e5e611c77565b5b6000611e6d84828501611e34565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611ea182611e76565b9050919050565b611eb181611e96565b8114611ebc57600080fd5b50565b600081359050611ece81611ea8565b92915050565b60008060408385031215611eeb57611eea611c77565b5b6000611ef985828601611ebf565b9250506020611f0a85828601611e34565b9150509250929050565b600060208284031215611f2a57611f29611c77565b5b6000611f3884828501611ebf565b91505092915050565b611f4a81611e96565b82525050565b6000602082019050611f656000830184611f41565b92915050565b600080600060608486031215611f8457611f83611c77565b5b6000611f9286828701611ebf565b9350506020611fa386828701611ebf565b9250506040611fb486828701611e34565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061200557607f821691505b60208210810361201857612017611fbe565b5b50919050565b6000819050919050565b600061204361203e61203984611e76565b61201e565b611e76565b9050919050565b600061205582612028565b9050919050565b60006120678261204a565b9050919050565b6120778161205c565b82525050565b60006060820190506120926000830186611f41565b61209f602083018561206e565b6120ac6040830184611df3565b949350505050565b600081519050919050565b600081905092915050565b60006120d5826120b4565b6120df81856120bf565b93506120ef818560208601611d53565b80840191505092915050565b600061210782846120ca565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612148600983611d42565b915061215382612112565b602082019050919050565b600060208201905081810360008301526121778161213b565b9050919050565b61218781611d01565b811461219257600080fd5b50565b6000815190506121a48161217e565b92915050565b6000602082840312156121c0576121bf611c77565b5b60006121ce84828501612195565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b600061220d600c83611d42565b9150612218826121d7565b602082019050919050565b6000602082019050818103600083015261223c81612200565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061227d82611de9565b915061228883611de9565b92508282019050808211156122a05761229f612243565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006122dc600883611d42565b91506122e7826122a6565b602082019050919050565b6000602082019050818103600083015261230b816122cf565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612348600783611d42565b915061235382612312565b602082019050919050565b600060208201905081810360008301526123778161233b565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006123b4601083611d42565b91506123bf8261237e565b602082019050919050565b600060208201905081810360008301526123e3816123a7565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612420601183611d42565b915061242b826123ea565b602082019050919050565b6000602082019050818103600083015261244f81612413565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061248c601283611d42565b915061249782612456565b602082019050919050565b600060208201905081810360008301526124bb8161247f565b9050919050565b60006124cd82611de9565b91506124d883611de9565b92508282039050818111156124f0576124ef612243565b5b92915050565b600060208201905061250b600083018461206e565b92915050565b60008151905061252081611e1d565b92915050565b60006020828403121561253c5761253b611c77565b5b600061254a84828501612511565b91505092915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612589600b83611d42565b915061259482612553565b602082019050919050565b600060208201905081810360008301526125b88161257c565b9050919050565b60006040820190506125d46000830185611f41565b6125e16020830184611df3565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061261e600c83611d42565b9150612629826125e8565b602082019050919050565b6000602082019050818103600083015261264d81612611565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b600061268a601083611d42565b915061269582612654565b602082019050919050565b600060208201905081810360008301526126b98161267d565b9050919050565b60006040820190506126d56000830185611f41565b6126e2602083018461206e565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061271f600b83611d42565b915061272a826126e9565b602082019050919050565b6000602082019050818103600083015261274e81612712565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b600061278b600983611d42565b915061279682612755565b602082019050919050565b600060208201905081810360008301526127ba8161277e565b9050919050565b60006127cc82611de9565b91506127d783611de9565b92508282026127e581611de9565b915082820484148315176127fc576127fb612243565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061283d82611de9565b915061284883611de9565b92508261285857612857612803565b5b828204905092915050565b60006060820190506128786000830186611f41565b6128856020830185611f41565b6128926040830184611df3565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006128d0600a83611d42565b91506128db8261289a565b602082019050919050565b600060208201905081810360008301526128ff816128c3565b905091905056fea2646970667358221220bfdeea1c87787b34e973818c97c85e2e15376268e426b1ddde3443090928515564736f6c63430008130033
-\ No newline at end of file
+60a06040523480156200001157600080fd5b50604051620030bf380380620030bf833981810160405281019062000037919062000369565b846006908162000048919062000680565b5083600790816200005a919062000680565b508260ff166080818152505081600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050505062000767565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6200019c8262000151565b810181811067ffffffffffffffff82111715620001be57620001bd62000162565b5b80604052505050565b6000620001d362000133565b9050620001e1828262000191565b919050565b600067ffffffffffffffff82111562000204576200020362000162565b5b6200020f8262000151565b9050602081019050919050565b60005b838110156200023c5780820151818401526020810190506200021f565b60008484015250505050565b60006200025f6200025984620001e6565b620001c7565b9050828152602081018484840111156200027e576200027d6200014c565b5b6200028b8482856200021c565b509392505050565b600082601f830112620002ab57620002aa62000147565b5b8151620002bd84826020860162000248565b91505092915050565b600060ff82169050919050565b620002de81620002c6565b8114620002ea57600080fd5b50565b600081519050620002fe81620002d3565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003318262000304565b9050919050565b620003438162000324565b81146200034f57600080fd5b50565b600081519050620003638162000338565b92915050565b600080600080600060a086880312156200038857620003876200013d565b5b600086015167ffffffffffffffff811115620003a957620003a862000142565b5b620003b78882890162000293565b955050602086015167ffffffffffffffff811115620003db57620003da62000142565b5b620003e98882890162000293565b9450506040620003fc88828901620002ed565b93505060606200040f8882890162000352565b9250506080620004228882890162000352565b9150509295509295909350565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806200048257607f821691505b6020821081036200049857620004976200043a565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b60008160020a8302905092915050565b600060088302620005057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82620004c3565b620005118683620004c3565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b60006200055e62000558620005528462000529565b62000533565b62000529565b9050919050565b6000819050919050565b6200057a836200053d565b62000592620005898262000565565b848454620004d3565b825550505050565b600090565b620005a96200059a565b620005b68184846200056f565b505050565b5b81811015620005de57620005d26000826200059f565b600181019050620005bc565b5050565b601f8211156200062d57620005f7816200049e565b6200060284620004b3565b8101602085101562000612578190505b6200062a6200062185620004b3565b830182620005bb565b50505b505050565b60008160020a8304905092915050565b6000620006556000198460080262000632565b1980831691505092915050565b600062000670838362000642565b9150826002028217905092915050565b6200068b826200042f565b67ffffffffffffffff811115620006a757620006a662000162565b5b620006b3825462000469565b620006c0828285620005e2565b600060209050601f831160018114620006f85760008415620006e3578287015190505b620006ef858262000662565b8655506200075f565b601f19841662000708866200049e565b60005b8281101562000732578489015182556001820191506020850194506020810190506200070b565b868310156200075257848901516200074e601f89168262000642565b8355505b6001600288020188555050505b505050505050565b60805161293c620007836000396000610586015261293c6000f3fe608060405234801561001057600080fd5b5060043610610133576000357c01000000000000000000000000000000000000000000000000000000009004806369fe0e2d116100bf57806395d89b411161008e57806395d89b4114610300578063d9caed121461031e578063f2fde38b1461033a578063f3fef3a31461036a578063f912c64b1461039a57610133565b806369fe0e2d1461027a57806386fe212d146102965780638705fcd4146102c65780638da5cb5b146102e257610133565b80632c1758c1116101065780632c1758c1146101c2578063313ce567146101f257806331a5995d1461021057806347e7ef241461022e57806351cff8d91461024a57610133565b806301ffc9a71461013857806306fdde031461016857806318160ddd1461018657806318cbbcfc146101a4575b600080fd5b610152600480360381019061014d9190611cd4565b6103b6565b60405161015f9190611d1c565b60405180910390f35b6101706104b8565b60405161017d9190611dc7565b60405180910390f35b61018e610546565b60405161019b9190611e02565b60405180910390f35b6101ac61054c565b6040516101b99190611e02565b60405180910390f35b6101dc60048036038101906101d79190611e49565b610551565b6040516101e99190611d1c565b60405180910390f35b6101fa610584565b6040516102079190611e02565b60405180910390f35b6102186105a8565b6040516102259190611e02565b60405180910390f35b61024860048036038101906102439190611ed4565b6105ae565b005b610264600480360381019061025f9190611f14565b61079e565b6040516102719190611e02565b60405180910390f35b610294600480360381019061028f9190611e49565b61083a565b005b6102b060048036038101906102ab9190611e49565b610964565b6040516102bd9190611e02565b60405180910390f35b6102e060048036038101906102db9190611f14565b610a4c565b005b6102ea610b6b565b6040516102f79190611f50565b60405180910390f35b610308610b8f565b6040516103159190611dc7565b60405180910390f35b61033860048036038101906103339190611f6b565b610c1d565b005b610354600480360381019061034f9190611f14565b611043565b6040516103619190611d1c565b60405180910390f35b610384600480360381019061037f9190611ed4565b611185565b6040516103919190611e02565b60405180910390f35b6103b460048036038101906103af9190611f14565b6113dd565b005b60006301ffc9a77c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361040a57600190506104b3565b639493f8b27c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19160361045c57600190506104b3565b630d7491f87c010000000000000000000000000000000000000000000000000000000002827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916036104ae57600190506104b3565b600090505b919050565b600680546104c590611fed565b80601f01602080910402602001604051908101604052809291908181526020018280546104f190611fed565b801561053e5780601f106105135761010080835404028352916020019161053e565b820191906000526020600020905b81548152906001019060200180831161052157829003601f168201915b505050505081565b60085481565b600781565b60006007821061056057600080fd5b60008203610575576007600a5414905061057f565b81600a5483161490505b919050565b7f000000000000000000000000000000000000000000000000000000000000000081565b600a5481565b600060606105de84600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166114fc565b6105e884846116d5565b8373ffffffffffffffffffffffffffffffffffffffff163330856040516024016106149392919061207d565b6040516020818303038152906040527f23b872dd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161069e91906120fb565b6000604051808303816000865af19150503d80600081146106db576040519150601f19603f3d011682016040523d82523d6000602084013e6106e0565b606091505b50809250819350505081610729576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107209061215e565b60405180910390fd5b8080602001905181019061073d91906121aa565b91508161077f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161077690612223565b60405180910390fd5b82600860008282546107919190612272565b9250508190555050505050565b600080600960008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490506000600960008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506108328382611185565b915050919050565b610847600160ff16610551565b15610887576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161087e906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610915576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161090c9061235e565b60405180910390fd5b620f4240811061095a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610951906123ca565b60405180910390fd5b8060048190555050565b600060078211156109aa576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a190612436565b60405180910390fd5b6000600a548316146109f1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e8906124a2565b60405180910390fd5b81600a600082825417925050819055506007600a541415157f6b7e2e653f93b645d4ed7292d6429f96637084363e477c8aaea1a43ed13c284e600a54604051610a3a9190611e02565b60405180910390a2600a549050919050565b610a59600260ff16610551565b15610a99576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a90906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610b27576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b1e9061235e565b60405180910390fd5b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60078054610b9c90611fed565b80601f0160208091040260200160405190810160405280929190818152602001828054610bc890611fed565b8015610c155780601f10610bea57610100808354040283529160200191610c15565b820191906000526020600020905b815481529060010190602001808311610bf857829003601f168201915b505050505081565b600060606000806000610c2f86611a5c565b90508086610c3d91906124c2565b9250610c4a888885611a89565b92508773ffffffffffffffffffffffffffffffffffffffff1630604051602401610c7491906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610cfe91906120fb565b6000604051808303816000865af19150503d8060008114610d3b576040519150601f19603f3d011682016040523d82523d6000602084013e610d40565b606091505b50809550819650505084610d89576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d809061215e565b60405180910390fd5b83806020019051810190610d9d9190612526565b91508083610dab9190612272565b821015610ded576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610de49061259f565b60405180910390fd5b610df787876105ae565b8773ffffffffffffffffffffffffffffffffffffffff163384604051602401610e219291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051610eab91906120fb565b6000604051808303816000865af19150503d8060008114610ee8576040519150601f19603f3d011682016040523d82523d6000602084013e610eed565b606091505b50809550819650505084610f36576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f2d9061215e565b60405180910390fd5b83806020019051810190610f4a91906121aa565b945084610f8c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610f8390612223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16146110395780600960008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546110319190612272565b925050819055505b5050505050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461109e57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050826000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36001915050919050565b6000806060600073ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361121b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112129061235e565b60405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16856040516024016112679291906125bf565b6040516020818303038152906040527fa9059cbb000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516112f191906120fb565b6000604051808303816000865af19150503d806000811461132e576040519150601f19603f3d011682016040523d82523d6000602084013e611333565b606091505b5080925081935050508161137c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113739061215e565b60405180910390fd5b8080602001905181019061139091906121aa565b9150816113d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113c990612223565b60405180910390fd5b839250505092915050565b6113ea600460ff16610551565b1561142a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611421906122f2565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146114b8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114af9061235e565b60405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006060600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361153b5750506116d1565b8273ffffffffffffffffffffffffffffffffffffffff16846040516024016115639190611f50565b6040516020818303038152906040527f3ef25013000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506040516115ed91906120fb565b6000604051808303816000865af19150503d806000811461162a576040519150601f19603f3d011682016040523d82523d6000602084013e61162f565b606091505b50809250819350505081611678576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161166f90612634565b60405180910390fd5b8080602001905181019061168c91906121aa565b9150816116ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116c5906126a0565b60405180910390fd5b50505b5050565b60006060600080600073ffffffffffffffffffffffffffffffffffffffff16600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361173b5750505050611a58565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1686306040516024016117879291906126c0565b6040516020818303038152906040527f23778613000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161181191906120fb565b6000604051808303816000865af19150503d806000811461184e576040519150601f19603f3d011682016040523d82523d6000602084013e611853565b606091505b5080945081955050508361189c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161189390612735565b60405180910390fd5b828060200190518101906118b09190612526565b91508573ffffffffffffffffffffffffffffffffffffffff16306040516024016118da91906124f6565b6040516020818303038152906040527f70a08231000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff838183161783525050505060405161196491906120fb565b6000604051808303816000865af19150503d80600081146119a1576040519150601f19603f3d011682016040523d82523d6000602084013e6119a6565b606091505b508094508195505050836119ef576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119e69061215e565b60405180910390fd5b82806020019051810190611a039190612526565b9050818582611a129190612272565b1115611a53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611a4a906127a1565b60405180910390fd5b505050505b5050565b60008060045483611a6d91906127c1565b9050620f424081611a7e9190612832565b905080915050919050565b600080606060008073ffffffffffffffffffffffffffffffffffffffff16600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611af057849350505050611c70565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16878787604051602401611b3e93929190612863565b6040516020818303038152906040527fdbb21d40000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050604051611bc891906120fb565b6000604051808303816000865af19150503d8060008114611c05576040519150601f19603f3d011682016040523d82523d6000602084013e611c0a565b606091505b50809350819450505082611c53576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611c4a906128e6565b60405180910390fd5b81806020019051810190611c679190612526565b90508093505050505b9392505050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b611cb181611c7c565b8114611cbc57600080fd5b50565b600081359050611cce81611ca8565b92915050565b600060208284031215611cea57611ce9611c77565b5b6000611cf884828501611cbf565b91505092915050565b60008115159050919050565b611d1681611d01565b82525050565b6000602082019050611d316000830184611d0d565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015611d71578082015181840152602081019050611d56565b60008484015250505050565b6000601f19601f8301169050919050565b6000611d9982611d37565b611da38185611d42565b9350611db3818560208601611d53565b611dbc81611d7d565b840191505092915050565b60006020820190508181036000830152611de18184611d8e565b905092915050565b6000819050919050565b611dfc81611de9565b82525050565b6000602082019050611e176000830184611df3565b92915050565b611e2681611de9565b8114611e3157600080fd5b50565b600081359050611e4381611e1d565b92915050565b600060208284031215611e5f57611e5e611c77565b5b6000611e6d84828501611e34565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000611ea182611e76565b9050919050565b611eb181611e96565b8114611ebc57600080fd5b50565b600081359050611ece81611ea8565b92915050565b60008060408385031215611eeb57611eea611c77565b5b6000611ef985828601611ebf565b9250506020611f0a85828601611e34565b9150509250929050565b600060208284031215611f2a57611f29611c77565b5b6000611f3884828501611ebf565b91505092915050565b611f4a81611e96565b82525050565b6000602082019050611f656000830184611f41565b92915050565b600080600060608486031215611f8457611f83611c77565b5b6000611f9286828701611ebf565b9350506020611fa386828701611ebf565b9250506040611fb486828701611e34565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061200557607f821691505b60208210810361201857612017611fbe565b5b50919050565b6000819050919050565b600061204361203e61203984611e76565b61201e565b611e76565b9050919050565b600061205582612028565b9050919050565b60006120678261204a565b9050919050565b6120778161205c565b82525050565b60006060820190506120926000830186611f41565b61209f602083018561206e565b6120ac6040830184611df3565b949350505050565b600081519050919050565b600081905092915050565b60006120d5826120b4565b6120df81856120bf565b93506120ef818560208601611d53565b80840191505092915050565b600061210782846120ca565b915081905092915050565b7f4552525f544f4b454e0000000000000000000000000000000000000000000000600082015250565b6000612148600983611d42565b915061215382612112565b602082019050919050565b600060208201905081810360008301526121778161213b565b9050919050565b61218781611d01565b811461219257600080fd5b50565b6000815190506121a48161217e565b92915050565b6000602082840312156121c0576121bf611c77565b5b60006121ce84828501612195565b91505092915050565b7f4552525f5452414e534645520000000000000000000000000000000000000000600082015250565b600061220d600c83611d42565b9150612218826121d7565b602082019050919050565b6000602082019050818103600083015261223c81612200565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061227d82611de9565b915061228883611de9565b92508282019050808211156122a05761229f612243565b5b92915050565b7f4552525f5345414c000000000000000000000000000000000000000000000000600082015250565b60006122dc600883611d42565b91506122e7826122a6565b602082019050919050565b6000602082019050818103600083015261230b816122cf565b9050919050565b7f4552525f41585800000000000000000000000000000000000000000000000000600082015250565b6000612348600783611d42565b915061235382612312565b602082019050919050565b600060208201905081810360008301526123778161233b565b9050919050565b7f4552525f4645455f544f4f5f4849474800000000000000000000000000000000600082015250565b60006123b4601083611d42565b91506123bf8261237e565b602082019050919050565b600060208201905081810360008301526123e3816123a7565b9050919050565b7f4552525f494e56414c49445f5354415445000000000000000000000000000000600082015250565b6000612420601183611d42565b915061242b826123ea565b602082019050919050565b6000602082019050818103600083015261244f81612413565b9050919050565b7f4552525f414c52454144595f4c4f434b45440000000000000000000000000000600082015250565b600061248c601283611d42565b915061249782612456565b602082019050919050565b600060208201905081810360008301526124bb8161247f565b9050919050565b60006124cd82611de9565b91506124d883611de9565b92508282039050818111156124f0576124ef612243565b5b92915050565b600060208201905061250b600083018461206e565b92915050565b60008151905061252081611e1d565b92915050565b60006020828403121561253c5761253b611c77565b5b600061254a84828501612511565b91505092915050565b7f4552525f42414c414e4345000000000000000000000000000000000000000000600082015250565b6000612589600b83611d42565b915061259482612553565b602082019050919050565b600060208201905081810360008301526125b88161257c565b9050919050565b60006040820190506125d46000830185611f41565b6125e16020830184611df3565b9392505050565b7f4552525f52454749535452590000000000000000000000000000000000000000600082015250565b600061261e600c83611d42565b9150612629826125e8565b602082019050919050565b6000602082019050818103600083015261264d81612611565b9050919050565b7f4552525f554e415554485f544f4b454e00000000000000000000000000000000600082015250565b600061268a601083611d42565b915061269582612654565b602082019050919050565b600060208201905081810360008301526126b98161267d565b9050919050565b60006040820190506126d56000830185611f41565b6126e2602083018461206e565b9392505050565b7f4552525f4c494d49544552000000000000000000000000000000000000000000600082015250565b600061271f600b83611d42565b915061272a826126e9565b602082019050919050565b6000602082019050818103600083015261274e81612712565b9050919050565b7f4552525f4c494d49540000000000000000000000000000000000000000000000600082015250565b600061278b600983611d42565b915061279682612755565b602082019050919050565b600060208201905081810360008301526127ba8161277e565b9050919050565b60006127cc82611de9565b91506127d783611de9565b92508282026127e581611de9565b915082820484148315176127fc576127fb612243565b5b5092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061283d82611de9565b915061284883611de9565b92508261285857612857612803565b5b828204905092915050565b60006060820190506128786000830186611f41565b6128856020830185611f41565b6128926040830184611df3565b949350505050565b7f4552525f51554f54455200000000000000000000000000000000000000000000600082015250565b60006128d0600a83611d42565b91506128db8261289a565b602082019050919050565b600060208201905081810360008301526128ff816128c3565b905091905056fea26469706673582212201f7c2ae121176c113ae06e6b16f823379825d3480ddefc5dcbcd3c98c282bc4f64736f6c63430008130033
+\ No newline at end of file
diff --git a/python/erc20_pool/data/SwapPool.json b/python/erc20_pool/data/SwapPool.json
@@ -1 +1 @@
-[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bytes32","name":"_declaration","type":"bytes32"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
+[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]
diff --git a/python/erc20_pool/data/SwapPool.metadata.json b/python/erc20_pool/data/SwapPool.metadata.json
@@ -1 +1 @@
-{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"bytes32","name":"_declaration","type":"bytes32"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"SwapPool.sol":"SwapPool"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"SwapPool.sol":{"keccak256":"0x9a52a74b841493c451d29e9564b5ae4d2592bc313d2eea6bd6c31fe38d5aa4ac","license":"AGPL-3.0-or-later","urls":["bzz-raw://b52219c7544cfc0e2cdae5b7640d38e9479a97b87468a8de0af49d3d548b48f7","dweb:/ipfs/Qmf1bbHJeUfLUoEhV6Qvs9BsDN4fzQTDj5ksXfDcVdEcwx"]}},"version":1}
+{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_name","type":"string"},{"internalType":"string","name":"_symbol","type":"string"},{"internalType":"uint8","name":"_decimals","type":"uint8"},{"internalType":"address","name":"_tokenRegistry","type":"address"},{"internalType":"address","name":"_tokenLimiter","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bool","name":"_final","type":"bool"},{"indexed":false,"internalType":"uint256","name":"_sealState","type":"uint256"}],"name":"SealStateChange","type":"event"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"deposit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"isSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_state","type":"uint256"}],"name":"seal","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sealState","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_fee","type":"uint256"}],"name":"setFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_feeAddress","type":"address"}],"name":"setFeeAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_quoter","type":"address"}],"name":"setQuoter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"_sum","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"address","name":"_inToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_outToken","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"SwapPool.sol":"SwapPool"},"evmVersion":"byzantium","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"SwapPool.sol":{"keccak256":"0xa983b4d156c8caabe2c4ba228769ca472231a4404470ba6e6053aa2fbaa74f70","license":"AGPL-3.0-or-later","urls":["bzz-raw://ea16e2718c27a0780f77c7f79d23d521bac19a3001ec908a245950dc99f20c20","dweb:/ipfs/QmSQ4boJbvYGTyeR9Twv81N51xcusRtpbQv8w9aFPfXSnu"]}},"version":1}
diff --git a/python/erc20_pool/pool.py b/python/erc20_pool/pool.py
@@ -5,7 +5,6 @@ import enum
# external imports
from chainlib.eth.constant import ZERO_ADDRESS
-from chainlib.eth.constant import ZERO_CONTENT
from chainlib.eth.contract import (
ABIContractEncoder,
ABIContractDecoder,
@@ -37,17 +36,15 @@ class Pool(TxFactory):
__abi = None
__bytecode = None
- def constructor(self, sender_address, name, symbol, decimals, declaration=None, token_registry=None, token_limiter=None, tx_format=TxFormat.JSONRPC, version=None):
- code = self.cargs(name, symbol, decimals, declaration=declaration, token_registry=token_registry, token_limiter=token_limiter, version=version)
+ def constructor(self, sender_address, name, symbol, decimals, token_registry=None, token_limiter=None, tx_format=TxFormat.JSONRPC, version=None):
+ code = self.cargs(name, symbol, decimals, token_registry=token_registry, token_limiter=token_limiter, version=version)
tx = self.template(sender_address, None, use_nonce=True)
tx = self.set_code(tx, code)
return self.finalize(tx, tx_format)
@staticmethod
- def cargs(name, symbol, decimals, declaration=None, token_registry=None, token_limiter=None, version=None):
- if declaration == None:
- declaration = ZERO_CONTENT
+ def cargs(name, symbol, decimals, token_registry=None, token_limiter=None, version=None):
if token_registry == None:
token_registry = ZERO_ADDRESS
if token_limiter == None:
@@ -57,7 +54,6 @@ class Pool(TxFactory):
enc.string(name)
enc.string(symbol)
enc.uint256(decimals)
- enc.bytes32(declaration)
enc.address(token_registry)
enc.address(token_limiter)
args = enc.get()
diff --git a/python/erc20_pool/unittest/base.py b/python/erc20_pool/unittest/base.py
@@ -57,10 +57,10 @@ class TestERC20PoolBase(TestGiftableToken):
self.assertEqual(r['status'], 1)
- def publish_pool(self, declaration=hash_of_foo, token_registry=None, token_limiter=None):
+ def publish_pool(self, token_registry=None, token_limiter=None):
nonce_oracle = RPCNonceOracle(self.accounts[0], conn=self.conn)
c = Pool(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
- (tx_hash, o) = c.constructor(self.accounts[0], "Big Pool", "BIG", 16, declaration=declaration, token_registry=token_registry, token_limiter=token_limiter)
+ (tx_hash, o) = c.constructor(self.accounts[0], "Big Pool", "BIG", 16, token_registry=token_registry, token_limiter=token_limiter)
self.rpc.do(o)
o = receipt(tx_hash)
r = self.rpc.do(o)
diff --git a/solidity/SwapPool.sol b/solidity/SwapPool.sol
@@ -14,7 +14,6 @@ contract SwapPool {
address quoter;
uint256 feePpm;
address feeAddress;
- bytes32 declaration;
string public name;
string public symbol;
@@ -37,13 +36,12 @@ contract SwapPool {
// EIP173
event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); // EIP173
- constructor(string memory _name, string memory _symbol, uint8 _decimals, bytes32 _declaration, address _tokenRegistry, address _tokenLimiter) {
+ constructor(string memory _name, string memory _symbol, uint8 _decimals, address _tokenRegistry, address _tokenLimiter) {
name = _name;
symbol = _symbol;
decimals = _decimals;
tokenRegistry = _tokenRegistry;
tokenLimiter = _tokenLimiter;
- declaration = _declaration;
owner = msg.sender;
}
