Update Exchange artifacts and adjust ExchangeWrapper

1 files changed, 84 insertions, 89 deletions

diff --git a/src/artifacts/Exchange.json b/src/artifacts/Exchange.json
index a9481d13f..d459e81c4 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"
         }
       ],
@@ -583,10 +563,36 @@
       "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": "0x38024cc964e6f2745672c86ecf45f5965efe6310"
     },
-    "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
 }