diff options
Diffstat (limited to 'src/artifacts/Exchange.json')
| -rw-r--r-- | src/artifacts/Exchange.json | 272 |
1 files changed, 17 insertions, 255 deletions
diff --git a/src/artifacts/Exchange.json b/src/artifacts/Exchange.json index 2c02bda11..fc056f986 100644 --- a/src/artifacts/Exchange.json +++ b/src/artifacts/Exchange.json @@ -209,7 +209,7 @@ "constant": true, "inputs": [ { - "name": "pubKey", + "name": "signer", "type": "address" }, { @@ -509,37 +509,22 @@ }, { "indexed": false, - "name": "filledBy", - "type": "address" - }, - { - "indexed": false, - "name": "valueM", - "type": "uint256" - }, - { - "indexed": false, - "name": "valueT", + "name": "filledValueM", "type": "uint256" }, { "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", + "name": "filledValueT", "type": "uint256" }, { "indexed": false, - "name": "expiration", + "name": "feeMPaid", "type": "uint256" }, { "indexed": false, - "name": "filledValueT", + "name": "feeTPaid", "type": "uint256" }, { @@ -581,27 +566,7 @@ }, { "indexed": false, - "name": "valueM", - "type": "uint256" - }, - { - "indexed": false, - "name": "valueT", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", - "type": "uint256" - }, - { - "indexed": false, - "name": "expiration", + "name": "cancelledValueM", "type": "uint256" }, { @@ -641,180 +606,12 @@ "type": "event" } ], - "unlinked_binary": "0x60606040523461000057604051604080611daa8339810160405280516020909101515b60008054600160a060020a03808516600160a060020a03199283161790925560018054928416929091169190911790555b50505b611d45806100656000396000f300606060405236156100d55763ffffffff60e060020a60003504166308eb4e9881146100da57806314df96ee1461014a578063288cdc91146101745780632ac1262214610196578063441b1b44146101b857806350ec2a6a146101e057806359b257201461032a5780637ae2b5c7146104e95780638163681e1461050e578063909f617e1461054a578063914ff398146105d4578063a2e855a5146107ce578063a8c92d48146109c0578063aae62507146109e9578063cfc4d0ec14610a0b578063d40fa8bf14610a79578063ddefdb9014610aa2575b610000565b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505092359250610b27915050565b60408051918252519081900360200190f35b3461000057610160600435602435604435610e9f565b604080519115158252519081900360200190f35b3461000057610138600435610ebe565b60408051918252519081900360200190f35b3461000057610138600435610ed0565b60408051918252519081900360200190f35b3461000057610138600435602435604435610ee2565b60408051918252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610257576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161021b565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156102ca576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161028e565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843750949650610f0195505050505050565b604080519115158252519081900360200190f35b346100005761013860048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156103a1576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610365565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610414576040805160c081810190925290808402870190600690839083908082843750505091835250506001909101906020016103d8565b5050604080516020878301358901803582810280850184019095528084529799893599838101351515999198506060019650929450810192829185019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750949650610f6c95505050505050565b60408051918252519081900360200190f35b3461000057610138600435602435611075565b60408051918252519081900360200190f35b3461000057610160600160a060020a036004351660243560ff6044351660643560843561108f565b604080519115158252519081900360200190f35b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360208101351515935060ff60408201351692506060810135915060800135611144565b60408051918252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561064b576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161060f565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156106be576040805160c08181019092529080840287019060069083908390808284375050509183525050600190910190602001610682565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375050604080516020808901358a01803580830284810184018652818552999b8b3515159b909a950198509296508101945090925082919085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a9989019892975090820195509350839250850190849080828437509496506116a395505050505050565b604080519115158252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610845576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610809565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156108b8576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161087c565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a99890198929750908201955093508392508501908490808284375094965061175295505050505050565b604080519115158252519081900360200190f35b34610000576109cd611806565b60408051600160a060020a039092168252519081900360200190f35b3461000057610138600435611815565b60408051918252519081900360200190f35b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c0818101909252949695818101959450925060069150839083908082843750939550611841945050505050565b60408051918252519081900360200190f35b34610000576109cd6118fb565b60408051600160a060020a039092168252519081900360200190f35b34610000576040805160a08181019092526101609160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360ff60208201351693506040810135925060600135905061190a565b604080519115158252519081900360200190f35b604080516101608181018352600080835260208301819052828401819052606083018190526080830181905260a0830181905260c0830181905260e083018190526101008301819052610120830181905261014083018190528351918201909352829080878360209081029190910151600160a060020a031682520187600160209081029190910151600160a060020a031682520187600260209081029190910151600160a060020a031682520187600360209081029190910151600160a060020a031682520187600460209081029190910151600160a060020a03168252018660006020908102919091015182520186600160209081029190910151825201866002602090810291909101518252018660036020908102919091015182520186600460200201518152602001610c5e8888611841565b600019168152509150610c8833600160a060020a03168360000151600160a060020a031614611934565b6101208201514210610cbd57610140820151604051600490600080516020611cfa83398151915290600090a360009250610e96565b610cd88260c00151610cd3846101400151611815565b611944565b9050610ce48482611075565b9250821515610d1657610140820151604051600590600080516020611cfa83398151915290600090a360009250610e96565b610140820151600090815260036020526040902054610d35908461195d565b600360008461014001516000191660001916815260200190815260200160002081905550816040015182606001516040518083600160a060020a0316600160a060020a0316606060020a02815260140182600160a060020a0316600160a060020a0316606060020a028152601401925050506040518091039020600019168260800151600160a060020a03168360000151600160a060020a03167f4565177cd5184f550db0ab57b1d5bc808f8e8ba0adcb13fb257f1e7cf019a2b6856040015186606001518760a001518860c001518960e001518a61010001518b61012001518d8d6101400151604051808a600160a060020a0316600160a060020a0316815260200189600160a060020a0316600160a060020a031681526020018881526020018781526020018681526020018581526020018481526020018381526020018260001916600019168152602001995050505050505050505060405180910390a45b50509392505050565b60006103e882108015610eb457508383830915155b90505b9392505050565b60026020526000908152604090205481565b60036020526000908152604090205481565b6000610eb4610ef18484611985565b856119b1565b90505b9392505050565b6000805b8451811015610f5f57610f55858281518110156100005790602001906020020151858381518110156100005790602001906020020151858481518110156100005790602001906020020151610b27565b505b600101610f05565b600191505b509392505050565b6000805b885181101561106857610fcb8960008151811015610000576020908102909101015160036020020151600160a060020a03168a83815181101561000057602090810291909101015160600151600160a060020a031614611934565b6110508261104b8b84815181101561000057906020019060200201518b85815181101561000057906020019060200201516110068c88611944565b8b8b88815181101561000057906020019060200201518b89815181101561000057906020019060200201518b8a81518110156100005790602001906020020151611144565b61195d565b91508682141561105f57611068565b5b600101610f70565b5b50979650505050505050565b600081831015611086575081611089565b50805b92915050565b604080517f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c8101869052815190819003603c018120600082815260208381018552928401819052835191825260ff8716828401528184018690526060820185905292516001926080808401939192601f198101928190039091019086866161da5a03f11561000057505060206040510351600160a060020a031686600160a060020a03161490505b95945050505050565b604080516101608181018352600080835260208301819052828401819052606083018190526080830181905260a0830181905260c0830181905260e0830181905261010083018190526101208301819052610140830181905283519182019093528290808b8360209081029190910151600160a060020a03168252018b600160209081029190910151600160a060020a03168252018b600260209081029190910151600160a060020a03168252018b600360209081029190910151600160a060020a03168252018b600460209081029190910151600160a060020a03168252018a6000602090810291909101518252018a6001602090810291909101518252018a6002602090810291909101518252018a6003602090810291909101518252018a60046020020151815260200161127b8c8c611841565b905260208101519092506112b890600160a060020a031615806112b3575033600160a060020a03168360200151600160a060020a0316145b611934565b61012082015142106112ec57610140820151604051600090600080516020611cfa833981519152908290a360009250611696565b6113078260c00151610cd3846101400151611815565b611944565b90506113138882611075565b925082151561134557610140820151604051600190600080516020611cfa83398151915290600090a360009250611696565b6113588260c00151848460a00151610e9f565b1561138657610140820151604051600290600080516020611cfa83398151915290600090a360009250611696565b86801561139a575061139882846119ee565b155b156113c857610140820151604051600390600080516020611cfa83398151915290600090a360009250611696565b6113e66112b3836000015184610140015189898961108f565b611934565b610140820151600090815260026020526040902054611405908461195d565b6101408301516000908152600260205260409081902091909155820151825160c084015160a0850151611451936112b393909290913391611447918a90610ee2565b611b57565b611934565b61146d6112b3836060015133856000015187611b57565b611934565b6080820151600160a060020a03161561151f5760008260e0015111156114d0576114d06112b3600060009054906101000a9004600160a060020a0316846000015185608001516114478760c00151898960e00151610ee2565b611b57565b611934565b5b6000826101000151111561151f5761151f6112b3600060009054906101000a9004600160a060020a03163385608001516114478760c0015189896101000151610ee2565b611b57565b611934565b5b5b816040015182606001516040518083600160a060020a0316600160a060020a0316606060020a02815260140182600160a060020a0316600160a060020a0316606060020a028152601401925050506040518091039020600019168260800151600160a060020a03168360000151600160a060020a03167fcf8bd4f6ec4f39997290cf18413805f1f190eebd60e32ffc174b56d07a355beb856020015186604001518760600151338960a001518a60c001518b60e001518c61010001518d61012001518f8f6101400151604051808c600160a060020a0316600160a060020a031681526020018b600160a060020a0316600160a060020a031681526020018a600160a060020a0316600160a060020a0316815260200189600160a060020a0316600160a060020a0316815260200188815260200187815260200186815260200185815260200184815260200183815260200182600019166000191681526020019b50505050505050505050505060405180910390a45b5050979650505050505050565b6000805b88518110156117415761173789828151811015610000579060200190602002015189838151811015610000579060200190602002015189848151811015610000579060200190602002015189898681518110156100005790602001906020020151898781518110156100005790602001906020020151898881518110156100005790602001906020020151611144565b505b6001016116a7565b600191505b50979650505050505050565b6000805b87518110156117f6576117ed6112b389838151811015610000579060200190602002015189848151811015610000579060200190602002015189858151811015610000579060200190602002015189868151811015610000579060200190602002015189878151811015610000579060200190602002015189888151811015610000579060200190602002015161190a565b611934565b5b600101611756565b600191505b509695505050505050565b600154600160a060020a031681565b6000818152600260209081526040808320546003909252822054611839919061195d565b90505b919050565b81516020808401516040808601516060808801516080808a01518951978a01518a870151948b0151928b015160a08c01518851606060020a30600160a060020a03908116820283529d8e16810260148301529a8d168b026028820152978c168a02603c890152948b16890260508801529990911690960260648501526078840196909652609883019490945260b882015260d881019390935260f88301939093526101188201529051908190036101380190205b92915050565b600054600160a060020a031681565b60006119268561192089898960008a8a8a611144565b14611934565b5060015b9695505050505050565b80151561194057610000565b5b50565b600061195283831115611934565b508082035b92915050565b600082820161197a8482108015906112b35750838210155b611934565b8091505b5092915050565b600082820261197a8415806112b3575083858381156100005704145b611934565b8091505b5092915050565b600060006119c160008411611934565b828481156100005704905061197a838581156100005706828502018514611934565b8091505b5092915050565b60006000600060006000339350611a0e8760c00151878960a00151610ee2565b925082611a2388604001518960000151611bf5565b1080611a3f575082611a3d88604001518960000151611c6e565b105b80611a56575085611a54886060015186611bf5565b105b80611a6d575085611a6b886060015186611c6e565b105b15611a7b5760009450611b4d565b6080870151600160a060020a031615611b4757611aa18760c00151878960e00151610ee2565b9150611ab78760c0015187896101000151610ee2565b60005488519192508391611ad491600160a060020a031690611bf5565b1080611af9575060005487518391611af791600160a060020a0390911690611c6e565b105b80611b1957506000548190611b1790600160a060020a031686611bf5565b105b80611b3957506000548190611b3790600160a060020a031686611c6e565b105b15611b475760009450611b4d565b5b600194505b5050505092915050565b600154604080516000602091820181905282517f15dacbea000000000000000000000000000000000000000000000000000000008152600160a060020a03898116600483015288811660248301528781166044830152606482018790529351919493909316926315dacbea92608480830193919282900301818787803b156100005760325a03f115610000575050604051519150505b949350505050565b600082600160a060020a03166370a08231836000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b156100005760325a03f115610000575050604051519150505b92915050565b600154604080516000602091820181905282517fdd62ed3e000000000000000000000000000000000000000000000000000000008152600160a060020a03868116600483015294851660248201529251909386169263dd62ed3e92604480830193919282900301818787803b156100005760325a03f115610000575050604051519150505b92915050560036d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e90a165627a7a72305820c38121e5be6034e2506e831cd8172fb06c61260660ac3820aa8e51797ba32ef10029", + "unlinked_binary": "0x60606040523461000057604051604080611c698339810160405280516020909101515b60008054600160a060020a03808516600160a060020a03199283161790925560018054928416929091169190911790555b50505b611c04806100656000396000f300606060405236156100d55763ffffffff60e060020a60003504166308eb4e9881146100da57806314df96ee1461014a578063288cdc91146101745780632ac1262214610196578063441b1b44146101b857806350ec2a6a146101e057806359b257201461032a5780637ae2b5c7146104e95780638163681e1461050e578063909f617e1461054a578063914ff398146105d4578063a2e855a5146107ce578063a8c92d48146109c0578063aae62507146109e9578063cfc4d0ec14610a0b578063d40fa8bf14610a79578063ddefdb9014610aa2575b610000565b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505092359250610b27915050565b60408051918252519081900360200190f35b3461000057610160600435602435604435610e1c565b604080519115158252519081900360200190f35b3461000057610138600435610e3b565b60408051918252519081900360200190f35b3461000057610138600435610e4d565b60408051918252519081900360200190f35b3461000057610138600435602435604435610e5f565b60408051918252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610257576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161021b565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156102ca576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161028e565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843750949650610e7e95505050505050565b604080519115158252519081900360200190f35b346100005761013860048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156103a1576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610365565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610414576040805160c081810190925290808402870190600690839083908082843750505091835250506001909101906020016103d8565b5050604080516020878301358901803582810280850184019095528084529799893599838101351515999198506060019650929450810192829185019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750949650610ee995505050505050565b60408051918252519081900360200190f35b3461000057610138600435602435610ff2565b60408051918252519081900360200190f35b3461000057610160600160a060020a036004351660243560ff6044351660643560843561100c565b604080519115158252519081900360200190f35b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360208101351515935060ff604082013516925060608101359150608001356110c1565b60408051918252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b8282101561064b576040805160a0818101909252908084028701906005908390839080828437505050918352505060019091019060200161060f565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156106be576040805160c08181019092529080840287019060069083908390808284375050509183525050600190910190602001610682565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020018383602002808284375050604080516020808901358a01803580830284810184018652818552999b8b3515159b909a950198509296508101945090925082919085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a99890198929750908201955093508392508501908490808284375094965061156295505050505050565b604080519115158252519081900360200190f35b346100005761016060048080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b82821015610845576040805160a08181019092529080840287019060059083908390808284375050509183525050600190910190602001610809565b5050505050919080359060200190820180359060200190808060200260200160405190810160405280939291908181526020016000905b828210156108b8576040805160c0818101909252908084028701906006908390839080828437505050918352505060019091019060200161087c565b50505050509190803590602001908201803590602001908080602002602001604051908101604052809392919081815260200183836020028082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a998901989297509082019550935083925085019084908082843750506040805187358901803560208181028481018201909552818452989a99890198929750908201955093508392508501908490808284375094965061161195505050505050565b604080519115158252519081900360200190f35b34610000576109cd6116c5565b60408051600160a060020a039092168252519081900360200190f35b34610000576101386004356116d4565b60408051918252519081900360200190f35b34610000576040805160a08181019092526101389160049160a4918390600590839083908082843750506040805160c0818101909252949695818101959450925060069150839083908082843750939550611700945050505050565b60408051918252519081900360200190f35b34610000576109cd6117ba565b60408051600160a060020a039092168252519081900360200190f35b34610000576040805160a08181019092526101609160049160a4918390600590839083908082843750506040805160c08181019092529496958181019594509250600691508390839080828437509395505083359360ff6020820135169350604081013592506060013590506117c9565b604080519115158252519081900360200190f35b604080516101608181018352600080835260208301819052828401819052606083018190526080830181905260a0830181905260c0830181905260e083018190526101008301819052610120830181905261014083018190528351918201909352829080878360209081029190910151600160a060020a031682520187600160209081029190910151600160a060020a031682520187600260209081029190910151600160a060020a031682520187600360209081029190910151600160a060020a031682520187600460209081029190910151600160a060020a03168252018660006020908102919091015182520186600160209081029190910151825201866002602090810291909101518252018660036020908102919091015182520186600460200201518152602001610c5e8888611700565b600019168152509150610c8833600160a060020a03168360000151600160a060020a0316146117f3565b6101208201514210610cbd57610140820151604051600490600080516020611bb983398151915290600090a360009250610e13565b610cd88260c00151610cd38461014001516116d4565b611803565b9050610ce48482610ff2565b9250821515610d1657610140820151604051600590600080516020611bb983398151915290600090a360009250610e13565b610140820151600090815260036020526040902054610d35908461181c565b610140830151600090815260036020526040908190209190915580830180516060850180518451606060020a600160a060020a03948516810282529184169091026014820152935193849003602801909320608086015186519351945160c088015160a0890151939692851695909416937f67d66f160bc93d925d05dae1794c90d2d6d6688b29b84ff069398a9b0458713193610dd491908b90610e5f565b61014089015160408051600160a060020a03958616815293909416602084015282840191909152606082018a9052608082015290519081900360a00190a45b50509392505050565b60006103e882108015610e3157508383830915155b90505b9392505050565b60026020526000908152604090205481565b60036020526000908152604090205481565b6000610e31610e6e8484611844565b85611870565b90505b9392505050565b6000805b8451811015610edc57610ed2858281518110156100005790602001906020020151858381518110156100005790602001906020020151858481518110156100005790602001906020020151610b27565b505b600101610e82565b600191505b509392505050565b6000805b8851811015610fe557610f488960008151811015610000576020908102909101015160036020020151600160a060020a03168a83815181101561000057602090810291909101015160600151600160a060020a0316146117f3565b610fcd82610fc88b84815181101561000057906020019060200201518b8581518110156100005790602001906020020151610f838c88611803565b8b8b88815181101561000057906020019060200201518b89815181101561000057906020019060200201518b8a815181101561000057906020019060200201516110c1565b61181c565b915086821415610fdc57610fe5565b5b600101610eed565b5b50979650505050505050565b600081831015611003575081611006565b50805b92915050565b604080517f19457468657265756d205369676e6564204d6573736167653a0a3332000000008152601c8101869052815190819003603c018120600082815260208381018552928401819052835191825260ff8716828401528184018690526060820185905292516001926080808401939192601f198101928190039091019086866161da5a03f11561000057505060206040510351600160a060020a031686600160a060020a03161490505b95945050505050565b604080516101608181018352600080835260208301819052828401819052606083018190526080830181905260a0830181905260c0830181905260e0830181905261010083018190526101208301819052610140830181905283519182019093528290819081908190808e8360209081029190910151600160a060020a03168252018e600160209081029190910151600160a060020a03168252018e600260209081029190910151600160a060020a03168252018e600360209081029190910151600160a060020a03168252018e600460209081029190910151600160a060020a03168252018d6000602090810291909101518252018d6001602090810291909101518252018d6002602090810291909101518252018d6003602090810291909101518252018d6004602002015181526020016111fe8f8f611700565b9052602081015190955061123b90600160a060020a03161580611236575033600160a060020a03168660200151600160a060020a0316145b6117f3565b610120850151421061126f57610140850151604051600090600080516020611bb9833981519152908290a360009550611552565b61128a8560c00151610cd38761014001516116d4565b611803565b93506112968b85610ff2565b95508515156112c857610140850151604051600190600080516020611bb983398151915290600090a360009550611552565b6112db8560c00151878760a00151610e1c565b1561130957610140850151604051600290600080516020611bb983398151915290600090a360009550611552565b89801561131d575061131b85876118ad565b155b1561134b57610140850151604051600390600080516020611bb983398151915290600090a360009550611552565b61136961123686600001518761014001518c8c8c61100c565b6117f3565b61137c8560c00151878760a00151610e5f565b61014086015160009081526002602052604090205490935061139e908761181c565b610140860151600090815260026020526040908190209190915585015185516113d191611236913387611a16565b6117f3565b6113ed61123686606001513388600001518a611a16565b6117f3565b6080850151600160a060020a0316156114985760008560e00151111561144b576114208560c00151878760e00151610e5f565b6000548651608088015192945061144b9261123692600160a060020a0316919086611a16565b6117f3565b5b600085610100015111156114985761146e8560c0015187876101000151610e5f565b60005460808701519192506114989161123691600160a060020a031690339085611a16565b6117f3565b5b5b60408086018051606080890180518551606060020a600160a060020a0395861681028252918516909102601482015285519081900360280181206080808d01518d51975194516101408f0151338916865295881660208601528716848a01529483018b905282018d905260a0820189905260c0820188905260e08201929092529451909491831693909216917f0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3918190036101000190a45b5050505050979650505050505050565b6000805b8851811015611600576115f6898281518110156100005790602001906020020151898381518110156100005790602001906020020151898481518110156100005790602001906020020151898986815181101561000057906020019060200201518987815181101561000057906020019060200201518988815181101561000057906020019060200201516110c1565b505b600101611566565b600191505b50979650505050505050565b6000805b87518110156116b5576116ac6112368983815181101561000057906020019060200201518984815181101561000057906020019060200201518985815181101561000057906020019060200201518986815181101561000057906020019060200201518987815181101561000057906020019060200201518988815181101561000057906020019060200201516117c9565b6117f3565b5b600101611615565b600191505b509695505050505050565b600154600160a060020a031681565b60008181526002602090815260408083205460039092528220546116f8919061181c565b90505b919050565b81516020808401516040808601516060808801516080808a01518951978a01518a870151948b0151928b015160a08c01518851606060020a30600160a060020a03908116820283529d8e16810260148301529a8d168b026028820152978c168a02603c890152948b16890260508801529990911690960260648501526078840196909652609883019490945260b882015260d881019390935260f88301939093526101188201529051908190036101380190205b92915050565b600054600160a060020a031681565b60006117e5856117df89898960008a8a8a6110c1565b146117f3565b5060015b9695505050505050565b8015156117ff57610000565b5b50565b6000611811838311156117f3565b508082035b92915050565b60008282016118398482108015906112365750838210155b6117f3565b8091505b5092915050565b6000828202611839841580611236575083858381156100005704145b6117f3565b8091505b5092915050565b60006000611880600084116117f3565b82848115610000570490506118398385811561000057068285020185146117f3565b8091505b5092915050565b600060006000600060003393506118cd8760c00151878960a00151610e5f565b9250826118e288604001518960000151611ab4565b10806118fe5750826118fc88604001518960000151611b2d565b105b80611915575085611913886060015186611ab4565b105b8061192c57508561192a886060015186611b2d565b105b1561193a5760009450611a0c565b6080870151600160a060020a031615611a06576119608760c00151878960e00151610e5f565b91506119768760c0015187896101000151610e5f565b6000548851919250839161199391600160a060020a031690611ab4565b10806119b85750600054875183916119b691600160a060020a0390911690611b2d565b105b806119d8575060005481906119d690600160a060020a031686611ab4565b105b806119f8575060005481906119f690600160a060020a031686611b2d565b105b15611a065760009450611a0c565b5b600194505b5050505092915050565b600154604080516000602091820181905282517f15dacbea000000000000000000000000000000000000000000000000000000008152600160a060020a03898116600483015288811660248301528781166044830152606482018790529351919493909316926315dacbea92608480830193919282900301818787803b156100005760325a03f115610000575050604051519150505b949350505050565b600082600160a060020a03166370a08231836000604051602001526040518263ffffffff1660e060020a0281526004018082600160a060020a0316600160a060020a03168152602001915050602060405180830381600087803b156100005760325a03f115610000575050604051519150505b92915050565b600154604080516000602091820181905282517fdd62ed3e000000000000000000000000000000000000000000000000000000008152600160a060020a03868116600483015294851660248201529251909386169263dd62ed3e92604480830193919282900301818787803b156100005760325a03f115610000575050604051519150505b92915050560036d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e90a165627a7a72305820355fcfa11689af797006118faee351113e46c443b3e6d8fa4250be1e40e3db820029", "networks": { - "42": { - "links": {}, - "events": { - "0xcf8bd4f6ec4f39997290cf18413805f1f190eebd60e32ffc174b56d07a355beb": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "maker", - "type": "address" - }, - { - "indexed": false, - "name": "taker", - "type": "address" - }, - { - "indexed": true, - "name": "feeRecipient", - "type": "address" - }, - { - "indexed": false, - "name": "tokenM", - "type": "address" - }, - { - "indexed": false, - "name": "tokenT", - "type": "address" - }, - { - "indexed": false, - "name": "filledBy", - "type": "address" - }, - { - "indexed": false, - "name": "valueM", - "type": "uint256" - }, - { - "indexed": false, - "name": "valueT", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", - "type": "uint256" - }, - { - "indexed": false, - "name": "expiration", - "type": "uint256" - }, - { - "indexed": false, - "name": "filledValueT", - "type": "uint256" - }, - { - "indexed": true, - "name": "tokens", - "type": "bytes32" - }, - { - "indexed": false, - "name": "orderHash", - "type": "bytes32" - } - ], - "name": "LogFill", - "type": "event" - }, - "0x4565177cd5184f550db0ab57b1d5bc808f8e8ba0adcb13fb257f1e7cf019a2b6": { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "name": "maker", - "type": "address" - }, - { - "indexed": true, - "name": "feeRecipient", - "type": "address" - }, - { - "indexed": false, - "name": "tokenM", - "type": "address" - }, - { - "indexed": false, - "name": "tokenT", - "type": "address" - }, - { - "indexed": false, - "name": "valueM", - "type": "uint256" - }, - { - "indexed": false, - "name": "valueT", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", - "type": "uint256" - }, - { - "indexed": false, - "name": "expiration", - "type": "uint256" - }, - { - "indexed": false, - "name": "cancelledValueT", - "type": "uint256" - }, - { - "indexed": true, - "name": "tokens", - "type": "bytes32" - }, - { - "indexed": false, - "name": "orderHash", - "type": "bytes32" - } - ], - "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": 1495042008606, - "address": "0x9ce1a5e2311f9b8b8e6b40ed20b5b090de4a4c4d" - }, "50": { "links": {}, "events": { - "0xcf8bd4f6ec4f39997290cf18413805f1f190eebd60e32ffc174b56d07a355beb": { + "0x0d0b9391970d9a25552f37d436d2aae2925e2bfe1b2a923754bada030c498cb3": { "anonymous": false, "inputs": [ { @@ -844,37 +641,22 @@ }, { "indexed": false, - "name": "filledBy", - "type": "address" - }, - { - "indexed": false, - "name": "valueM", + "name": "filledValueM", "type": "uint256" }, { "indexed": false, - "name": "valueT", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", + "name": "filledValueT", "type": "uint256" }, { "indexed": false, - "name": "expiration", + "name": "feeMPaid", "type": "uint256" }, { "indexed": false, - "name": "filledValueT", + "name": "feeTPaid", "type": "uint256" }, { @@ -891,7 +673,7 @@ "name": "LogFill", "type": "event" }, - "0x4565177cd5184f550db0ab57b1d5bc808f8e8ba0adcb13fb257f1e7cf019a2b6": { + "0x67d66f160bc93d925d05dae1794c90d2d6d6688b29b84ff069398a9b04587131": { "anonymous": false, "inputs": [ { @@ -916,27 +698,7 @@ }, { "indexed": false, - "name": "valueM", - "type": "uint256" - }, - { - "indexed": false, - "name": "valueT", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeM", - "type": "uint256" - }, - { - "indexed": false, - "name": "feeT", - "type": "uint256" - }, - { - "indexed": false, - "name": "expiration", + "name": "cancelledValueM", "type": "uint256" }, { @@ -976,10 +738,10 @@ "type": "event" } }, - "updated_at": 1495030736784, + "updated_at": 1496427473669, "address": "0xb69e673309512a9d726f87304c6984054f87a93b" } }, "schema_version": "0.0.5", - "updated_at": 1495042008606 -} + "updated_at": 1496427473669 +}
\ No newline at end of file |