diff options
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/artifacts/EtherToken.json | 67 | ||||
| -rw-r--r-- | src/artifacts/Exchange.json | 173 | ||||
| -rw-r--r-- | src/artifacts/Mintable.json | 189 | ||||
| -rw-r--r-- | src/artifacts/Token.json | 4 | ||||
| -rw-r--r-- | src/artifacts/TokenRegistry.json | 450 | ||||
| -rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 4 | ||||
| -rw-r--r-- | src/contract_wrappers/token_registry_wrapper.ts | 3 | ||||
| -rw-r--r-- | src/schemas/token_schema.ts | 13 | ||||
| -rw-r--r-- | src/types.ts | 11 | ||||
| -rw-r--r-- | test/schema_test.ts | 4 |
12 files changed, 401 insertions, 521 deletions
diff --git a/circle.yml b/circle.yml index fbfa67c6d..20aaccc12 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: node: version: 6.5.0 environment: - CONTRACTS_COMMIT_HASH: '414e997' + CONTRACTS_COMMIT_HASH: '70454b2' PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" dependencies: diff --git a/package.json b/package.json index 7e8078d1c..f5b54e13c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "run_mocha": "mocha lib/test/**/*_test.js --timeout 3000 --bail" }, "config": { - "artifacts": "Proxy Exchange TokenRegistry Token Mintable EtherToken", + "artifacts": "Proxy Exchange TokenRegistry Token EtherToken", "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" }, "repository": { diff --git a/src/artifacts/EtherToken.json b/src/artifacts/EtherToken.json index 49f8541c4..9af54bf93 100644 --- a/src/artifacts/EtherToken.json +++ b/src/artifacts/EtherToken.json @@ -233,8 +233,59 @@ "type": "event" } ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b61070b8061001c6000396000f300606060405236156100935763ffffffff60e060020a60003504166306fdde0381146100a4578063095ea7b31461013457806318160ddd1461016757806323b872dd146101895780632e1a7d4d146101c2578063313ce567146101d757806370a08231146101fd57806395d89b411461022b578063a9059cbb146102bb578063d0e30db0146102ee578063dd62ed3e146102f8575b6100a25b61009f61032c565b5b565b005b34156100ac57fe5b6100b461037b565b6040805160208082528351818301528351919283929083019185019080838382156100fa575b8051825260208311156100fa57601f1990920191602091820191016100da565b505050905090810190601f1680156101265780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561013c57fe5b610153600160a060020a03600435166024356103a3565b604080519115158252519081900360200190f35b341561016f57fe5b61017761040e565b60408051918252519081900360200190f35b341561019157fe5b610153600160a060020a0360043581169060243516604435610414565b604080519115158252519081900360200190f35b34156101ca57fe5b6100a26004356104ff565b005b34156101df57fe5b6101e761057c565b6040805160ff9092168252519081900360200190f35b341561020557fe5b610177600160a060020a0360043516610581565b60408051918252519081900360200190f35b341561023357fe5b6100b46105a0565b6040805160208082528351818301528351919283929083019185019080838382156100fa575b8051825260208311156100fa57601f1990920191602091820191016100da565b505050905090810190601f1680156101265780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156102c357fe5b610153600160a060020a03600435166024356105c1565b604080519115158252519081900360200190f35b6100a261032c565b005b341561030057fe5b610177600160a060020a0360043581169060243516610661565b60408051918252519081900360200190f35b600160a060020a03331660009081526020819052604090205461034f903461068e565b600160a060020a033316600090815260208190526040902055600254610375903461068e565b6002555b565b60408051808201909152600b815260a960020a6a22ba3432b9102a37b5b2b702602082015281565b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60025481565b600160a060020a03831660009081526020819052604081205461043790836106a8565b600160a060020a03808616600090815260208181526040808320949094556001815283822033909316825291909152205461047290836106a8565b600160a060020a038086166000908152600160209081526040808320338516845282528083209490945591861681529081905220546104b1908361068e565b600160a060020a038085166000818152602081815260409182902094909455805186815290519193928816926000805160206106c083398151915292918290030190a35060015b9392505050565b600160a060020a03331660009081526020819052604090205461052290826106a8565b600160a060020a03331660009081526020819052604090205560025461054890826106a8565b600255604051600160a060020a0333169082156108fc029083906000818181858888f19350505050151561057857fe5b5b50565b601281565b600160a060020a0381166000908152602081905260409020545b919050565b604080518082019091526004815260e360020a630ae8aa8902602082015281565b600160a060020a0333166000908152602081905260408120546105e490836106a8565b600160a060020a033381166000908152602081905260408082209390935590851681522054610613908361068e565b600160a060020a03808516600081815260208181526040918290209490945580518681529051919333909316926000805160206106c083398151915292918290030190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b60008282018381101561069d57fe5b8091505b5092915050565b6000828211156106b457fe5b508082035b929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a7230582067df00833f10f3cd5bb1c103cf4266bd3cf02036b011be8f22ebd16154b9fa820029", + "unlinked_binary": "0x6060604052341561000c57fe5b5b61070f8061001c6000396000f300606060405236156100935763ffffffff60e060020a60003504166306fdde0381146100a4578063095ea7b31461013457806318160ddd1461016757806323b872dd146101895780632e1a7d4d146101c2578063313ce567146101d757806370a08231146101fd57806395d89b411461022b578063a9059cbb146102bb578063d0e30db0146102ee578063dd62ed3e146102f8575b6100a25b61009f61032c565b5b565b005b34156100ac57fe5b6100b461037b565b6040805160208082528351818301528351919283929083019185019080838382156100fa575b8051825260208311156100fa57601f1990920191602091820191016100da565b505050905090810190601f1680156101265780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561013c57fe5b610153600160a060020a03600435166024356103a3565b604080519115158252519081900360200190f35b341561016f57fe5b61017761040e565b60408051918252519081900360200190f35b341561019157fe5b610153600160a060020a0360043581169060243516604435610414565b604080519115158252519081900360200190f35b34156101ca57fe5b6100a26004356104ff565b005b34156101df57fe5b6101e7610580565b6040805160ff9092168252519081900360200190f35b341561020557fe5b610177600160a060020a0360043516610585565b60408051918252519081900360200190f35b341561023357fe5b6100b46105a4565b6040805160208082528351818301528351919283929083019185019080838382156100fa575b8051825260208311156100fa57601f1990920191602091820191016100da565b505050905090810190601f1680156101265780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34156102c357fe5b610153600160a060020a03600435166024356105c5565b604080519115158252519081900360200190f35b6100a261032c565b005b341561030057fe5b610177600160a060020a0360043581169060243516610665565b60408051918252519081900360200190f35b600160a060020a03331660009081526020819052604090205461034f9034610692565b600160a060020a0333166000908152602081905260409020556002546103759034610692565b6002555b565b60408051808201909152600b815260a960020a6a22ba3432b9102a37b5b2b702602082015281565b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60025481565b600160a060020a03831660009081526020819052604081205461043790836106ac565b600160a060020a03808616600090815260208181526040808320949094556001815283822033909316825291909152205461047290836106ac565b600160a060020a038086166000908152600160209081526040808320338516845282528083209490945591861681529081905220546104b19083610692565b600160a060020a038085166000818152602081815260409182902094909455805186815290519193928816926000805160206106c483398151915292918290030190a35060015b9392505050565b600160a060020a03331660009081526020819052604090205461052290826106ac565b600160a060020a03331660009081526020819052604090205560025461054890826106ac565b600255604051600160a060020a0333169082156108fc029083906000818181858888f19350505050151561057c5760006000fd5b5b50565b601281565b600160a060020a0381166000908152602081905260409020545b919050565b604080518082019091526004815260e360020a630ae8aa8902602082015281565b600160a060020a0333166000908152602081905260408120546105e890836106ac565b600160a060020a0333811660009081526020819052604080822093909355908516815220546106179083610692565b600160a060020a03808516600081815260208181526040918290209490945580518681529051919333909316926000805160206106c483398151915292918290030190a35060015b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b6000828201838110156106a157fe5b8091505b5092915050565b6000828211156106b857fe5b508082035b929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820b0be668913b36ff13a97f9ad56d8eb2e9c169cc9b32bfde9e3b92cec1036f1080029", "networks": { + "50": { + "links": {}, + "events": { + "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "_from", + "type": "address" + }, + { + "indexed": true, + "name": "_to", + "type": "address" + }, + { + "indexed": false, + "name": "_value", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "_owner", + "type": "address" + }, + { + "indexed": true, + "name": "_spender", + "type": "address" + }, + { + "indexed": false, + "name": "_value", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + } + }, + "updated_at": 1502391794392, + "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788" + }, "42": { "links": {}, "events": { @@ -283,10 +334,10 @@ "type": "event" } }, - "updated_at": 1496294576956, - "address": "0x771a1bff4a50b59407bee508e9934e8c10feac3e" + "updated_at": 1502391794392, + "address": "0x05d090b51c40b020eab3bfcb6a2dff130df22e9c" }, - "50": { + "1": { "links": {}, "events": { "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": { @@ -334,10 +385,10 @@ "type": "event" } }, - "updated_at": 1499462280317, - "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788" + "updated_at": 1502488087000, + "address": "0x2956356cd2a2bf3202f771f50d3d14a367b48070" } }, "schema_version": "0.0.5", - "updated_at": 1499462280317 -}
\ No newline at end of file + "updated_at": 1502391794392 +} diff --git a/src/artifacts/Exchange.json b/src/artifacts/Exchange.json index a9481d13f..a7eadbe53 100644 --- a/src/artifacts/Exchange.json +++ b/src/artifacts/Exchange.json @@ -13,14 +13,14 @@ "type": "uint256[6]" }, { - "name": "canceltakerTokenAmount", + "name": "cancelTakerTokenAmount", "type": "uint256" } ], "name": "cancelOrder", "outputs": [ { - "name": "cancelledTakerTokenAmount", + "name": "", "type": "uint256" } ], @@ -31,11 +31,11 @@ "constant": true, "inputs": [ { - "name": "denominator", + "name": "numerator", "type": "uint256" }, { - "name": "numerator", + "name": "denominator", "type": "uint256" }, { @@ -46,7 +46,7 @@ "name": "isRoundingError", "outputs": [ { - "name": "isError", + "name": "", "type": "bool" } ], @@ -108,7 +108,7 @@ "name": "getPartialAmount", "outputs": [ { - "name": "partialValue", + "name": "", "type": "uint256" } ], @@ -132,12 +132,7 @@ } ], "name": "batchCancelOrders", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], + "outputs": [], "payable": false, "type": "function" }, @@ -176,7 +171,7 @@ "name": "fillOrdersUpTo", "outputs": [ { - "name": "filledTakerTokenAmount", + "name": "", "type": "uint256" } ], @@ -210,7 +205,7 @@ "name": "isValidSignature", "outputs": [ { - "name": "isValid", + "name": "", "type": "bool" } ], @@ -292,12 +287,7 @@ } ], "name": "batchFillOrders", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], + "outputs": [], "payable": false, "type": "function" }, @@ -330,19 +320,14 @@ } ], "name": "batchFillOrKillOrders", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], + "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [], - "name": "PROXY_CONTRACT", + "name": "TOKEN_TRANSFER_PROXY_CONTRACT", "outputs": [ { "name": "", @@ -363,7 +348,7 @@ "name": "getUnavailableTakerTokenAmount", "outputs": [ { - "name": "unavailableTakerTokenAmount", + "name": "", "type": "uint256" } ], @@ -385,7 +370,7 @@ "name": "getOrderHash", "outputs": [ { - "name": "orderHash", + "name": "", "type": "bytes32" } ], @@ -434,23 +419,18 @@ } ], "name": "fillOrKillOrder", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], + "outputs": [], "payable": false, "type": "function" }, { "inputs": [ { - "name": "_ZRX_TOKEN_CONTRACT", + "name": "_zrxToken", "type": "address" }, { - "name": "_PROXY_CONTRACT", + "name": "_tokenTransferProxy", "type": "address" } ], @@ -582,11 +562,37 @@ ], "name": "LogError", "type": "event" + }, + { + "constant": true, + "inputs": [], + "name": "EXTERNAL_QUERY_GAS_LIMIT", + "outputs": [ + { + "name": "", + "type": "uint16" + } + ], + "payable": false, + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "VERSION", + "outputs": [ + { + "name": "", + "type": "string" + } + ], + "payable": false, + "type": "function" } ], - "unlinked_binary": "0x6060604052341561000c57fe5b604051604080611d6e8339810160405280516020909101515b60008054600160a060020a03808516600160a060020a03199283161790925560018054928416929091169190911790555b50505b611d06806100686000396000f300606060405236156100ca5763ffffffff60e060020a60003504166314df96ee81146100cc578063288cdc91146100f95780632ac126221461011e578063363349be14610143578063394c21e7146103055780633b30ba59146103785780634f063e6c146103a45780634f150787146103d0578063741bcc93146105c55780637e9abb501461064d5780638163681e1461067257806398024a8b146106b1578063b7b2c7d6146106dc578063baa0181d146108d9578063bc61394a14610a26578063cfc4d0ec14610ab3575bfe5b34156100d457fe5b6100e5600435602435604435610b24565b604080519115158252519081900360200190f35b341561010157fe5b61010c600435610b43565b60408051918252519081900360200190f35b341561012657fe5b61010c600435610b55565b60408051918252519081900360200190f35b341561014b57fe5b61010c60048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156101bd576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610181565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610230576040805160c081810190925290808402870190600690839083908082843750505091835250506001909101906020016101f4565b5050604080516020878301358901803582810280850184019095528084529799893599838101351515999198506060019650929450810192829185019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750949650610b6795505050505050565b60408051918252519081900360200190f35b341561030d57fe5b6040805160a081810190925261010c9160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505092359250610c8b915050565b60408051918252519081900360200190f35b341561038057fe5b610388610f34565b60408051600160a060020a039092168252519081900360200190f35b34156103ac57fe5b610388610f43565b60408051600160a060020a039092168252519081900360200190f35b34156103d857fe5b6100e560048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561044a576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161040e565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156104bd576040805160c08181019092529080840287019060069083908390808284375050509183525050600190910190602001610481565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750949650610f5295505050505050565b604080519115158252519081900360200190f35b34156105cd57fe5b6040805160a08181019092526100e59160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360ff602082013516935060408101359250606001359050611018565b604080519115158252519081900360200190f35b341561065557fe5b61010c600435611040565b60408051918252519081900360200190f35b341561067a57fe5b6100e5600160a060020a036004351660243560ff6044351660643560843561106c565b604080519115158252519081900360200190f35b34156106b957fe5b61010c600435602435604435611124565b60408051918252519081900360200190f35b34156106e457fe5b6100e560048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610756576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161071a565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156107c9576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161078d565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375050604080516020808901358a01803580830284810184018652818552999b8b3515159b909a950198509296508101945090925082919085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a99890198929750908201955093508392508501908490808284375094965061114395505050505050565b604080519115158252519081900360200190f35b34156108e157fe5b6100e560048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610953576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610917565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156109c6576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161098a565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375094965061120495505050505050565b604080519115158252519081900360200190f35b3415610a2e57fe5b6040805160a081810190925261010c9160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360208101351515935060ff60408201351692506060810135915060800135611278565b60408051918252519081900360200190f35b3415610abb57fe5b6040805160a081810190925261010c9160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395506116ed945050505050565b60408051918252519081900360200190f35b60006103e882108015610b3957508284830915155b90505b9392505050565b60026020526000908152604090205481565b60036020526000908152604090205481565b6000805b8851811015610c7e57886000815181101515610b8357fe5b6020908102909101015160035b6020020151600160a060020a03168982815181101515610bac57fe5b6020908102909101015160035b6020020151600160a060020a031614610bd25760006000fd5b610c6682610c618b84815181101515610be757fe5b906020019060200201518b85815181101515610bff57fe5b90602001906020020151610c138c886117e0565b8b8b88815181101515610c2257fe5b906020019060200201518b89815181101515610c3a57fe5b906020019060200201518b8a815181101515610c5257fe5b90602001906020020151611278565b6117f7565b915086821415610c7557610c7e565b5b600101610b6b565b5b50979650505050505050565b6000610c95611c5e565b6040805161016081019091526000908087835b60209081029190910151600160a060020a03168252018760015b60209081029190910151600160a060020a03168252018760025b60209081029190910151600160a060020a03168252018760035b60209081029190910151600160a060020a03168252018760045b60209081029190910151600160a060020a03168252018660005b602090810291909101518252018660015b602090810291909101518252018660025b602090810291909101518252018660035b602090810291909101518252018660045b60200201518152602001610d8288886116ed565b9052805190925033600160a060020a03908116911614610da25760006000fd5b6101208201514210610dd657610140820151604051600090600080516020611cbb833981519152908290a360009250610f2b565b610df18260c00151610dec846101400151611040565b6117e0565b9050610dfd8482611811565b9250821515610e2f57610140820151604051600190600080516020611cbb83398151915290600090a360009250610f2b565b610140820151600090815260036020526040902054610e4e90846117f7565b610140830151600090815260036020526040908190209190915580830180516060850180518451606060020a600160a060020a03948516810282529184169091026014820152935193849003602801909320608086015186519351945160c088015160a0890151939692851695909416937f67d66f160bc93d925d05dae1794c90d2d6d6688b29b84ff069398a9b0458713193610eec918b91611124565b61014089015160408051600160a060020a03958616815293909416602084015282840191909152606082018a9052608082015290519081900360a00190a45b50509392505050565b600054600160a060020a031681565b600154600160a060020a031681565b6000805b875181101561100857610ff78882815181101515610f7057fe5b906020019060200201518883815181101515610f8857fe5b906020019060200201518884815181101515610fa057fe5b906020019060200201518885815181101515610fb857fe5b906020019060200201518886815181101515610fd057fe5b906020019060200201518887815181101515610fe857fe5b90602001906020020151611018565b1515610fff57fe5b5b600101610f56565b600191505b509695505050505050565b60008461102b8888886000898989611278565b1461103257fe5b5060015b9695505050505050565b600081815260026020908152604080832054600390925282205461106491906117f7565b90505b919050565b604080517f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c8101869052815190819003603c018120600082815260208381018552928401819052835191825260ff8716828401528184018690526060820185905292516001926080808401939192601f1981019281900390910190868661646e5a03f115156110fb57fe5b505060206040510351600160a060020a031686600160a060020a03161490505b95945050505050565b6000610b39611133858461182b565b8461185a565b90505b9392505050565b6000805b88518110156111f3576111e9898281518110151561116157fe5b90602001906020020151898381518110151561117957fe5b90602001906020020151898481518110151561119157fe5b906020019060200201518989868151811015156111aa57fe5b9060200190602002015189878151811015156111c257fe5b906020019060200201518988815181101515610c5257fe5b90602001906020020151611278565b505b600101611147565b600191505b50979650505050505050565b6000805b845181101561126b57611261858281518110151561122257fe5b90602001906020020151858381518110151561123a57fe5b90602001906020020151858481518110151561125257fe5b90602001906020020151610c8b565b505b600101611208565b600191505b509392505050565b6000611282611c5e565b6000600060006000610160604051908101604052808e60006005811015156112a657fe5b60209081029190910151600160a060020a03168252018e60015b60209081029190910151600160a060020a03168252018e60025b60209081029190910151600160a060020a03168252018e60035b60209081029190910151600160a060020a03168252018e60045b60209081029190910151600160a060020a03168252018d60005b602090810291909101518252018d60015b602090810291909101518252018d60025b602090810291909101518252018d60035b602090810291909101518252018d60045b602002015181526020016113808f8f6116ed565b90526020810151909550600160a060020a031615806113b4575033600160a060020a03168560200151600160a060020a0316145b15156113c05760006000fd5b6113d685600001518661014001518b8b8b61106c565b15156113e25760006000fd5b610120850151421061141657610140850151604051600090600080516020611cbb833981519152908290a3600095506116dd565b6114318560c00151610dec876101400151611040565b6117e0565b935061143d8b85611811565b955085151561146f57610140850151604051600190600080516020611cbb83398151915290600090a3600095506116dd565b611482868660c001518760a00151610b24565b156114b057610140850151604051600290600080516020611cbb83398151915290600090a3600095506116dd565b891580156114c557506114c38587611877565b155b156114f357610140850151604051600390600080516020611cbb83398151915290600090a3600095506116dd565b611506868660c001518760a00151611124565b61014086015160009081526002602052604090205490935061152890876117f7565b6101408601516000908152600260205260409081902091909155850151855161155391903386611ad3565b151561155b57fe5b61156f856060015133876000015189611ad3565b151561157757fe5b6080850151600160a060020a0316156116235760008560e0015111156115d5576115aa868660c001518760e00151611124565b600054865160808801519294506115cd92600160a060020a039092169185611ad3565b15156115d557fe5b5b60008561010001511115611623576115f8868660c00151876101000151611124565b600054608087015191925061161b91600160a060020a0390911690339084611ad3565b151561162357fe5b5b5b60408086018051606080890180518551606060020a600160a060020a0395861681028252918516909102601482015285519081900360280181206080808d01518d51975194516101408f0151338916865295881660208601528716848a01529483018b905282018d905260a0820189905260c0820188905260e08201929092529451909491831693909216917f0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3918190036101000190a45b5050505050979650505050505050565b60003083825b60200201518460015b60200201518560025b60200201518660035b60200201518760045b60200201518760005b60200201518860015b60200201518960025b60200201518a60035b60200201518b60045b60200201518c60055b602002015160408051606060020a600160a060020a039e8f16810282529c8e168d0260148201529a8d168c0260288c0152988c168b02603c8b0152968b168a0260508a01529490991690970260648701526078860191909152609885015260b884019490945260d883019490945260f8820192909252610118810192909252519081900361013801902090505b92915050565b6000828211156117ec57fe5b508082035b92915050565b60008282018381101561180657fe5b8091505b5092915050565b60008183106118205781611822565b825b90505b92915050565b6000828202831580611847575082848281151561184457fe5b04145b151561180657fe5b8091505b5092915050565b60006000828481151561186957fe5b0490508091505b5092915050565b60006000600060006000600060006000600033975061189f8a8c60c001518d60a00151611124565b60808c0151909750600160a060020a031615611a545760005460408c015160608d015160c08e015160e08f0151600160a060020a0394851693851684149a509390911690911496506118f3918c9190611124565b93506119098a8c60c001518d6101000151611124565b9250856119165783611920565b61192087856117f7565b5b91508461192e5782611938565b6119388a846117f7565b5b6000548c51919250839161195691600160a060020a031690611b62565b108061197b57506000548b51839161197991600160a060020a0390911690611be2565b105b8061199b5750600054819061199990600160a060020a03168a611b62565b105b806119bb575060005481906119b990600160a060020a03168a611be2565b105b156119c95760009850611ac5565b85158015611a015750866119e58c604001518d60000151611b62565b1080611a015750866119ff8c604001518d60000151611be2565b105b5b15611a105760009850611ac5565b84158015611a40575089611a288c606001518a611b62565b1080611a40575089611a3e8c606001518a611be2565b105b5b15611a4f5760009850611ac5565b611abf565b86611a678c604001518d60000151611b62565b1080611a83575086611a818c604001518d60000151611be2565b105b80611a9a575089611a988c606001518a611b62565b105b80611ab1575089611aaf8c606001518a611be2565b105b15611abf5760009850611ac5565b5b600198505b505050505050505092915050565b6001546040805160006020918201819052825160e160020a630aed65f5028152600160a060020a03898116600483015288811660248301528781166044830152606482018790529351919493909316926315dacbea92608480830193919282900301818787803b1515611b4257fe5b6102c65a03f11515611b5057fe5b5050604051519150505b949350505050565b600082600160a060020a03166370a08231836000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b1515611bc457fe5b6102c65a03f11515611bd257fe5b5050604051519150505b92915050565b6001546040805160006020918201819052825160e160020a636eb1769f028152600160a060020a03868116600483015294851660248201529251909386169263dd62ed3e92604480830193919282900301818787803b1515611bc457fe5b6102c65a03f11515611bd257fe5b5050604051519150505b92915050565b6040805161016081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e081018290526101008101829052610120810182905261014081019190915290560036d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e90a165627a7a72305820ebcefc5e253855f67db0c7e9d7fd4b3b16004c01384ee01564d3091e35c3cc860029", + "unlinked_binary": "0x6060604052341561000f57600080fd5b604051604080612c4d833981016040528080519060200190919080519060200190919050505b816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505b612b84806100c96000396000f300606060405236156100fa576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806314df96ee146100ff578063288cdc911461014c5780632ac1262214610187578063363349be146101c2578063394c21e7146103bc5780633b30ba591461044b5780634f150787146104a0578063741bcc93146106b25780637e9abb50146107535780638163681e1461078e57806398024a8b14610812578063add1cbc51461085b578063b7b2c7d6146108b0578063baa0181d14610acd578063bc61394a14610c1f578063cfc4d0ec14610cdf578063f06bbf7514610d6d578063ffa1ad7414610d9e575b600080fd5b341561010a57600080fd5b6101326004808035906020019091908035906020019091908035906020019091905050610e2d565b604051808215151515815260200191505060405180910390f35b341561015757600080fd5b610171600480803560001916906020019091905050610e7c565b6040518082815260200191505060405180910390f35b341561019257600080fd5b6101ac600480803560001916906020019091905050610e94565b6040518082815260200191505060405180910390f35b34156101cd57600080fd5b6103a660048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561024857848483905060a002016005806020026040519081016040528092919082600560200280828437820191505050505081526020019060010190610203565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156102c457848483905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508152602001906001019061027f565b5050505050919080359060200190919080351515906020019091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091905050610eac565b6040518082815260200191505060405180910390f35b34156103c757600080fd5b6104356004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c001906006806020026040519081016040528092919082600660200280828437820191505050505091908035906020019091905050611013565b6040518082815260200191505060405180910390f35b341561045657600080fd5b61045e6114fb565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156104ab57600080fd5b6106b060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561052657848483905060a0020160058060200260405190810160405280929190826005602002808284378201915050505050815260200190600101906104e1565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156105a257848483905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508152602001906001019061055d565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091905050611520565b005b34156106bd57600080fd5b6107516004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c00190600680602002604051908101604052809291908260066020028082843782019150505050509190803590602001909190803560ff1690602001909190803560001916906020019091908035600019169060200190919050506115df565b005b341561075e57600080fd5b610778600480803560001916906020019091905050611605565b6040518082815260200191505060405180910390f35b341561079957600080fd5b6107f8600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080356000191690602001909190803560ff16906020019091908035600019169060200190919080356000191690602001909190505061164f565b604051808215151515815260200191505060405180910390f35b341561081d57600080fd5b6108456004808035906020019091908035906020019091908035906020019091905050611757565b6040518082815260200191505060405180910390f35b341561086657600080fd5b61086e611776565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156108bb57600080fd5b610acb60048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561093657848483905060a0020160058060200260405190810160405280929190826005602002808284378201915050505050815260200190600101906108f1565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156109b257848483905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508152602001906001019061096d565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035151590602001909190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843782019150505050505091908035906020019082018035906020019080806020026020016040519081016040528093929190818152602001838360200280828437820191505050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190505061179c565b005b3415610ad857600080fd5b610c1d60048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610b5357848483905060a002016005806020026040519081016040528092919082600560200280828437820191505050505081526020019060010190610b0e565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610bcf57848483905060c002016006806020026040519081016040528092919082600660200280828437820191505050505081526020019060010190610b8a565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284378201915050505050509190505061185e565b005b3415610c2a57600080fd5b610cc96004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c001906006806020026040519081016040528092919082600660200280828437820191505050505091908035906020019091908035151590602001909190803560ff1690602001909190803560001916906020019091908035600019169060200190919050506118d3565b6040518082815260200191505060405180910390f35b3415610cea57600080fd5b610d4f6004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c001906006806020026040519081016040528092919082600660200280828437820191505050505091905050612073565b60405180826000191660001916815260200191505060405180910390f35b3415610d7857600080fd5b610d8061231f565b604051808261ffff1661ffff16815260200191505060405180910390f35b3415610da957600080fd5b610db1612325565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610df25780820151818401525b602081019050610dd6565b50505050905090810190601f168015610e1f5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60008060008486850991506000821415610e4a5760009250610e73565b610e69610e5a83620f424061235e565b610e64888761235e565b612392565b90506103e8811192505b50509392505050565b60026020528060005260406000206000915090505481565b60036020528060005260406000206000915090505481565b6000806000809150600090505b895181101561100257896000815181101515610ed157fe5b906020019060200201516003600581101515610ee957fe5b602002015173ffffffffffffffffffffffffffffffffffffffff168a82815181101515610f1257fe5b906020019060200201516003600581101515610f2a57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16141515610f5157600080fd5b610fe582610fe08c84815181101515610f6657fe5b906020019060200201518c85815181101515610f7e57fe5b90602001906020020151610f928d886123ae565b8c8c88815181101515610fa157fe5b906020019060200201518c89815181101515610fb957fe5b906020019060200201518c8a815181101515610fd157fe5b906020019060200201516118d3565b6123c8565b915087821415610ff457611002565b5b8080600101915050610eb9565b8192505b5050979650505050505050565b600061101d612a8c565b6000806101606040519081016040528088600060058110151561103c57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200188600160058110151561106b57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200188600260058110151561109a57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018860036005811015156110c957fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018860046005811015156110f857fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200187600060068110151561112757fe5b6020020151815260200187600160068110151561114057fe5b6020020151815260200187600260068110151561115957fe5b6020020151815260200187600360068110151561117257fe5b6020020151815260200187600460068110151561118b57fe5b6020020151815260200161119f8989612073565b6000191681525092503373ffffffffffffffffffffffffffffffffffffffff16836000015173ffffffffffffffffffffffffffffffffffffffff161415156111e657600080fd5b60008360a001511180156111fe575060008360c00151115b801561120a5750600085115b151561121557600080fd5b8261012001514210151561127257826101400151600019166000600381111561123a57fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a3600093506114f1565b61128d8360c00151611288856101400151611605565b6123ae565b915061129985836123e7565b905060008114156112f35782610140015160001916600160038111156112bb57fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a3600093506114f1565b61131d600360008561014001516000191660001916815260200190815260200160002054826123c8565b60036000856101400151600019166000191681526020019081526020016000208190555082604001518360600151604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140192505050604051809103902060001916836080015173ffffffffffffffffffffffffffffffffffffffff16846000015173ffffffffffffffffffffffffffffffffffffffff167f67d66f160bc93d925d05dae1794c90d2d6d6688b29b84ff069398a9b0458713186604001518760600151611455878a60c001518b60a00151611757565b878a6101400151604051808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200184815260200183815260200182600019166000191681526020019550505050505060405180910390a48093505b5050509392505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008090505b86518110156115d5576115c7878281518110151561154057fe5b90602001906020020151878381518110151561155857fe5b90602001906020020151878481518110151561157057fe5b90602001906020020151878581518110151561158857fe5b9060200190602002015187868151811015156115a057fe5b9060200190602002015187878151811015156115b857fe5b906020019060200201516115df565b5b8080600101915050611526565b5b50505050505050565b836115f087878760008888886118d3565b1415156115fc57600080fd5b5b505050505050565b600061164760026000846000191660001916815260200190815260200160002054600360008560001916600019168152602001908152602001600020546123c8565b90505b919050565b600060018560405180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c0182600019166000191681526020019150506040518091039020858585604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561171457600080fd5b50506020604051035173ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff161490505b95945050505050565b600061176c611766858461235e565b84612392565b90505b9392505050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008090505b87518110156118535761184488828151811015156117bc57fe5b9060200190602002015188838151811015156117d457fe5b9060200190602002015188848151811015156117ec57fe5b9060200190602002015188888681518110151561180557fe5b90602001906020020151888781518110151561181d57fe5b90602001906020020151888881518110151561183557fe5b906020019060200201516118d3565b505b80806001019150506117a2565b5b5050505050505050565b60008090505b83518110156118cc576118bd848281518110151561187e57fe5b90602001906020020151848381518110151561189657fe5b9060200190602002015184848151811015156118ae57fe5b90602001906020020151611013565b505b8080600101915050611864565b5b50505050565b60006118dd612a8c565b600080600080610160604051908101604052808e60006005811015156118ff57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018e600160058110151561192e57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018e600260058110151561195d57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018e600360058110151561198c57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018e60046005811015156119bb57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018d60006006811015156119ea57fe5b602002015181526020018d6001600681101515611a0357fe5b602002015181526020018d6002600681101515611a1c57fe5b602002015181526020018d6003600681101515611a3557fe5b602002015181526020018d6004600681101515611a4e57fe5b60200201518152602001611a628f8f612073565b600019168152509450600073ffffffffffffffffffffffffffffffffffffffff16856020015173ffffffffffffffffffffffffffffffffffffffff161480611ad957503373ffffffffffffffffffffffffffffffffffffffff16856020015173ffffffffffffffffffffffffffffffffffffffff16145b1515611ae457600080fd5b60008560a00151118015611afc575060008560c00151115b8015611b08575060008b115b1515611b1357600080fd5b611b2985600001518661014001518b8b8b61164f565b1515611b3457600080fd5b84610120015142101515611b91578461014001516000191660006003811115611b5957fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550612063565b611bac8560c00151611ba7876101400151611605565b6123ae565b9350611bb88b856123e7565b95506000861415611c12578461014001516000191660016003811115611bda57fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550612063565b611c25868660c001518760a00151610e2d565b15611c79578461014001516000191660026003811115611c4157fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550612063565b89158015611c8e5750611c8c8587612401565b155b15611ce15784610140015160001916600380811115611ca957fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550612063565b611cf4868660c001518760a00151611757565b9250611d20600260008761014001516000191660001916815260200190815260200160002054876123c8565b600260008761014001516000191660001916815260200190815260200160002081905550611d58856040015186600001513386612751565b1515611d6357600080fd5b611d77856060015133876000015189612751565b1515611d8257600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16856080015173ffffffffffffffffffffffffffffffffffffffff16141515611e815760008560e001511115611e1f57611ddc868660c001518760e00151611757565b9150611e136000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff168660000151876080015185612751565b1515611e1e57600080fd5b5b60008561010001511115611e8057611e41868660c00151876101000151611757565b9050611e746000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1633876080015184612751565b1515611e7f57600080fd5b5b5b84604001518560600151604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140192505050604051809103902060001916856080015173ffffffffffffffffffffffffffffffffffffffff16866000015173ffffffffffffffffffffffffffffffffffffffff167f0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb33389604001518a60600151898d8a8a8f6101400151604051808973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200186815260200185815260200184815260200183815260200182600019166000191681526020019850505050505050505060405180910390a48595505b5050505050979650505050505050565b60003083600060058110151561208557fe5b602002015184600160058110151561209957fe5b60200201518560026005811015156120ad57fe5b60200201518660036005811015156120c157fe5b60200201518760046005811015156120d557fe5b60200201518760006006811015156120e957fe5b60200201518860016006811015156120fd57fe5b602002015189600260068110151561211157fe5b60200201518a600360068110151561212557fe5b60200201518b600460068110151561213957fe5b60200201518c600560068110151561214d57fe5b6020020151604051808d73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018781526020018681526020018581526020018481526020018381526020018281526020019c50505050505050505050505050604051809103902090505b92915050565b61138781565b6040805190810160405280600581526020017f312e302e3000000000000000000000000000000000000000000000000000000081525081565b6000808284029050600084148061237f575082848281151561237c57fe5b04145b151561238757fe5b8091505b5092915050565b60008082848115156123a057fe5b0490508091505b5092915050565b60008282111515156123bc57fe5b81830390505b92915050565b60008082840190508381101515156123dc57fe5b8091505b5092915050565b60008183106123f657816123f8565b825b90505b92915050565b60008060008060008060008060003397506124258a8c60c001518d60a00151611757565b9650600073ffffffffffffffffffffffffffffffffffffffff168b6080015173ffffffffffffffffffffffffffffffffffffffff161415156126d2576000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168b6040015173ffffffffffffffffffffffffffffffffffffffff161495506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168b6060015173ffffffffffffffffffffffffffffffffffffffff161494506125208a8c60c001518d60e00151611757565b93506125368a8c60c001518d6101000151611757565b925085612543578361254e565b61254d87856123c8565b5b91508461255b5782612566565b6125658a846123c8565b5b9050816125986000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff168d600001516128ae565b10806125d15750816125cf6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff168d60000151612972565b105b806126055750806126036000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a6128ae565b105b806126395750806126376000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff168a612972565b105b156126475760009850612743565b851580156126805750866126638c604001518d600001516128ae565b108061267f57508661267d8c604001518d60000151612972565b105b5b1561268e5760009850612743565b841580156126bf5750896126a68c606001518a6128ae565b10806126be5750896126bc8c606001518a612972565b105b5b156126cd5760009850612743565b61273e565b866126e58c604001518d600001516128ae565b10806127015750866126ff8c604001518d60000151612972565b105b806127185750896127168c606001518a6128ae565b105b8061272f57508961272d8c606001518a612972565b105b1561273d5760009850612743565b5b600198505b505050505050505092915050565b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166315dacbea868686866000604051602001526040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001945050505050602060405180830381600087803b151561288857600080fd5b6102c65a03f1151561289957600080fd5b5050506040518051905090505b949350505050565b60008273ffffffffffffffffffffffffffffffffffffffff166370a0823161138761ffff16846040518363ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050602060405180830381600088803b151561295157600080fd5b87f1151561295e57600080fd5b505050506040518051905090505b92915050565b60008273ffffffffffffffffffffffffffffffffffffffff1663dd62ed3e61138761ffff1684600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff166040518463ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200192505050602060405180830381600088803b1515612a6b57600080fd5b87f11515612a7857600080fd5b505050506040518051905090505b92915050565b61016060405190810160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081526020016000815260200160008152602001600081526020016000801916815250905600a165627a7a7230582051fd36c20467561cfff517e73443e85bfad01c2fe07b8431ba9903676db7bb140029", "networks": { - "42": { + "50": { "links": {}, "events": { "0x0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3": { @@ -716,13 +722,13 @@ "type": "event" } }, - "updated_at": 1499299724252, - "address": "0x63869171a246622ef8f9234879ce2c06cebd85f6" + "updated_at": 1502391794390, + "address": "0xb69e673309512a9d726f87304c6984054f87a93b" }, - "50": { + "42": { "links": {}, "events": { - "0xcf8bd4f6ec4f39997290cf18413805f1f190eebd60e32ffc174b56d07a355beb": { + "0x0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3": { "anonymous": false, "inputs": [ { @@ -752,37 +758,22 @@ }, { "indexed": false, - "name": "filledBy", - "type": "address" - }, - { - "indexed": false, - "name": "makerTokenAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "takerTokenAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "makerFee", + "name": "filledMakerTokenAmount", "type": "uint256" }, { "indexed": false, - "name": "takerFee", + "name": "filledTakerTokenAmount", "type": "uint256" }, { "indexed": false, - "name": "expirationTimestampInSec", + "name": "paidMakerFee", "type": "uint256" }, { "indexed": false, - "name": "filledTakerTokenAmount", + "name": "paidTakerFee", "type": "uint256" }, { @@ -799,7 +790,7 @@ "name": "LogFill", "type": "event" }, - "0x4565177cd5184f550db0ab57b1d5bc808f8e8ba0adcb13fb257f1e7cf019a2b6": { + "0x67d66f160bc93d925d05dae1794c90d2d6d6688b29b84ff069398a9b04587131": { "anonymous": false, "inputs": [ { @@ -824,32 +815,12 @@ }, { "indexed": false, - "name": "makerTokenAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "takerTokenAmount", - "type": "uint256" - }, - { - "indexed": false, - "name": "makerFee", - "type": "uint256" - }, - { - "indexed": false, - "name": "takerFee", - "type": "uint256" - }, - { - "indexed": false, - "name": "expirationTimestampInSec", + "name": "cancelledMakerTokenAmount", "type": "uint256" }, { "indexed": false, - "name": "cancelledtakerTokenAmount", + "name": "cancelledTakerTokenAmount", "type": "uint256" }, { @@ -882,7 +853,14 @@ ], "name": "LogError", "type": "event" - }, + } + }, + "updated_at": 1502391794390, + "address": "0x90fe2af704b34e0224bf2299c838e04d4dcf1364" + }, + "1": { + "links": {}, + "events": { "0x0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3": { "anonymous": false, "inputs": [ @@ -991,12 +969,29 @@ ], "name": "LogCancel", "type": "event" + }, + "0x36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e90": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "errorId", + "type": "uint8" + }, + { + "indexed": true, + "name": "orderHash", + "type": "bytes32" + } + ], + "name": "LogError", + "type": "event" } }, - "updated_at": 1499462280316, - "address": "0xb69e673309512a9d726f87304c6984054f87a93b" + "updated_at": 1502480340000, + "address": "0x12459C951127e0c374FF9105DdA097662A027093" } }, "schema_version": "0.0.5", - "updated_at": 1499462280316 + "updated_at": 1502391794390 } diff --git a/src/artifacts/Mintable.json b/src/artifacts/Mintable.json deleted file mode 100644 index 9dd879108..000000000 --- a/src/artifacts/Mintable.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "contract_name": "Mintable", - "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "_spender", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "approve", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "totalSupply", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_from", - "type": "address" - }, - { - "name": "_to", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "transferFrom", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_owner", - "type": "address" - } - ], - "name": "balanceOf", - "outputs": [ - { - "name": "balance", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_value", - "type": "uint256" - } - ], - "name": "mint", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_to", - "type": "address" - }, - { - "name": "_value", - "type": "uint256" - } - ], - "name": "transfer", - "outputs": [ - { - "name": "success", - "type": "bool" - } - ], - "payable": false, - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_owner", - "type": "address" - }, - { - "name": "_spender", - "type": "address" - } - ], - "name": "allowance", - "outputs": [ - { - "name": "remaining", - "type": "uint256" - } - ], - "payable": false, - "type": "function" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "_from", - "type": "address" - }, - { - "indexed": true, - "name": "_to", - "type": "address" - }, - { - "indexed": false, - "name": "_value", - "type": "uint256" - } - ], - "name": "Transfer", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "_owner", - "type": "address" - }, - { - "indexed": true, - "name": "_spender", - "type": "address" - }, - { - "indexed": false, - "name": "_value", - "type": "uint256" - } - ], - "name": "Approval", - "type": "event" - } - ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6104da8061001c6000396000f300606060405236156100675763ffffffff60e060020a600035041663095ea7b3811461006957806318160ddd1461009c57806323b872dd146100be57806370a08231146100f7578063a0712d6814610125578063a9059cbb1461013a578063dd62ed3e1461016d575bfe5b341561007157fe5b610088600160a060020a03600435166024356101a1565b604080519115158252519081900360200190f35b34156100a457fe5b6100ac61020c565b60408051918252519081900360200190f35b34156100c657fe5b610088600160a060020a0360043581169060243516604435610212565b604080519115158252519081900360200190f35b34156100ff57fe5b6100ac600160a060020a036004351661030e565b60408051918252519081900360200190f35b341561012d57fe5b61013860043561032d565b005b341561014257fe5b610088600160a060020a0360043516602435610395565b604080519115158252519081900360200190f35b341561017557fe5b6100ac600160a060020a0360043581169060243516610447565b60408051918252519081900360200190f35b600160a060020a03338116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b60025481565b600160a060020a0383166000908152602081905260408120548290108015906102625750600160a060020a0380851660009081526001602090815260408083203390941683529290522054829010155b80156102885750600160a060020a03831660009081526020819052604090205482810110155b1561030257600160a060020a03808416600081815260208181526040808320805488019055888516808452818420805489900390556001835281842033909616845294825291829020805487900390558151868152915192939260008051602061048f8339815191529281900390910190a3506001610306565b5060005b5b9392505050565b600160a060020a0381166000908152602081905260409020545b919050565b68056bc75e2d631000008111156103445760006000fd5b600160a060020a033316600090815260208190526040902054610368908290610474565b600160a060020a03331660009081526020819052604090205560025461038e9082610474565b6002555b50565b600160a060020a0333166000908152602081905260408120548290108015906103d85750600160a060020a03831660009081526020819052604090205482810110155b1561043857600160a060020a03338116600081815260208181526040808320805488900390559387168083529184902080548701905583518681529351919360008051602061048f833981519152929081900390910190a3506001610206565b506000610206565b5b92915050565b600160a060020a038083166000908152600160209081526040808320938516835292905220545b92915050565b60008282018381101561048357fe5b8091505b50929150505600ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa165627a7a72305820b42ca96e1b6db90faf9be8fb630f57ee3986233fec8ecfc11fd467b13499abc70029", - "networks": {}, - "schema_version": "0.0.5", - "updated_at": 1499462278466 -}
\ No newline at end of file diff --git a/src/artifacts/Token.json b/src/artifacts/Token.json index cfb56586e..9487c0782 100644 --- a/src/artifacts/Token.json +++ b/src/artifacts/Token.json @@ -169,8 +169,8 @@ "type": "event" } ], - "unlinked_binary": "0x6060604052341561000c57fe5b5b6101e08061001c6000396000f3006060604052361561005c5763ffffffff60e060020a600035041663095ea7b3811461005e57806318160ddd1461009157806323b872dd146100b357806370a08231146100ec578063a9059cbb1461005e578063dd62ed3e1461014d575bfe5b341561006657fe5b61007d600160a060020a0360043516602435610181565b604080519115158252519081900360200190f35b341561009957fe5b6100a161018a565b60408051918252519081900360200190f35b34156100bb57fe5b61007d600160a060020a0360043581169060243516604435610190565b604080519115158252519081900360200190f35b34156100f457fe5b6100a1600160a060020a036004351661019a565b60408051918252519081900360200190f35b341561006657fe5b61007d600160a060020a0360043516602435610181565b604080519115158252519081900360200190f35b341561015557fe5b6100a1600160a060020a0360043581169060243516610181565b60408051918252519081900360200190f35b60005b92915050565b60005b90565b60005b9392505050565b60005b919050565b60005b92915050565b60005b929150505600a165627a7a72305820fdbf6d7c43240d51b292524e87c255de3b211ebfa0c7d4b726d8dc0da2a05e180029", + "unlinked_binary": "0x6060604052341561000c57fe5b5b6101e08061001c6000396000f3006060604052361561005c5763ffffffff60e060020a600035041663095ea7b3811461005e57806318160ddd1461009157806323b872dd146100b357806370a08231146100ec578063a9059cbb1461005e578063dd62ed3e1461014d575bfe5b341561006657fe5b61007d600160a060020a0360043516602435610181565b604080519115158252519081900360200190f35b341561009957fe5b6100a161018a565b60408051918252519081900360200190f35b34156100bb57fe5b61007d600160a060020a0360043581169060243516604435610190565b604080519115158252519081900360200190f35b34156100f457fe5b6100a1600160a060020a036004351661019a565b60408051918252519081900360200190f35b341561006657fe5b61007d600160a060020a0360043516602435610181565b604080519115158252519081900360200190f35b341561015557fe5b6100a1600160a060020a0360043581169060243516610181565b60408051918252519081900360200190f35b60005b92915050565b60005b90565b60005b9392505050565b60005b919050565b60005b92915050565b60005b929150505600a165627a7a7230582082d46fcd9caa49348b3932d5c18807e1d10d0105371a8bce147cc647f3762a500029", "networks": {}, "schema_version": "0.0.5", - "updated_at": 1499462278465 + "updated_at": 1502391792217 }
\ No newline at end of file diff --git a/src/artifacts/TokenRegistry.json b/src/artifacts/TokenRegistry.json index 7eb24c3d9..7683b8530 100644 --- a/src/artifacts/TokenRegistry.json +++ b/src/artifacts/TokenRegistry.json @@ -12,7 +12,7 @@ "name": "getTokenAddressByName", "outputs": [ { - "name": "tokenAddress", + "name": "", "type": "address" } ], @@ -28,7 +28,7 @@ }, { "name": "_ipfsHash", - "type": "bytes32" + "type": "bytes" } ], "name": "setTokenIpfsHash", @@ -47,7 +47,7 @@ "name": "getTokenAddressBySymbol", "outputs": [ { - "name": "tokenAddress", + "name": "", "type": "address" } ], @@ -60,6 +60,10 @@ { "name": "_token", "type": "address" + }, + { + "name": "_index", + "type": "uint256" } ], "name": "removeToken", @@ -78,32 +82,28 @@ "name": "getTokenMetaData", "outputs": [ { - "name": "tokenAddress", + "name": "", "type": "address" }, { - "name": "name", - "type": "string" - }, - { - "name": "symbol", + "name": "", "type": "string" }, { - "name": "url", + "name": "", "type": "string" }, { - "name": "decimals", + "name": "", "type": "uint8" }, { - "name": "ipfsHash", - "type": "bytes32" + "name": "", + "type": "bytes" }, { - "name": "swarmHash", - "type": "bytes32" + "name": "", + "type": "bytes" } ], "payable": false, @@ -130,23 +130,6 @@ "type": "address" }, { - "name": "_url", - "type": "string" - } - ], - "name": "setTokenUrl", - "outputs": [], - "payable": false, - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_token", - "type": "address" - }, - { "name": "_name", "type": "string" }, @@ -155,20 +138,16 @@ "type": "string" }, { - "name": "_url", - "type": "string" - }, - { "name": "_decimals", "type": "uint8" }, { "name": "_ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "name": "_swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "addToken", @@ -216,20 +195,16 @@ "type": "string" }, { - "name": "url", - "type": "string" - }, - { "name": "decimals", "type": "uint8" }, { "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "payable": false, @@ -264,32 +239,28 @@ "name": "getTokenByName", "outputs": [ { - "name": "tokenAddress", + "name": "", "type": "address" }, { - "name": "name", - "type": "string" - }, - { - "name": "symbol", + "name": "", "type": "string" }, { - "name": "url", + "name": "", "type": "string" }, { - "name": "decimals", + "name": "", "type": "uint8" }, { - "name": "ipfsHash", - "type": "bytes32" + "name": "", + "type": "bytes" }, { - "name": "swarmHash", - "type": "bytes32" + "name": "", + "type": "bytes" } ], "payable": false, @@ -304,7 +275,7 @@ }, { "name": "_swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "setTokenSwarmHash", @@ -336,32 +307,28 @@ "name": "getTokenBySymbol", "outputs": [ { - "name": "tokenAddress", + "name": "", "type": "address" }, { - "name": "name", - "type": "string" - }, - { - "name": "symbol", + "name": "", "type": "string" }, { - "name": "url", + "name": "", "type": "string" }, { - "name": "decimals", + "name": "", "type": "uint8" }, { - "name": "ipfsHash", - "type": "bytes32" + "name": "", + "type": "bytes" }, { - "name": "swarmHash", - "type": "bytes32" + "name": "", + "type": "bytes" } ], "payable": false, @@ -401,7 +368,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -417,23 +384,18 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogAddToken", @@ -443,7 +405,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -459,23 +421,18 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogRemoveToken", @@ -485,7 +442,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -507,7 +464,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -529,41 +486,19 @@ "anonymous": false, "inputs": [ { - "indexed": false, - "name": "token", - "type": "address" - }, - { - "indexed": false, - "name": "oldUrl", - "type": "string" - }, - { - "indexed": false, - "name": "newUrl", - "type": "string" - } - ], - "name": "LogTokenUrlChange", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldIpfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newIpfsHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenIpfsHashChange", @@ -573,35 +508,35 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldSwarmHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newSwarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenSwarmHashChange", "type": "event" } ], - "unlinked_binary": "0x60606040525b60008054600160a060020a03191633600160a060020a03161790555b5b612635806100316000396000f300606060405236156100d55763ffffffff60e060020a6000350416632fbfeba981146100d757806334ed557f146101495780633550b6d91461016a5780635fa7b584146101dc5780637abccac9146101fa5780638da5cb5b146103ab57806391914b30146103d75780639a84d0c414610439578063c370c86d14610525578063e486033914610587578063e5df8b841461074d578063e73fc0c31461077c578063eaabd05e14610967578063ee8c24b814610988578063efa74f1f146109f3578063f036417f14610bde578063f2fde38b14610c40575bfe5b34156100df57fe5b61012d600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843750949650610c5e95505050505050565b60408051600160a060020a039092168252519081900360200190f35b341561015157fe5b610168600160a060020a0360043516602435610cd1565b005b341561017257fe5b61012d600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843750949650610d8395505050505050565b60408051600160a060020a039092168252519081900360200190f35b34156101e457fe5b610168600160a060020a0360043516610df6565b005b341561020257fe5b610216600160a060020a03600435166112b3565b60408051600160a060020a038916815260ff8516608082015260a0810184905260c0810183905260e060208083018281528a5192840192909252895192939192918401916060850191610100860191908c01908083838215610293575b80518252602083111561029357601f199092019160209182019101610273565b505050905090810190601f1680156102bf5780820380516001836020036101000a031916815260200191505b5084810383528951815289516020918201918b019080838382156102fe575b8051825260208311156102fe57601f1990920191602091820191016102de565b505050905090810190601f16801561032a5780820380516001836020036101000a031916815260200191505b5084810382528851815288516020918201918a01908083838215610369575b80518252602083111561036957601f199092019160209182019101610349565b505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b34156103b357fe5b61012d611529565b60408051600160a060020a039092168252519081900360200190f35b34156103df57fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610168958335600160a060020a0316959394604494939290920191819084018382808284375094965061153895505050505050565b005b341561044157fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610168958335600160a060020a0316959394604494939290920191819084018382808284375050604080516020601f89358b0180359182018390048302840183019094528083529799988101979196509182019450925082915084018382808284375050604080516020601f89358b018035918201839004830284018301909452808352979998810197919650918201945092508291508401838280828437509496505060ff85351694602081013594506040013592506116df915050565b005b341561052d57fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610168958335600160a060020a03169593946044949392909201918190840183828082843750949650611b3a95505050505050565b005b341561058f57fe5b6105a3600160a060020a0360043516611de0565b60408051600160a060020a038916815260ff8516608082015260a0810184905260c0810183905260e06020820181815289546002610100600183161581026000190190921604928401839052929390929084019160608501918501908b90801561064e5780601f106106235761010080835404028352916020019161064e565b820191906000526020600020905b81548152906001019060200180831161063157829003601f168201915b505084810383528954600260001961010060018416150201909116048082526020909101908a9080156106c25780601f10610697576101008083540402835291602001916106c2565b820191906000526020600020905b8154815290600101906020018083116106a557829003601f168201915b50508481038252885460026000196101006001841615020190911604808252602090910190899080156107365780601f1061070b57610100808354040283529160200191610736565b820191906000526020600020905b81548152906001019060200180831161071957829003601f168201915b50509a505050505050505050505060405180910390f35b341561075557fe5b61012d600435611e24565b60408051600160a060020a039092168252519081900360200190f35b341561078457fe5b610216600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843750949650611e5695505050505050565b60408051600160a060020a038916815260ff8516608082015260a0810184905260c0810183905260e060208083018281528a5192840192909252895192939192918401916060850191610100860191908c01908083838215610293575b80518252602083111561029357601f199092019160209182019101610273565b505050905090810190601f1680156102bf5780820380516001836020036101000a031916815260200191505b5084810383528951815289516020918201918b019080838382156102fe575b8051825260208311156102fe57601f1990920191602091820191016102de565b505050905090810190601f16801561032a5780820380516001836020036101000a031916815260200191505b5084810382528851815288516020918201918a01908083838215610369575b80518252602083111561036957601f199092019160209182019101610349565b505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b341561096f57fe5b610168600160a060020a0360043516602435611f09565b005b341561099057fe5b610998611fbb565b60408051602080825283518183015283519192839290830191858101910280838382156109e0575b8051825260208311156109e057601f1990920191602091820191016109c0565b5050509050019250505060405180910390f35b34156109fb57fe5b610216600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061202495505050505050565b60408051600160a060020a038916815260ff8516608082015260a0810184905260c0810183905260e060208083018281528a5192840192909252895192939192918401916060850191610100860191908c01908083838215610293575b80518252602083111561029357601f199092019160209182019101610273565b505050905090810190601f1680156102bf5780820380516001836020036101000a031916815260200191505b5084810383528951815289516020918201918b019080838382156102fe575b8051825260208311156102fe57601f1990920191602091820191016102de565b505050905090810190601f16801561032a5780820380516001836020036101000a031916815260200191505b5084810382528851815288516020918201918a01908083838215610369575b80518252602083111561036957601f199092019160209182019101610349565b505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b3415610be657fe5b60408051602060046024803582810135601f8101859004850286018501909652858552610168958335600160a060020a031695939460449493929092019181908401838280828437509496506120d795505050505050565b005b3415610c4857fe5b610168600160a060020a036004351661237c565b005b60006003826040518082805190602001908083835b60208310610c925780518252601f199092019160209182019101610c73565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316925050505b919050565b6000805433600160a060020a03908116911614610cee5760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600160a060020a038416600081815260016020908152604091829020600581015483519485529184019190915282820186905290519093507fe46a8f26cfc48c12e40cf50c1063e5913b2a17da6aa396f9b008b2dfd6f273b59181900360600190a1600582018390555b5b5b505b505050565b60006002826040518082805190602001908083835b60208310610c925780518252601f199092019160209182019101610c73565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316925050505b919050565b60008054819033600160a060020a03908116911614610e155760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600092505b600454831015610f295783600160a060020a0316600484815481101515610e5f57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600160a060020a03161415610f1d57600480546000198101908110610ea057fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600484815481101515610ecf57fe5b906000526020600020900160005b6101000a815481600160a060020a030219169083600160a060020a031602179055506001600481818054905003915081610f1791906123c8565b50610f29565b5b600190920191610e3c565b600160a060020a03808516600090815260016020818152604092839020805460048201546005830154600684015487519390981680845260ff9092166080840181905260a0840182905260c0840189905260e09584018681528588018054600299811615610100908102600019019091168a9004988701899052969c507fc9ec69d3b744b4ec70f035ed0a15ed7029e668bfb9f326e657878b2b38a90da29a949990988d019760038e0197939694959493918401916060850191908501908b9080156110365780601f1061100b57610100808354040283529160200191611036565b820191906000526020600020905b81548152906001019060200180831161101957829003601f168201915b505084810383528954600260001961010060018416150201909116048082526020909101908a9080156110aa5780601f1061107f576101008083540402835291602001916110aa565b820191906000526020600020905b81548152906001019060200180831161108d57829003601f168201915b505084810382528854600260001961010060018416150201909116048082526020909101908990801561111e5780601f106110f35761010080835404028352916020019161111e565b820191906000526020600020905b81548152906001019060200180831161110157829003601f168201915b50509a505050505050505050505060405180910390a160028260020160405180828054600181600116156101000203166002900480156111955780601f10611173576101008083540402835291820191611195565b820191906000526020600020905b815481529060010190602001808311611181575b5050915050908152602001604051809103902060006101000a815490600160a060020a030219169055600382600101604051808280546001816001161561010002031660029004801561121f5780601f106111fd57610100808354040283529182019161121f565b820191906000526020600020905b81548152906001019060200180831161120b575b5050928352505060408051602092819003830190208054600160a060020a0319908116909155600160a060020a03871660009081526001938490529182208054909116815591611271908301826123f2565b61127f6002830160006123f2565b61128d6003830160006123f2565b5060048101805460ff191690556000600582018190556006909101555b5b5b505b505050565b60006112bd61243a565b6112c561243a565b6112cd61243a565b6000600060006112db61244c565b600160a060020a03898116600090815260016020818152604092839020835160e0810185528154909516855280830180548551600261010096831615969096026000190190911694909404601f8101849004840285018401909552848452909385830193928301828280156113915780601f1061136657610100808354040283529160200191611391565b820191906000526020600020905b81548152906001019060200180831161137457829003601f168201915b5050509183525050600282810180546040805160206001841615610100026000190190931694909404601f810183900483028501830190915280845293810193908301828280156114235780601f106113f857610100808354040283529160200191611423565b820191906000526020600020905b81548152906001019060200180831161140657829003601f168201915b505050918352505060038201805460408051602060026001851615610100026000190190941693909304601f81018490048402820184019092528181529382019392918301828280156114b75780601f1061148c576101008083540402835291602001916114b7565b820191906000526020600020905b81548152906001019060200180831161149a57829003601f168201915b5050509183525050600482015460ff1660208083019190915260058301546040808401919091526006909301546060928301528351908401519284015191840151608085015160a086015160c0870151939e50949c50929a509850909650909450925090505b50919395979092949650565b600054600160a060020a031681565b6000805433600160a060020a039081169116146115555760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600160a060020a03841660008181526001602081815260409283902083519485526060918501828152600382018054600295811615610100026000190116949094049286018390529096507f6b45310c970f5d74814e429bdacd69c748dcb086cd38b6ddb7c2029be609e1689489948993919291908301906080840190869080156116435780601f1061161857610100808354040283529160200191611643565b820191906000526020600020905b81548152906001019060200180831161162657829003601f168201915b505083810382528451815284516020918201918601908083838215611683575b80518252602083111561168357601f199092019160209182019101611663565b505050905090810190601f1680156116af5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a182516116d4906003840190602086019061249c565b505b5b5b505b505050565b60005433600160a060020a039081169116146116fb5760006000fd5b600160a060020a038088166000908152600160205260409020548891161515611b2d576040805160e081018252600160a060020a038a811680835260208084018c81528486018c9052606085018b905260ff8a16608086015260a0850189905260c08501889052600092835260018083529590922084518154600160a060020a0319169416939093178355905180519394929361179f93850192919091019061249c565b50604082015180516117bb91600284019160209091019061249c565b50606082015180516117d791600384019160209091019061249c565b5060808201516004828101805460ff191660ff9093169290921790915560a0830151600583015560c09092015160069091015580546001810161181a83826123c8565b916000526020600020900160005b8a909190916101000a815481600160a060020a030219169083600160a060020a0316021790555050876002876040518082805190602001908083835b602083106118835780518252601f199092019160209182019101611864565b51815160209384036101000a600019018019909216911617905292019485525060405193849003810184208054600160a060020a031916600160a060020a039690961695909517909455505088518a926003928b9290918291908401908083835b602083106119035780518252601f1990920191602091820191016118e4565b6001836020036101000a038019825116818451168082178552505050505050905001915050908152602001604051809103902060006101000a815481600160a060020a030219169083600160a060020a031602179055507f469f18a43061267ac6162ca1cec0c14a425189c7a19f52d6dc04419f3c12bb24888888888888886040518088600160a060020a0316600160a060020a031681526020018060200180602001806020018760ff1660ff1681526020018660001916600019168152602001856000191660001916815260200184810384528a818151815260200191508051906020019080838360008314611a15575b805182526020831115611a1557601f1990920191602091820191016119f5565b505050905090810190601f168015611a415780820380516001836020036101000a031916815260200191505b5084810383528951815289516020918201918b01908083838215611a80575b805182526020831115611a8057601f199092019160209182019101611a60565b505050905090810190601f168015611aac5780820380516001836020036101000a031916815260200191505b5084810382528851815288516020918201918a01908083838215611aeb575b805182526020831115611aeb57601f199092019160209182019101611acb565b505050905090810190601f168015611b175780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390a15b5b5b505b50505050505050565b6000805433600160a060020a03908116911614611b575760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600160a060020a038416600081815260016020818152604092839020835194855260609185018281528184018054600295811615610100026000190116949094049286018390529096507f4a6dbfc867b179991dec22ff19960f0a94d8d9d891fc556f547764670340e8ae948994899391929190830190608084019086908015611c445780601f10611c1957610100808354040283529160200191611c44565b820191906000526020600020905b815481529060010190602001808311611c2757829003601f168201915b505083810382528451815284516020918201918601908083838215611c84575b805182526020831115611c8457601f199092019160209182019101611c64565b505050905090810190601f168015611cb05780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a16003826001016040518082805460018160011615610100020316600290048015611d215780601f10611cff576101008083540402835291820191611d21565b820191906000526020600020905b815481529060010190602001808311611d0d575b5050928352505060405190819003602090810182208054600160a060020a031916905584518692600392879282918401908083835b60208310611d755780518252601f199092019160209182019101611d56565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381019093208054600160a060020a031916600160a060020a0395909516949094179093555084516116d49250600185019186019061249c565b505b5b5b505b505050565b60016020819052600091825260409091208054600482015460058301546006840154600160a060020a0390931694840193600281019360039091019260ff16919087565b6004805482908110611e3257fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b6000611e6061243a565b611e6861243a565b611e7061243a565b60006000600060006003896040518082805190602001908083835b60208310611eaa5780518252601f199092019160209182019101611e8b565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a03169250611eee91508290506112b3565b97509750975097509750975097505b50919395979092949650565b6000805433600160a060020a03908116911614611f265760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600160a060020a038416600081815260016020908152604091829020600681015483519485529184019190915282820186905290519093507fa9fd216856477e73d11c1a9140fa3d425fce2e10a5475a996440b31c2e8f1ea49181900360600190a1600682018390555b5b5b505b505050565b611fc361243a565b600480548060200260200160405190810160405280929190818152602001828054801561201957602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311611ffb575b505050505090505b90565b600061202e61243a565b61203661243a565b61203e61243a565b60006000600060006002896040518082805190602001908083835b60208310611eaa5780518252601f199092019160209182019101611e8b565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a03169250611eee91508290506112b3565b97509750975097509750975097505b50919395979092949650565b6000805433600160a060020a039081169116146120f45760006000fd5b600160a060020a0380841660009081526001602052604090205484911615610d7a57600160a060020a0384166000818152600160208181526040928390208351948552606091850182815260028083018054958616156101000260001901909516049286018390529096507f53d878a6530e56c9bc96548fa0a8cae4f1d1f49c86b0e934c086b992ebb6998f9489948993919291908301906080840190869080156121e05780601f106121b5576101008083540402835291602001916121e0565b820191906000526020600020905b8154815290600101906020018083116121c357829003601f168201915b505083810382528451815284516020918201918601908083838215612220575b80518252602083111561222057601f199092019160209182019101612200565b505050905090810190601f16801561224c5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a160028260020160405180828054600181600116156101000203166002900480156122bd5780601f1061229b5761010080835404028352918201916122bd565b820191906000526020600020905b8154815290600101906020018083116122a9575b5050928352505060405190819003602090810182208054600160a060020a031916905584518692600292879282918401908083835b602083106123115780518252601f1990920191602091820191016122f2565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381019093208054600160a060020a031916600160a060020a0395909516949094179093555084516116d49250600285019186019061249c565b505b5b5b505b505050565b60005433600160a060020a039081169116146123985760006000fd5b600160a060020a038116156123c35760008054600160a060020a031916600160a060020a0383161790555b5b5b50565b815481835581811511610d7e57600083815260209020610d7e9181019083016125d6565b5b505050565b50805460018160011615610100020316600290046000825580601f1061241857506123c3565b601f0160209004906000526020600020908101906123c391906125d6565b5b50565b60408051602081019091526000815290565b6040805160e08101909152600081526020810161246761243a565b815260200161247461243a565b815260200161248161243a565b81526000602082018190526040820181905260609091015290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106124dd57805160ff191683800117855561250a565b8280016001018555821561250a579182015b8281111561250a5782518255916020019190600101906124ef565b5b506125179291506125d6565b5090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106124dd57805160ff191683800117855561250a565b8280016001018555821561250a579182015b8281111561250a5782518255916020019190600101906124ef565b5b506125179291506125d6565b5090565b815481835581811511610d7e57600083815260209020610d7e9181019083016125d6565b5b505050565b60408051602081019091526000815290565b61202191905b8082111561251757600081556001016125dc565b5090565b90565b604080516020810190915260008152905600a165627a7a72305820bbbad662c2b9aa3f6280c2c40945a994a50d265b2802dffc2fcde186403c40200029", + "unlinked_binary": "0x60606040525b60008054600160a060020a03191633600160a060020a03161790555b5b612cc5806100316000396000f300606060405236156100ca5763ffffffff60e060020a60003504166313baf1e681146100cc5780632fbfeba9146100ed5780633550b6d91461015f57806356318820146101d15780637abccac9146102335780638da5cb5b1461044d578063a880319d14610479578063c370c86d1461059a578063e4860339146105fc578063e5df8b841461082b578063e73fc0c31461085a578063ee8c24b814610aae578063eef05f6514610b19578063efa74f1f14610b7b578063f036417f14610dcf578063f2fde38b14610e31575bfe5b34156100d457fe5b6100eb600160a060020a0360043516602435610e4f565b005b34156100f557fe5b610143600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061134895505050505050565b60408051600160a060020a039092168252519081900360200190f35b341561016757fe5b610143600480803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437509496506113bb95505050505050565b60408051600160a060020a039092168252519081900360200190f35b34156101d957fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100eb958335600160a060020a0316959394604494939290920191819084018382808284375094965061142e95505050505050565b005b341561023b57fe5b61024f600160a060020a03600435166115cf565b6040518087600160a060020a0316600160a060020a0316815260200180602001806020018660ff1660ff168152602001806020018060200185810385528a8181518152602001915080519060200190808383600083146102ca575b8051825260208311156102ca57601f1990920191602091820191016102aa565b505050905090810190601f1680156102f65780820380516001836020036101000a031916815260200191505b5085810384528951815289516020918201918b01908083838215610335575b80518252602083111561033557601f199092019160209182019101610315565b505050905090810190601f1680156103615780820380516001836020036101000a031916815260200191505b50858103835287518152875160209182019189019080838382156103a0575b8051825260208311156103a057601f199092019160209182019101610380565b505050905090810190601f1680156103cc5780820380516001836020036101000a031916815260200191505b508581038252865181528651602091820191880190808383821561040b575b80518252602083111561040b57601f1990920191602091820191016103eb565b505050905090810190601f1680156104375780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b341561045557fe5b6101436118ba565b60408051600160a060020a039092168252519081900360200190f35b341561048157fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100eb958335600160a060020a0316959394604494939290920191819084018382808284375050604080516020601f89358b0180359182018390048302840183019094528083529799988101979196509182019450925082915084018382808284375050604080516020601f818a01358b0180359182018390048302840183018552818452989a60ff8b35169a90999401975091955091820193509150819084018382808284375050604080516020601f89358b018035918201839004830284018301909452808352979998810197919650918201945092508291508401838280828437509496506118c995505050505050565b005b34156105a257fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100eb958335600160a060020a03169593946044949392909201918190840183828082843750949650611e7a95505050505050565b005b341561060457fe5b610618600160a060020a03600435166121a1565b60408051600160a060020a038816815260ff8516606082015260c0602082018181528854600260001961010060018416150201909116049183018290529192830190608084019060a085019060e08601908b9080156106b85780601f1061068d576101008083540402835291602001916106b8565b820191906000526020600020905b81548152906001019060200180831161069b57829003601f168201915b505085810384528954600260001961010060018416150201909116048082526020909101908a90801561072c5780601f106107015761010080835404028352916020019161072c565b820191906000526020600020905b81548152906001019060200180831161070f57829003601f168201915b50508581038352875460026000196101006001841615020190911604808252602090910190889080156107a05780601f10610775576101008083540402835291602001916107a0565b820191906000526020600020905b81548152906001019060200180831161078357829003601f168201915b50508581038252865460026000196101006001841615020190911604808252602090910190879080156108145780601f106107e957610100808354040283529160200191610814565b820191906000526020600020905b8154815290600101906020018083116107f757829003601f168201915b50509a505050505050505050505060405180910390f35b341561083357fe5b6101436004356121dc565b60408051600160a060020a039092168252519081900360200190f35b341561086257fe5b61024f600480803590602001908201803590602001908080601f0160208091040260200160405190810160405280939291908181526020018383808284375094965061220e95505050505050565b6040518087600160a060020a0316600160a060020a0316815260200180602001806020018660ff1660ff168152602001806020018060200185810385528a8181518152602001915080519060200190808383600083146102ca575b8051825260208311156102ca57601f1990920191602091820191016102aa565b505050905090810190601f1680156102f65780820380516001836020036101000a031916815260200191505b5085810384528951815289516020918201918b01908083838215610335575b80518252602083111561033557601f199092019160209182019101610315565b505050905090810190601f1680156103615780820380516001836020036101000a031916815260200191505b50858103835287518152875160209182019189019080838382156103a0575b8051825260208311156103a057601f199092019160209182019101610380565b505050905090810190601f1680156103cc5780820380516001836020036101000a031916815260200191505b508581038252865181528651602091820191880190808383821561040b575b80518252602083111561040b57601f1990920191602091820191016103eb565b505050905090810190601f1680156104375780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b3415610ab657fe5b610abe6122c1565b6040805160208082528351818301528351919283929083019185810191028083838215610b06575b805182526020831115610b0657601f199092019160209182019101610ae6565b5050509050019250505060405180910390f35b3415610b2157fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100eb958335600160a060020a0316959394604494939290920191819084018382808284375094965061232a95505050505050565b005b3415610b8357fe5b61024f600480803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437509496506124cb95505050505050565b6040518087600160a060020a0316600160a060020a0316815260200180602001806020018660ff1660ff168152602001806020018060200185810385528a8181518152602001915080519060200190808383600083146102ca575b8051825260208311156102ca57601f1990920191602091820191016102aa565b505050905090810190601f1680156102f65780820380516001836020036101000a031916815260200191505b5085810384528951815289516020918201918b01908083838215610335575b80518252602083111561033557601f199092019160209182019101610315565b505050905090810190601f1680156103615780820380516001836020036101000a031916815260200191505b50858103835287518152875160209182019189019080838382156103a0575b8051825260208311156103a057601f199092019160209182019101610380565b505050905090810190601f1680156103cc5780820380516001836020036101000a031916815260200191505b508581038252865181528651602091820191880190808383821561040b575b80518252602083111561040b57601f1990920191602091820191016103eb565b505050905090810190601f1680156104375780820380516001836020036101000a031916815260200191505b509a505050505050505050505060405180910390f35b3415610dd757fe5b60408051602060046024803582810135601f81018590048502860185019096528585526100eb958335600160a060020a0316959394604494939290920191819084018382808284375094965061257e95505050505050565b005b3415610e3957fe5b6100eb600160a060020a03600435166128a4565b005b6000805433600160a060020a03908116911614610e6c5760006000fd5b600160a060020a038084166000908152600160205260409020548491161515610e955760006000fd5b83600160a060020a0316600484815481101515610eae57fe5b906000526020600020900160005b9054600160a060020a036101009290920a90041614610edb5760006000fd5b600480546000198101908110610eed57fe5b906000526020600020900160005b9054906101000a9004600160a060020a0316600484815481101515610f1c57fe5b906000526020600020900160005b6101000a815481600160a060020a030219169083600160a060020a031602179055506001600481818054905003915081610f6491906128f0565b50600160a060020a0380851660009081526001602081815260409283902080546003820154855160ff90911695810186905260a0808252838601805460026000199882161561010002989098011687900491830182905293995091909616957f32c54f1e2ea75844ded7517e7dbcd3895da7cd0c28f9ab9f9cf6ecf5f83762c695929489019360048a019260058b0192918291908201906060830190608084019060c08501908b9080156110595780601f1061102e57610100808354040283529160200191611059565b820191906000526020600020905b81548152906001019060200180831161103c57829003601f168201915b505085810384528954600260001961010060018416150201909116048082526020909101908a9080156110cd5780601f106110a2576101008083540402835291602001916110cd565b820191906000526020600020905b8154815290600101906020018083116110b057829003601f168201915b50508581038352875460026000196101006001841615020190911604808252602090910190889080156111415780601f1061111657610100808354040283529160200191611141565b820191906000526020600020905b81548152906001019060200180831161112457829003601f168201915b50508581038252865460026000196101006001841615020190911604808252602090910190879080156111b55780601f1061118a576101008083540402835291602001916111b5565b820191906000526020600020905b81548152906001019060200180831161119857829003601f168201915b5050995050505050505050505060405180910390a2600282600201604051808280546001816001161561010002031660029004801561122b5780601f1061120957610100808354040283529182019161122b565b820191906000526020600020905b815481529060010190602001808311611217575b5050915050908152602001604051809103902060006101000a815490600160a060020a03021916905560038260010160405180828054600181600116156101000203166002900480156112b55780601f106112935761010080835404028352918201916112b5565b820191906000526020600020905b8154815290600101906020018083116112a1575b5050928352505060408051602092819003830190208054600160a060020a0319908116909155600160a060020a038716600090815260019384905291822080549091168155916113079083018261291a565b61131560028301600061291a565b60038201805460ff1916905561132f60048301600061291a565b61133d60058301600061291a565b50505b5b505b505050565b60006003826040518082805190602001908083835b6020831061137c5780518252601f19909201916020918201910161135d565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316925050505b919050565b60006002826040518082805190602001908083835b6020831061137c5780518252601f19909201916020918201910161135d565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316925050505b919050565b6000805433600160a060020a0390811691161461144b5760006000fd5b600160a060020a0380841660009081526001602052604090205484911615156114745760006000fd5b600160a060020a0384166000818152600160208181526040928390208351848152600582018054600295811615610100026000190116949094049481018590529096507fc3168fdc13112e44a031057dbf6c609b33353addb4d8037d24543e22cbfe2acd9388928291908201906060830190869080156115355780601f1061150a57610100808354040283529160200191611535565b820191906000526020600020905b81548152906001019060200180831161151857829003601f168201915b505083810382528451815284516020918201918601908083838215611575575b80518252602083111561157557601f199092019160209182019101611555565b505050905090810190601f1680156115a15780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a282516115c590600584019060208601906129aa565b505b5b505b505050565b60006115d9612a29565b6115e1612a29565b60006115eb612a29565b6115f3612a29565b6115fb612a4d565b600160a060020a03888116600090815260016020818152604092839020835160c0810185528154909516855280830180548551600261010096831615969096026000190190911694909404601f8101849004840285018401909552848452909385830193928301828280156116b15780601f10611686576101008083540402835291602001916116b1565b820191906000526020600020905b81548152906001019060200180831161169457829003601f168201915b5050509183525050600282810180546040805160206001841615610100026000190190931694909404601f810183900483028501830190915280845293810193908301828280156117435780601f1061171857610100808354040283529160200191611743565b820191906000526020600020905b81548152906001019060200180831161172657829003601f168201915b5050509183525050600382015460ff1660208083019190915260048301805460408051601f600260001960018616156101000201909416939093049283018590048502810185018252828152940193928301828280156117e45780601f106117b9576101008083540402835291602001916117e4565b820191906000526020600020905b8154815290600101906020018083116117c757829003601f168201915b505050918352505060058201805460408051602060026001851615610100026000190190941693909304601f81018490048402820184019092528181529382019392918301828280156118785780601f1061184d57610100808354040283529160200191611878565b820191906000526020600020905b81548152906001019060200180831161185b57829003601f168201915b5050509190925250508151602083015160408401516060850151608086015160a0870151949d50929b50909950975095509350909150505b5091939550919395565b600054600160a060020a031681565b60005433600160a060020a039081169116146118e55760006000fd5b600160a060020a038087166000908152600160205260409020548791161561190d5760006000fd5b86600160a060020a03811615156119245760006000fd5b856000600160a060020a03166002826040518082805190602001908083835b602083106119625780518252601f199092019160209182019101611943565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a03169290921491506119a990505760006000fd5b876000600160a060020a03166003826040518082805190602001908083835b602083106119e75780518252601f1990920191602091820191016119c8565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316929092149150611a2e90505760006000fd5b6040805160c081018252600160a060020a038c811680835260208084018e81528486018e905260ff8d166060860152608085018c905260a085018b9052600092835260018083529590922084518154600160a060020a03191694169390931783559051805193949293611aa89385019291909101906129aa565b5060408201518051611ac49160028401916020909101906129aa565b50606082015160038201805460ff191660ff90921691909117905560808201518051611afa9160048401916020909101906129aa565b5060a08201518051611b169160058401916020909101906129aa565b50506004805490915060018101611b2d83826128f0565b916000526020600020900160005b8c909190916101000a815481600160a060020a030219169083600160a060020a0316021790555050896002896040518082805190602001908083835b60208310611b965780518252601f199092019160209182019101611b77565b51815160209384036101000a600019018019909216911617905292019485525060405193849003810184208054600160a060020a031916600160a060020a03969096169590951790945550508a518c926003928d9290918291908401908083835b60208310611c165780518252601f199092019160209182019101611bf7565b51815160209384036101000a60001901801990921691161790529201948552506040805194859003820185208054600160a060020a031916600160a060020a0397881617905560ff8d169085015260a08085528e51908501528d51948f16947fd8d928b0b50ca11d9dc273236b46f3526515b03602f71f3a6af4f45bd9fa9144948f94508e93508d928d928d92918291828201916060840191608085019160c0860191908c01908083838215611ce7575b805182526020831115611ce757601f199092019160209182019101611cc7565b505050905090810190601f168015611d135780820380516001836020036101000a031916815260200191505b5085810384528951815289516020918201918b01908083838215611d52575b805182526020831115611d5257601f199092019160209182019101611d32565b505050905090810190601f168015611d7e5780820380516001836020036101000a031916815260200191505b5085810383528751815287516020918201918901908083838215611dbd575b805182526020831115611dbd57601f199092019160209182019101611d9d565b505050905090810190601f168015611de95780820380516001836020036101000a031916815260200191505b5085810382528651815286516020918201918801908083838215611e28575b805182526020831115611e2857601f199092019160209182019101611e08565b505050905090810190601f168015611e545780820380516001836020036101000a031916815260200191505b50995050505050505050505060405180910390a25b5b505b505b505b505b505050505050565b6000805433600160a060020a03908116911614611e975760006000fd5b600160a060020a038084166000908152600160205260409020548491161515611ec05760006000fd5b826000600160a060020a03166003826040518082805190602001908083835b60208310611efe5780518252601f199092019160209182019101611edf565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a0316929092149150611f4590505760006000fd5b600160a060020a03851660008181526001602081815260409283902083518481528184018054600295811615610100026000190116949094049481018590529097507f4a6dbfc867b179991dec22ff19960f0a94d8d9d891fc556f547764670340e8ae9389928291908201906060830190869080156120055780601f10611fda57610100808354040283529160200191612005565b820191906000526020600020905b815481529060010190602001808311611fe857829003601f168201915b505083810382528451815284516020918201918601908083838215612045575b80518252602083111561204557601f199092019160209182019101612025565b505050905090810190601f1680156120715780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a260038360010160405180828054600181600116156101000203166002900480156120e15780601f106120bf5761010080835404028352918201916120e1565b820191906000526020600020905b8154815290600101906020018083116120cd575b5050928352505060405190819003602090810182208054600160a060020a031916905585518792600392889282918401908083835b602083106121355780518252601f199092019160209182019101612116565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381019093208054600160a060020a031916600160a060020a03959095169490941790935550855161133d925060018601918701906129aa565b505b5b505b505b505050565b600160208190526000918252604090912080546003820154600160a060020a0390911692820191600281019160ff1690600481019060050186565b60048054829081106121ea57fe5b906000526020600020900160005b915054906101000a9004600160a060020a031681565b6000612218612a29565b612220612a29565b600061222a612a29565b612232612a29565b60006003886040518082805190602001908083835b602083106122665780518252601f199092019160209182019101612247565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a031692506122aa91508290506115cf565b9650965096509650965096505b5091939550919395565b6122c9612a29565b600480548060200260200160405190810160405280929190818152602001828054801561231f57602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311612301575b505050505090505b90565b6000805433600160a060020a039081169116146123475760006000fd5b600160a060020a0380841660009081526001602052604090205484911615156123705760006000fd5b600160a060020a0384166000818152600160208181526040928390208351848152600482018054600295811615610100026000190116949094049481018590529096507f5b19f79ac4e8cfa820815502e11615f1a449e28155dc289ec5cac1a11f9086949388928291908201906060830190869080156124315780601f1061240657610100808354040283529160200191612431565b820191906000526020600020905b81548152906001019060200180831161241457829003601f168201915b505083810382528451815284516020918201918601908083838215612471575b80518252602083111561247157601f199092019160209182019101612451565b505050905090810190601f16801561249d5780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a282516115c590600484019060208601906129aa565b505b5b505b505050565b60006124d5612a29565b6124dd612a29565b60006124e7612a29565b6124ef612a29565b60006002886040518082805190602001908083835b602083106122665780518252601f199092019160209182019101612247565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a031692506122aa91508290506115cf565b9650965096509650965096505b5091939550919395565b6000805433600160a060020a0390811691161461259b5760006000fd5b600160a060020a0380841660009081526001602052604090205484911615156125c45760006000fd5b826000600160a060020a03166002826040518082805190602001908083835b602083106126025780518252601f1990920191602091820191016125e3565b51815160209384036101000a6000190180199092169116179052920194855250604051938490030190922054600160a060020a031692909214915061264990505760006000fd5b600160a060020a038516600081815260016020818152604092839020835184815260028083018054958616156101000260001901909516049481018590529097507f53d878a6530e56c9bc96548fa0a8cae4f1d1f49c86b0e934c086b992ebb6998f9389928291908201906060830190869080156127085780601f106126dd57610100808354040283529160200191612708565b820191906000526020600020905b8154815290600101906020018083116126eb57829003601f168201915b505083810382528451815284516020918201918601908083838215612748575b80518252602083111561274857601f199092019160209182019101612728565b505050905090810190601f1680156127745780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a260028360020160405180828054600181600116156101000203166002900480156127e45780601f106127c25761010080835404028352918201916127e4565b820191906000526020600020905b8154815290600101906020018083116127d0575b5050928352505060405190819003602090810182208054600160a060020a031916905585518792600292889282918401908083835b602083106128385780518252601f199092019160209182019101612819565b51815160209384036101000a60001901801990921691161790529201948552506040519384900381019093208054600160a060020a031916600160a060020a03959095169490941790935550855161133d925060028601918701906129aa565b505b5b505b505b505050565b60005433600160a060020a039081169116146128c05760006000fd5b600160a060020a038116156128eb5760008054600160a060020a031916600160a060020a0383161790555b5b5b50565b81548183558181151161134357600083815260209020611343918101908301612c54565b5b505050565b50805460018160011615610100020316600290046000825580601f1061294057506128eb565b601f0160209004906000526020600020908101906128eb9190612c54565b5b50565b50805460018160011615610100020316600290046000825580601f1061294057506128eb565b601f0160209004906000526020600020908101906128eb9190612c54565b5b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106129eb57805160ff1916838001178555612a18565b82800160010185558215612a18579182015b82811115612a185782518255916020019190600101906129fd565b5b50612a25929150612c54565b5090565b60408051602081019091526000815290565b60408051602081019091526000815290565b6040805160c081019091526000815260208101612a68612a29565b8152602001612a75612a29565b815260006020820152604001612a89612a29565b8152602001612a96612a29565b905290565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106129eb57805160ff1916838001178555612a18565b82800160010185558215612a18579182015b82811115612a185782518255916020019190600101906129fd565b5b50612a25929150612c54565b5090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106129eb57805160ff1916838001178555612a18565b82800160010185558215612a18579182015b82811115612a185782518255916020019190600101906129fd565b5b50612a25929150612c54565b5090565b81548183558181151161134357600083815260209020611343918101908301612c54565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106129eb57805160ff1916838001178555612a18565b82800160010185558215612a18579182015b82811115612a185782518255916020019190600101906129fd565b5b50612a25929150612c54565b5090565b60408051602081019091526000815290565b61232791905b80821115612a255760008155600101612c5a565b5090565b90565b60408051602081019091526000815290565b604080516020810190915260008152905600a165627a7a723058202e91668072bb23c9d4066cdaabf7329783952016e7a08006744ebe0d0eb96f5d0029", "networks": { - "42": { + "50": { "links": {}, "events": { - "0x469f18a43061267ac6162ca1cec0c14a425189c7a19f52d6dc04419f3c12bb24": { + "0xd8d928b0b50ca11d9dc273236b46f3526515b03602f71f3a6af4f45bd9fa9144": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -617,33 +552,28 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogAddToken", "type": "event" }, - "0xc9ec69d3b744b4ec70f035ed0a15ed7029e668bfb9f326e657878b2b38a90da2": { + "0x32c54f1e2ea75844ded7517e7dbcd3895da7cd0c28f9ab9f9cf6ecf5f83762c6": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -659,23 +589,18 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogRemoveToken", @@ -685,7 +610,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -707,7 +632,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -725,84 +650,62 @@ "name": "LogTokenSymbolChange", "type": "event" }, - "0x6b45310c970f5d74814e429bdacd69c748dcb086cd38b6ddb7c2029be609e168": { + "0x5b19f79ac4e8cfa820815502e11615f1a449e28155dc289ec5cac1a11f908694": { "anonymous": false, "inputs": [ { - "indexed": false, - "name": "token", - "type": "address" - }, - { - "indexed": false, - "name": "oldUrl", - "type": "string" - }, - { - "indexed": false, - "name": "newUrl", - "type": "string" - } - ], - "name": "LogTokenUrlChange", - "type": "event" - }, - "0xe46a8f26cfc48c12e40cf50c1063e5913b2a17da6aa396f9b008b2dfd6f273b5": { - "anonymous": false, - "inputs": [ - { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldIpfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newIpfsHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenIpfsHashChange", "type": "event" }, - "0xa9fd216856477e73d11c1a9140fa3d425fce2e10a5475a996440b31c2e8f1ea4": { + "0xc3168fdc13112e44a031057dbf6c609b33353addb4d8037d24543e22cbfe2acd": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldSwarmHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newSwarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenSwarmHashChange", "type": "event" } }, - "updated_at": 1496294576947, - "address": "0x0fea265f59495859467e648ec99a87549aa6ede0" + "updated_at": 1502391794385, + "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082" }, - "50": { + "42": { "links": {}, "events": { - "0x469f18a43061267ac6162ca1cec0c14a425189c7a19f52d6dc04419f3c12bb24": { + "0xd8d928b0b50ca11d9dc273236b46f3526515b03602f71f3a6af4f45bd9fa9144": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -818,33 +721,28 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogAddToken", "type": "event" }, - "0xc9ec69d3b744b4ec70f035ed0a15ed7029e668bfb9f326e657878b2b38a90da2": { + "0x32c54f1e2ea75844ded7517e7dbcd3895da7cd0c28f9ab9f9cf6ecf5f83762c6": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -860,23 +758,18 @@ }, { "indexed": false, - "name": "url", - "type": "string" - }, - { - "indexed": false, "name": "decimals", "type": "uint8" }, { "indexed": false, "name": "ipfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "swarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogRemoveToken", @@ -886,7 +779,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -908,7 +801,7 @@ "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, @@ -926,77 +819,224 @@ "name": "LogTokenSymbolChange", "type": "event" }, - "0x6b45310c970f5d74814e429bdacd69c748dcb086cd38b6ddb7c2029be609e168": { + "0x5b19f79ac4e8cfa820815502e11615f1a449e28155dc289ec5cac1a11f908694": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "token", + "type": "address" + }, + { + "indexed": false, + "name": "oldIpfsHash", + "type": "bytes" + }, + { + "indexed": false, + "name": "newIpfsHash", + "type": "bytes" + } + ], + "name": "LogTokenIpfsHashChange", + "type": "event" + }, + "0xc3168fdc13112e44a031057dbf6c609b33353addb4d8037d24543e22cbfe2acd": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "token", + "type": "address" + }, + { + "indexed": false, + "name": "oldSwarmHash", + "type": "bytes" + }, + { + "indexed": false, + "name": "newSwarmHash", + "type": "bytes" + } + ], + "name": "LogTokenSwarmHashChange", + "type": "event" + } + }, + "updated_at": 1502391794385, + "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f" + }, + "1": { + "links": {}, + "events": { + "0xd8d928b0b50ca11d9dc273236b46f3526515b03602f71f3a6af4f45bd9fa9144": { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "token", + "type": "address" + }, + { + "indexed": false, + "name": "name", + "type": "string" + }, + { + "indexed": false, + "name": "symbol", + "type": "string" + }, + { + "indexed": false, + "name": "decimals", + "type": "uint8" + }, + { + "indexed": false, + "name": "ipfsHash", + "type": "bytes" + }, + { + "indexed": false, + "name": "swarmHash", + "type": "bytes" + } + ], + "name": "LogAddToken", + "type": "event" + }, + "0x32c54f1e2ea75844ded7517e7dbcd3895da7cd0c28f9ab9f9cf6ecf5f83762c6": { "anonymous": false, "inputs": [ { + "indexed": true, + "name": "token", + "type": "address" + }, + { + "indexed": false, + "name": "name", + "type": "string" + }, + { + "indexed": false, + "name": "symbol", + "type": "string" + }, + { + "indexed": false, + "name": "decimals", + "type": "uint8" + }, + { + "indexed": false, + "name": "ipfsHash", + "type": "bytes" + }, + { "indexed": false, + "name": "swarmHash", + "type": "bytes" + } + ], + "name": "LogRemoveToken", + "type": "event" + }, + "0x4a6dbfc867b179991dec22ff19960f0a94d8d9d891fc556f547764670340e8ae": { + "anonymous": false, + "inputs": [ + { + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, - "name": "oldUrl", + "name": "oldName", "type": "string" }, { "indexed": false, - "name": "newUrl", + "name": "newName", "type": "string" } ], - "name": "LogTokenUrlChange", + "name": "LogTokenNameChange", "type": "event" }, - "0xe46a8f26cfc48c12e40cf50c1063e5913b2a17da6aa396f9b008b2dfd6f273b5": { + "0x53d878a6530e56c9bc96548fa0a8cae4f1d1f49c86b0e934c086b992ebb6998f": { "anonymous": false, "inputs": [ { + "indexed": true, + "name": "token", + "type": "address" + }, + { "indexed": false, + "name": "oldSymbol", + "type": "string" + }, + { + "indexed": false, + "name": "newSymbol", + "type": "string" + } + ], + "name": "LogTokenSymbolChange", + "type": "event" + }, + "0x5b19f79ac4e8cfa820815502e11615f1a449e28155dc289ec5cac1a11f908694": { + "anonymous": false, + "inputs": [ + { + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldIpfsHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newIpfsHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenIpfsHashChange", "type": "event" }, - "0xa9fd216856477e73d11c1a9140fa3d425fce2e10a5475a996440b31c2e8f1ea4": { + "0xc3168fdc13112e44a031057dbf6c609b33353addb4d8037d24543e22cbfe2acd": { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, "name": "token", "type": "address" }, { "indexed": false, "name": "oldSwarmHash", - "type": "bytes32" + "type": "bytes" }, { "indexed": false, "name": "newSwarmHash", - "type": "bytes32" + "type": "bytes" } ], "name": "LogTokenSwarmHashChange", "type": "event" } }, - "updated_at": 1499462280314, - "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082" + "updated_at": 1502488442000, + "address": "0x926a74c5c36adf004c87399e65f75628b0f98d2c" } }, "schema_version": "0.0.5", - "updated_at": 1499462280314 -}
\ No newline at end of file + "updated_at": 1502391794385 +} diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index 5d7521e89..a324b8554 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -669,7 +669,7 @@ export class ExchangeWrapper extends ContractWrapper { ); const wouldRoundingErrorOccur = await this._isRoundingErrorAsync( - signedOrder.takerTokenAmount, fillTakerAmount, signedOrder.makerTokenAmount, + fillTakerAmount, signedOrder.takerTokenAmount, signedOrder.makerTokenAmount, ); if (wouldRoundingErrorOccur) { throw new Error(ExchangeContractErrs.OrderFillRoundingError); @@ -713,7 +713,7 @@ export class ExchangeWrapper extends ContractWrapper { makerTokenAmount: BigNumber.BigNumber): Promise<boolean> { const exchangeInstance = await this._getExchangeContractAsync(); const isRoundingError = await exchangeInstance.isRoundingError.call( - demoninator, numerator, makerTokenAmount, + numerator, demoninator, makerTokenAmount, ); return isRoundingError; } diff --git a/src/contract_wrappers/token_registry_wrapper.ts b/src/contract_wrappers/token_registry_wrapper.ts index d15e5c4f7..eaaea150d 100644 --- a/src/contract_wrappers/token_registry_wrapper.ts +++ b/src/contract_wrappers/token_registry_wrapper.ts @@ -30,8 +30,7 @@ export class TokenRegistryWrapper extends ContractWrapper { address: metadata[0], name: metadata[1], symbol: metadata[2], - url: metadata[3], - decimals: metadata[4].toNumber(), + decimals: metadata[3].toNumber(), }; }); return tokens; diff --git a/src/schemas/token_schema.ts b/src/schemas/token_schema.ts index 1236e07c1..e9e359fdf 100644 --- a/src/schemas/token_schema.ts +++ b/src/schemas/token_schema.ts @@ -5,18 +5,7 @@ export const tokenSchema = { symbol: {type: 'string'}, decimals: {type: 'number'}, address: {$ref: '/addressSchema'}, - url: { - oneOf: [ - { - type: 'string', - format: 'uri', - }, - { - enum: [''], - }, - ], - }, }, - required: ['name', 'symbol', 'decimals', 'address', 'url'], + required: ['name', 'symbol', 'decimals', 'address'], type: 'object', }; diff --git a/src/types.ts b/src/types.ts index 851995cf7..81ff30dc5 100644 --- a/src/types.ts +++ b/src/types.ts @@ -54,7 +54,7 @@ export interface ExchangeContract extends ContractInstance { call: (orderHash: string) => BigNumber.BigNumber; }; isRoundingError: { - call: (takerTokenAmount: BigNumber.BigNumber, fillTakerAmount: BigNumber.BigNumber, + call: (fillTakerAmount: BigNumber.BigNumber, takerTokenAmount: BigNumber.BigNumber, makerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts) => Promise<boolean>; }; fillOrder: { @@ -85,10 +85,10 @@ export interface ExchangeContract extends ContractInstance { v: number[], r: string[], s: string[], txOpts?: TxOpts) => number; }; cancelOrder: { - (orderAddresses: OrderAddresses, orderValues: OrderValues, canceltakerTokenAmount: BigNumber.BigNumber, + (orderAddresses: OrderAddresses, orderValues: OrderValues, cancelTakerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts): ContractResponse; estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues, - canceltakerTokenAmount: BigNumber.BigNumber, + cancelTakerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts) => number; }; batchCancelOrders: { @@ -275,15 +275,14 @@ export interface SignedOrder extends Order { ecSignature: ECSignature; } -// [address, name, symbol, projectUrl, decimals, ipfsHash, swarmHash] -export type TokenMetadata = [string, string, string, string, BigNumber.BigNumber, string, string]; +// [address, name, symbol, decimals, ipfsHash, swarmHash] +export type TokenMetadata = [string, string, string, BigNumber.BigNumber, string, string]; export interface Token { name: string; address: string; symbol: string; decimals: number; - url: string; } export interface TxOpts { diff --git a/test/schema_test.ts b/test/schema_test.ts index c170bebb1..1fac2b380 100644 --- a/test/schema_test.ts +++ b/test/schema_test.ts @@ -180,10 +180,6 @@ describe('Schema', () => { }, [], 4, - { - ...token, - url: 'not an url', - }, ]; const shouldFail = true; validateAgainstSchema(testCases, tokenSchema, shouldFail); |