diff --git a/packages/contracts/src/artifacts/Exchange.json b/packages/contracts/src/artifacts/Exchange.json index fe3ffdc4a1..f18ae20787 100644 --- a/packages/contracts/src/artifacts/Exchange.json +++ b/packages/contracts/src/artifacts/Exchange.json @@ -3,43 +3,9 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0xd09223b76b2947949499cf4edee89cda484b1031daec01a29654a2edd44d4f80", + "keccak256": "0x56be710e3dd2a30b047d8d0323f3f4c1e7dc0074492e1b3704d543a8d1c0863f", "optimizer_enabled": 0, "abi": [ - { - "constant": false, - "inputs": [ - { - "name": "orderAddresses", - "type": "address[5][]" - }, - { - "name": "orderValues", - "type": "uint256[6][]" - }, - { - "name": "takerTokenFillAmounts", - "type": "uint256[]" - }, - { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" - } - ], - "name": "batchFillOrdersNoThrow", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, { "constant": true, "inputs": [ @@ -117,29 +83,43 @@ "type": "uint256[6]" }, { - "name": "takerTokenFillAmount", + "name": "takerTokenCancelAmount", "type": "uint256" - }, + } + ], + "name": "cancelOrder", + "outputs": [ { - "name": "v", - "type": "uint8" - }, + "name": "takerTokenCancelledAmount", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ { - "name": "r", - "type": "bytes32" + "name": "orderAddresses", + "type": "address[5]" }, { - "name": "s", - "type": "bytes32" - } - ], - "name": "fillOrder", - "outputs": [ + "name": "orderValues", + "type": "uint256[6]" + }, { - "name": "takerTokenFilledAmount", + "name": "takerTokenFillAmount", "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], + "name": "fillOrKillOrder", + "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -156,14 +136,22 @@ "type": "uint256[6]" }, { - "name": "takerTokenCancelAmount", + "name": "takerTokenFillAmount", "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], - "name": "cancelOrder", + "name": "fillOrderNoThrow", "outputs": [ { - "name": "takerTokenCancelledAmount", + "name": "success", + "type": "bool" + }, + { + "name": "takerTokenFilledAmount", "type": "uint256" } ], @@ -187,20 +175,17 @@ "type": "uint256[]" }, { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, + "name": "signatures", + "type": "bytes[]" + } + ], + "name": "fillOrdersUpTo", + "outputs": [ { - "name": "s", - "type": "bytes32[]" + "name": "", + "type": "uint256" } ], - "name": "batchFillOrKillOrders", - "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -210,33 +195,25 @@ "inputs": [ { "name": "orderAddresses", - "type": "address[5][]" + "type": "address[5]" }, { "name": "orderValues", - "type": "uint256[6][]" + "type": "uint256[6]" }, { - "name": "takerTokenFillAmount", + "name": "takerTokenCancelAmount", "type": "uint256" }, { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" + "name": "signature", + "type": "bytes" } ], - "name": "marketFillOrdersNoThrow", + "name": "cancelOrder", "outputs": [ { - "name": "totalTakerTokenFilledAmount", + "name": "takerTokenCancelledAmount", "type": "uint256" } ], @@ -258,81 +235,96 @@ "stateMutability": "view", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "name": "orderHash", + "type": "bytes32" + } + ], + "name": "getUnavailableTakerTokenAmount", + "outputs": [ + { + "name": "unavailableTakerTokenAmount", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ { "name": "orderAddresses", - "type": "address[5]" + "type": "address[5][]" }, { "name": "orderValues", - "type": "uint256[6]" - }, - { - "name": "takerTokenFillAmount", - "type": "uint256" - }, - { - "name": "v", - "type": "uint8" + "type": "uint256[6][]" }, { - "name": "r", - "type": "bytes32" + "name": "takerTokenFillAmounts", + "type": "uint256[]" }, { - "name": "s", - "type": "bytes32" + "name": "signatures", + "type": "bytes[]" } ], - "name": "fillOrKillOrder", + "name": "batchFillOrKillOrders", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "orderHash", - "type": "bytes32" + "name": "orderAddresses", + "type": "address[5][]" + }, + { + "name": "orderValues", + "type": "uint256[6][]" + }, + { + "name": "takerTokenFillAmount", + "type": "uint256" + }, + { + "name": "signatures", + "type": "bytes[]" } ], - "name": "getUnavailableTakerTokenAmount", + "name": "marketFillOrdersNoThrow", "outputs": [ { - "name": "unavailableTakerTokenAmount", + "name": "totalTakerTokenFilledAmount", "type": "uint256" } ], "payable": false, - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { "constant": true, "inputs": [ - { - "name": "signer", - "type": "address" - }, { "name": "hash", "type": "bytes32" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" + "name": "signer", + "type": "address" }, { - "name": "s", - "type": "bytes32" + "name": "signature", + "type": "bytes" } ], "name": "isValidSignature", @@ -403,16 +395,8 @@ "type": "uint256" }, { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" + "name": "signatures", + "type": "bytes[]" } ], "name": "marketFillOrders", @@ -438,11 +422,15 @@ "type": "uint256[6][]" }, { - "name": "takerTokenCancelAmounts", + "name": "takerTokenFillAmounts", "type": "uint256[]" + }, + { + "name": "signatures", + "type": "bytes[]" } ], - "name": "batchCancelOrders", + "name": "batchFillOrders", "outputs": [], "payable": false, "stateMutability": "nonpayable", @@ -460,30 +448,18 @@ "type": "uint256[6][]" }, { - "name": "takerTokenFillAmounts", + "name": "takerTokenCancelAmounts", "type": "uint256[]" - }, - { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" } ], - "name": "batchFillOrders", + "name": "batchCancelOrders", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { - "constant": false, + "constant": true, "inputs": [ { "name": "orderAddresses", @@ -492,41 +468,21 @@ { "name": "orderValues", "type": "uint256[6]" - }, - { - "name": "takerTokenFillAmount", - "type": "uint256" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" } ], - "name": "fillOrderNoThrow", + "name": "getOrderHash", "outputs": [ { - "name": "success", - "type": "bool" - }, - { - "name": "takerTokenFilledAmount", - "type": "uint256" + "name": "orderHash", + "type": "bytes32" } ], "payable": false, - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "orderAddresses", @@ -535,17 +491,25 @@ { "name": "orderValues", "type": "uint256[6]" + }, + { + "name": "takerTokenFillAmount", + "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], - "name": "getOrderHash", + "name": "fillOrder", "outputs": [ { - "name": "orderHash", - "type": "bytes32" + "name": "takerTokenFilledAmount", + "type": "uint256" } ], "payable": false, - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, { @@ -694,9 +658,8 @@ "type": "event" } ], - "unlinked_binary": - "0x6060604052341561000f57600080fd5b604051604080612abd83398101604052808051906020019091908051906020019091905050808280600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050506129f2806100cb6000396000f300606060405260043610610112576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806308fbb5f11461011757806314df96ee146101a9578063288cdc91146101f65780632ac12622146102315780632ca2dea41461026c578063394c21e7146103215780634f150787146103b057806358aa8b55146104425780636e667db3146104dd578063741bcc93146105325780637e9abb50146105d35780638163681e1461060e57806398024a8b146106925780639eaeb116146106db578063a79ab58f14610730578063baa0181d146107cb578063c222e6ab14610821578063cc89b62c146108b3578063cfc4d0ec14610973578063ffa1ad7414610a01575b600080fd5b341561012257600080fd5b6101a76004808035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192908035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192905050610a8f565b005b34156101b457600080fd5b6101dc6004808035906020019091908035906020019091908035906020019091905050610b97565b604051808215151515815260200191505060405180910390f35b341561020157600080fd5b61021b600480803560001916906020019091905050610be9565b6040518082815260200191505060405180910390f35b341561023c57600080fd5b610256600480803560001916906020019091905050610c01565b6040518082815260200191505060405180910390f35b341561027757600080fd5b61030b6004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c00190600680602002604051908101604052809291908260066020028082843782019150505050509190803590602001909190803560ff169060200190919080356000191690602001909190803560001916906020019091905050610c19565b6040518082815260200191505060405180910390f35b341561032c57600080fd5b61039a6004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c001906006806020026040519081016040528092919082600660200280828437820191505050505091908035906020019091905050611162565b6040518082815260200191505060405180910390f35b34156103bb57600080fd5b610440600480803590602001908201803590602001919091929080359060200190820180359060200191909192908035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192908035906020019082018035906020019190919290505061159d565b005b341561044d57600080fd5b6104c76004808035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190919080359060200190820180359060200191909192908035906020019082018035906020019190919290803590602001908201803590602001919091929050506116a3565b6040518082815260200191505060405180910390f35b34156104e857600080fd5b6104f0611875565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561053d57600080fd5b6105d16004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c00190600680602002604051908101604052809291908260066020028082843782019150505050509190803590602001909190803560ff16906020019091908035600019169060200190919080356000191690602001909190505061189f565b005b34156105de57600080fd5b6105f86004808035600019169060200190919050506118c2565b6040518082815260200191505060405180910390f35b341561061957600080fd5b610678600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080356000191690602001909190803560ff16906020019091908035600019169060200190919080356000191690602001909190505061190d565b604051808215151515815260200191505060405180910390f35b341561069d57600080fd5b6106c56004808035906020019091908035906020019091908035906020019091905050611a17565b6040518082815260200191505060405180910390f35b34156106e657600080fd5b6106ee611a38565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561073b57600080fd5b6107b5600480803590602001908201803590602001919091929080359060200190820180359060200191909192908035906020019091908035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192905050611a62565b6040518082815260200191505060405180910390f35b34156107d657600080fd5b61081f6004808035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192905050611c2e565b005b341561082c57600080fd5b6108b16004808035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192908035906020019082018035906020019190919290803590602001908201803590602001919091929080359060200190820180359060200191909192905050611ce5565b005b34156108be57600080fd5b6109526004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c00190600680602002604051908101604052809291908260066020028082843782019150505050509190803590602001909190803560ff169060200190919080356000191690602001909190803560001916906020019091905050611dec565b60405180831515151581526020018281526020019250505060405180910390f35b341561097e57600080fd5b6109e36004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c001906006806020026040519081016040528092919082600660200280828437820191505050505091905050611efa565b60405180826000191660001916815260200191505060405180910390f35b3415610a0c57600080fd5b610a146121a8565b6040518080602001828103825283818151815260200191508051906020019080838360005b83811015610a54578082015181840152602081019050610a39565b50505050905090810190601f168015610a815780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60008090505b8c8c9050811015610b8857610b798d8d838181101515610ab157fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508c8c848181101515610aea57fe5b905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508b8b858181101515610b2357fe5b905060200201358a8a868181101515610b3857fe5b9050602002013560ff168989878181101515610b5057fe5b90506020020135600019168888888181101515610b6957fe5b9050602002013560001916611dec565b50508080600101915050610a95565b50505050505050505050505050565b60008060008486850991506000821415610bb45760009250610be0565b610bd3610bc483620f42406121e1565b610bce88876121e1565b612214565b90506103e8811192508292505b50509392505050565b60006020528060005260406000206000915090505481565b60016020528060005260406000206000915090505481565b6000610c236128fa565b600080600080610160604051908101604052808d6000600581101515610c4557fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018d6001600581101515610c7457fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018d6002600581101515610ca357fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018d6003600581101515610cd257fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018d6004600581101515610d0157fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018c6000600681101515610d3057fe5b602002015181526020018c6001600681101515610d4957fe5b602002015181526020018c6002600681101515610d6257fe5b602002015181526020018c6003600681101515610d7b57fe5b602002015181526020018c6004600681101515610d9457fe5b60200201518152602001610da88e8e611efa565b600019168152509450600073ffffffffffffffffffffffffffffffffffffffff16856020015173ffffffffffffffffffffffffffffffffffffffff161480610e1f57503373ffffffffffffffffffffffffffffffffffffffff16856020015173ffffffffffffffffffffffffffffffffffffffff16145b1515610e2a57600080fd5b60008560a00151118015610e42575060008560c00151115b8015610e4e575060008a115b1515610e5957600080fd5b610e6f85600001518661014001518b8b8b61190d565b1515610e7a57600080fd5b84610120015142101515610ed7578461014001516000191660006003811115610e9f57fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550611153565b610ef28560c00151610eed8761014001516118c2565b61222f565b9350610efe8a85612248565b95506000861415610f58578461014001516000191660016003811115610f2057fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550611153565b610f6b868660c001518760a00151610b97565b15610fbf578461014001516000191660026003811115610f8757fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009550611153565b610fe8600080876101400151600019166000191681526020019081526020016000205487612261565b600080876101400151600019166000191681526020019081526020016000208190555061101685338861227f565b92509250925084610140015160001916856080015173ffffffffffffffffffffffffffffffffffffffff16866000015173ffffffffffffffffffffffffffffffffffffffff167f116d085fd55584f1eda8b1dbb3e6bc64c0c2206d4347a108a9a79e5ae08a349f3389604001518a60600151898d8a8a604051808873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200185815260200184815260200183815260200182815260200197505050505050505060405180910390a48595505b50505050509695505050505050565b600061116c6128fa565b60006101606040519081016040528087600060058110151561118a57fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018760016005811015156111b957fe5b602002015173ffffffffffffffffffffffffffffffffffffffff1681526020018760026005811015156111e857fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200187600360058110151561121757fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200187600460058110151561124657fe5b602002015173ffffffffffffffffffffffffffffffffffffffff16815260200186600060068110151561127557fe5b6020020151815260200186600160068110151561128e57fe5b602002015181526020018660026006811015156112a757fe5b602002015181526020018660036006811015156112c057fe5b602002015181526020018660046006811015156112d957fe5b602002015181526020016112ed8888611efa565b6000191681525091503373ffffffffffffffffffffffffffffffffffffffff16826000015173ffffffffffffffffffffffffffffffffffffffff1614151561133457600080fd5b60008260a0015111801561134c575060008260c00151115b80156113585750600084115b151561136357600080fd5b816101200151421015156113c057816101400151600019166000600381111561138857fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009250611594565b6113db8260c001516113d68461014001516118c2565b61222f565b90506113e78482612248565b9250600083141561144157816101400151600019166001600381111561140957fe5b60ff167f36d86c59e00bd73dc19ba3adfe068e4b64ac7e92be35546adeddf1b956a87e9060405160405180910390a360009250611594565b61146b60016000846101400151600019166000191681526020019081526020016000205484612261565b60016000846101400151600019166000191681526020019081526020016000208190555081610140015160001916826080015173ffffffffffffffffffffffffffffffffffffffff16836000015173ffffffffffffffffffffffffffffffffffffffff167f3b6919db22c32eaeb34977fde39b1f756d065f7d3df049fc353613d0a36615b08560400151866060015161150d898960c001518a60a00151611a17565b89604051808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200183815260200182815260200194505050505060405180910390a48292505b50509392505050565b60008090505b8c8c9050811015611694576116878d8d8381811015156115bf57fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508c8c8481811015156115f857fe5b905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508b8b85818110151561163157fe5b905060200201358a8a86818110151561164657fe5b9050602002013560ff16898987818110151561165e57fe5b9050602002013560001916888888818110151561167757fe5b905060200201356000191661189f565b80806001019150506115a3565b50505050505050505050505050565b60008060008091505b8d8d9050821015611861578d8d600081811015156116c657fe5b905060a0020160036005811015156116da57fe5b602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168e8e84818110151561171957fe5b905060a00201600360058110151561172d57fe5b602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614151561176a57600080fd5b6118388e8e84818110151561177b57fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508d8d8581811015156117b457fe5b905060c00201600680602002604051908101604052809291908260066020028082843782019150505050506117e98d8761222f565b8c8c8781811015156117f757fe5b9050602002013560ff168b8b88818110151561180f57fe5b90506020020135600019168a8a89818110151561182857fe5b9050602002013560001916611dec565b9150506118458382612261565b92508983141561185457611861565b81806001019250506116ac565b82925050509b9a5050505050505050505050565b6000600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b836118ae878787878787610c19565b1415156118ba57600080fd5b505050505050565b600061190360008084600019166000191681526020019081526020016000205460016000856000191660001916815260200190815260200160002054612261565b9050809050919050565b600060018560405180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c0182600019166000191681526020019150506040518091039020858585604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f115156119d257600080fd5b50506020604051035173ffffffffffffffffffffffffffffffffffffffff168673ffffffffffffffffffffffffffffffffffffffff1614905080905095945050505050565b6000611a2c611a2685846121e1565b84612214565b90508090509392505050565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600080600090505b8c8c9050811015611c1b578c8c60008181101515611a8457fe5b905060a002016003600581101515611a9857fe5b602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168d8d838181101515611ad757fe5b905060a002016003600581101515611aeb57fe5b602002013573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16141515611b2857600080fd5b611bff82611bfa8f8f858181101515611b3d57fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508e8e868181101515611b7657fe5b905060c0020160068060200260405190810160405280929190826006602002808284378201915050505050611bab8e8861222f565b8d8d888181101515611bb957fe5b9050602002013560ff168c8c898181101515611bd157fe5b90506020020135600019168b8b8a8181101515611bea57fe5b9050602002013560001916610c19565b612261565b915088821415611c0e57611c1b565b8080600101915050611a6a565b819150509b9a5050505050505050505050565b60008090505b86869050811015611cdc57611cce8787838181101515611c5057fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508686848181101515611c8957fe5b905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508585858181101515611cc257fe5b90506020020135611162565b508080600101915050611c34565b50505050505050565b60008090505b8c8c9050811015611ddd57611dcf8d8d838181101515611d0757fe5b905060a00201600580602002604051908101604052809291908260056020028082843782019150505050508c8c848181101515611d4057fe5b905060c00201600680602002604051908101604052809291908260066020028082843782019150505050508b8b858181101515611d7957fe5b905060200201358a8a868181101515611d8e57fe5b9050602002013560ff168989878181101515611da657fe5b90506020020135600019168888888181101515611dbf57fe5b9050602002013560001916610c19565b508080600101915050611ceb565b50505050505050505050505050565b600080600060405180807f66696c6c4f7264657228616464726573735b355d2c75696e743235365b365d2c81526020017f75696e743235362c75696e74382c627974657333322c62797465733332290000815250603e0190506040518091039020905060405181815260208a01600482015260408a01602482015260608a01604482015260808a01606482015260a08a0160848201526020890160a48201526040890160c48201526060890160e48201526080890161010482015260a0890161012482015260c089016101448201528761016482015286610184820152856101a4820152846101c48201526020816101e483305af49350805192505082829250925050965096945050505050565b600030836000600581101515611f0c57fe5b6020020151846001600581101515611f2057fe5b6020020151856002600581101515611f3457fe5b6020020151866003600581101515611f4857fe5b6020020151876004600581101515611f5c57fe5b6020020151876000600681101515611f7057fe5b6020020151886001600681101515611f8457fe5b6020020151896002600681101515611f9857fe5b60200201518a6003600681101515611fac57fe5b60200201518b6004600681101515611fc057fe5b60200201518c6005600681101515611fd457fe5b6020020151604051808d73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018781526020018681526020018581526020018481526020018381526020018281526020019c505050505050505050505050506040518091039020905080905092915050565b6040805190810160405280600b81526020017f322e302e302d616c70686100000000000000000000000000000000000000000081525081565b6000808284029050600084148061220257508284828115156121ff57fe5b04145b151561220a57fe5b8091505092915050565b600080828481151561222257fe5b0490508091505092915050565b600082821115151561223d57fe5b818303905092915050565b60008183106122575781612259565b825b905092915050565b600080828401905083811015151561227557fe5b8091505092915050565b6000806000612297848760c001518860a00151611a17565b9250600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166315dacbea8760400151886000015188876000604051602001526040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001945050505050602060405180830381600087803b15156123d657600080fd5b6102c65a03f115156123e757600080fd5b5050506040518051905015156123fc57600080fd5b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166315dacbea8760600151878960000151886000604051602001526040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001945050505050602060405180830381600087803b151561253957600080fd5b6102c65a03f1151561254a57600080fd5b50505060405180519050151561255f57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff16866080015173ffffffffffffffffffffffffffffffffffffffff161415156128e85760008660e001511115612741576125b9848760c001518860e00151611a17565b9150600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166315dacbea600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1688600001518960800151866000604051602001526040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001945050505050602060405180830381600087803b151561271a57600080fd5b6102c65a03f1151561272b57600080fd5b50505060405180519050151561274057600080fd5b5b600086610100015111156128e757612763848760c00151886101000151611a17565b9050600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166315dacbea600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16878960800151856000604051602001526040518563ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001945050505050602060405180830381600087803b15156128c057600080fd5b6102c65a03f115156128d157600080fd5b5050506040518051905015156128e657600080fd5b5b5b82828292509250925093509350939050565b61016060405190810160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff16815260200160008152602001600081526020016000815260200160008152602001600081526020016000801916815250905600a165627a7a72305820851431bceb8b160e3729d75a55df868962d1ea57070e1176a3eadb383204a40a0029", - "updated_at": 1518560042811 + "unlinked_binary": "0x", + "updated_at": 1518568159963 } } } diff --git a/packages/contracts/src/artifacts/ISigner.json b/packages/contracts/src/artifacts/ISigner.json new file mode 100644 index 0000000000..763fc25686 --- /dev/null +++ b/packages/contracts/src/artifacts/ISigner.json @@ -0,0 +1,37 @@ +{ + "contract_name": "ISigner", + "networks": { + "50": { + "solc_version": "0.4.19", + "keccak256": "0x44a5168e2bbd35774f22dacda15909bdc32ba2431740af0b5b3085dfec187d3e", + "optimizer_enabled": 0, + "abi": [ + { + "constant": true, + "inputs": [ + { + "name": "hash", + "type": "bytes32" + }, + { + "name": "signature", + "type": "bytes" + } + ], + "name": "isValidSignature", + "outputs": [ + { + "name": "isValid", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + } + ], + "unlinked_binary": "0x", + "updated_at": 1518568156766 + } + } +} diff --git a/packages/contracts/src/artifacts/LibOrder.json b/packages/contracts/src/artifacts/LibOrder.json index 68313e54ae..ed13b2bef7 100644 --- a/packages/contracts/src/artifacts/LibOrder.json +++ b/packages/contracts/src/artifacts/LibOrder.json @@ -3,7 +3,7 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0x5453a4308bd7d0bba39597f77b57ef6b260fb86517c04c5ec11e350d4ff77660", + "keccak256": "0x1f5d96c16bd4ff0764263255263e9c99cc5797e91c2e9c75f91cbddd8d28b5a7", "optimizer_enabled": 0, "abi": [ { @@ -31,8 +31,8 @@ } ], "unlinked_binary": - "0x6060604052341561000f57600080fd5b6103ae8061001e6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063cfc4d0ec14610046575b600080fd5b341561005157600080fd5b6100b66004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c0019060068060200260405190810160405280929190826006602002808284378201915050505050919050506100d4565b60405180826000191660001916815260200191505060405180910390f35b6000308360006005811015156100e657fe5b60200201518460016005811015156100fa57fe5b602002015185600260058110151561010e57fe5b602002015186600360058110151561012257fe5b602002015187600460058110151561013657fe5b602002015187600060068110151561014a57fe5b602002015188600160068110151561015e57fe5b602002015189600260068110151561017257fe5b60200201518a600360068110151561018657fe5b60200201518b600460068110151561019a57fe5b60200201518c60056006811015156101ae57fe5b6020020151604051808d73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018781526020018681526020018581526020018481526020018381526020018281526020019c5050505050505050505050505060405180910390209050809050929150505600a165627a7a723058206b1ebdd17a67bf269db5a531a541211ee288b29a5b08bba46ebabe6178531f580029", - "updated_at": 1518118286358 + "0x6060604052341561000f57600080fd5b6103ae8061001e6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063cfc4d0ec14610046575b600080fd5b341561005157600080fd5b6100b66004808060a001906005806020026040519081016040528092919082600560200280828437820191505050505091908060c0019060068060200260405190810160405280929190826006602002808284378201915050505050919050506100d4565b60405180826000191660001916815260200191505060405180910390f35b6000308360006005811015156100e657fe5b60200201518460016005811015156100fa57fe5b602002015185600260058110151561010e57fe5b602002015186600360058110151561012257fe5b602002015187600460058110151561013657fe5b602002015187600060068110151561014a57fe5b602002015188600160068110151561015e57fe5b602002015189600260068110151561017257fe5b60200201518a600360068110151561018657fe5b60200201518b600460068110151561019a57fe5b60200201518c60056006811015156101ae57fe5b6020020151604051808d73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018c73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018873ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c010000000000000000000000000281526014018781526020018681526020018581526020018481526020018381526020018281526020019c5050505050505050505050505060405180910390209050809050929150505600a165627a7a72305820f3759d058cf7ee960e0e6e04a4052d455672deaf0fae4ddf40b7638742a84c350029", + "updated_at": 1518561351297 } } } diff --git a/packages/contracts/src/artifacts/MExchangeCore.json b/packages/contracts/src/artifacts/MExchangeCore.json index 9221772800..e9515628ea 100644 --- a/packages/contracts/src/artifacts/MExchangeCore.json +++ b/packages/contracts/src/artifacts/MExchangeCore.json @@ -3,7 +3,7 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0xb3f7e7eebb0b5ddae555a67cd7cd902e058ed2cb191db99f1f20de3fcdfcb0c8", + "keccak256": "0x7a7aa35c4d91e9f6d7c2d4a46ec274782380fbdccb746685661def30bb4601b7", "optimizer_enabled": 0, "abi": [ { @@ -18,26 +18,14 @@ "type": "uint256[6]" }, { - "name": "takerTokenFillAmount", + "name": "takerTokenCancelAmount", "type": "uint256" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" } ], - "name": "fillOrder", + "name": "cancelOrder", "outputs": [ { - "name": "takerTokenFilledAmount", + "name": "takerTokenCancelledAmount", "type": "uint256" } ], @@ -57,14 +45,18 @@ "type": "uint256[6]" }, { - "name": "takerTokenCancelAmount", + "name": "takerTokenFillAmount", "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], - "name": "cancelOrder", + "name": "fillOrder", "outputs": [ { - "name": "takerTokenCancelledAmount", + "name": "takerTokenFilledAmount", "type": "uint256" } ], @@ -74,7 +66,7 @@ } ], "unlinked_binary": "0x", - "updated_at": 1518118288620 + "updated_at": 1518561351709 } } } diff --git a/packages/contracts/src/artifacts/MSignatureValidator.json b/packages/contracts/src/artifacts/MSignatureValidator.json index e3bd51d96f..ea289af176 100644 --- a/packages/contracts/src/artifacts/MSignatureValidator.json +++ b/packages/contracts/src/artifacts/MSignatureValidator.json @@ -3,31 +3,23 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0xa5c24faed2b7618f1188bcc17a8b0f54ee03a0da8659f1a8f0d6577a842d9971", + "keccak256": "0x0afb7ab1afb1cae01e3408eecdf9343dd0e42551d40593fe21d2773c9cc5bd57", "optimizer_enabled": 0, "abi": [ { "constant": true, "inputs": [ { - "name": "signer", - "type": "address" - }, - { - "name": "hash", + "name": "digest", "type": "bytes32" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" + "name": "signer", + "type": "address" }, { - "name": "s", - "type": "bytes32" + "name": "signature", + "type": "bytes" } ], "name": "isValidSignature", @@ -43,7 +35,7 @@ } ], "unlinked_binary": "0x", - "updated_at": 1518118288768 + "updated_at": 1518561351720 } } } diff --git a/packages/contracts/src/artifacts/MixinExchangeCore.json b/packages/contracts/src/artifacts/MixinExchangeCore.json index 62d1db49f9..31359c9ca8 100644 --- a/packages/contracts/src/artifacts/MixinExchangeCore.json +++ b/packages/contracts/src/artifacts/MixinExchangeCore.json @@ -3,7 +3,7 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0x105d0f9fcdfff542879bf9441f438b26ddb3f23db0b1238a7a753d7150d24681", + "keccak256": "0xdfe9a6645b816c2b389232f9d87ca9427132eb08e33597bc1dd294ab579de247", "optimizer_enabled": 0, "abi": [ { @@ -83,26 +83,14 @@ "type": "uint256[6]" }, { - "name": "takerTokenFillAmount", + "name": "takerTokenCancelAmount", "type": "uint256" - }, - { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" } ], - "name": "fillOrder", + "name": "cancelOrder", "outputs": [ { - "name": "takerTokenFilledAmount", + "name": "takerTokenCancelledAmount", "type": "uint256" } ], @@ -124,6 +112,10 @@ { "name": "takerTokenCancelAmount", "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], "name": "cancelOrder", @@ -160,24 +152,16 @@ "constant": true, "inputs": [ { - "name": "signer", - "type": "address" - }, - { - "name": "hash", + "name": "digest", "type": "bytes32" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" + "name": "signer", + "type": "address" }, { - "name": "s", - "type": "bytes32" + "name": "signature", + "type": "bytes" } ], "name": "isValidSignature", @@ -241,6 +225,37 @@ "stateMutability": "view", "type": "function" }, + { + "constant": false, + "inputs": [ + { + "name": "orderAddresses", + "type": "address[5]" + }, + { + "name": "orderValues", + "type": "uint256[6]" + }, + { + "name": "takerTokenFillAmount", + "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" + } + ], + "name": "fillOrder", + "outputs": [ + { + "name": "takerTokenFilledAmount", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, { "anonymous": false, "inputs": [ @@ -359,7 +374,7 @@ } ], "unlinked_binary": "0x", - "updated_at": 1518560043128 + "updated_at": 1518564677515 } } } diff --git a/packages/contracts/src/artifacts/MixinSignatureValidator.json b/packages/contracts/src/artifacts/MixinSignatureValidator.json new file mode 100644 index 0000000000..14d0df472c --- /dev/null +++ b/packages/contracts/src/artifacts/MixinSignatureValidator.json @@ -0,0 +1,42 @@ +{ + "contract_name": "MixinSignatureValidator", + "networks": { + "50": { + "solc_version": "0.4.19", + "keccak256": "0x31db5d4fb514351a702c5f7e1cf1ef80bb5ee7b9267899b911f9318e4d19b2bd", + "optimizer_enabled": 0, + "abi": [ + { + "constant": true, + "inputs": [ + { + "name": "hash", + "type": "bytes32" + }, + { + "name": "signer", + "type": "address" + }, + { + "name": "signature", + "type": "bytes" + } + ], + "name": "isValidSignature", + "outputs": [ + { + "name": "isValid", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + } + ], + "unlinked_binary": + "0x6060604052341561000f57600080fd5b6106eb8061001e6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639363470214610046575b600080fd5b341561005157600080fd5b6100cd60048080356000191690602001909190803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001908201803590602001908080601f016020809104026020016040519081016040528093929190818152602001838380828437820191505050505050919050506100e7565b604051808215151515815260200191505060405180910390f35b600080600080600080600187511015151561010157600080fd5b86600081518110151561011057fe5b9060200101517f010000000000000000000000000000000000000000000000000000000000000090047f0100000000000000000000000000000000000000000000000000000000000000027f0100000000000000000000000000000000000000000000000000000000000000900460ff16600481111561018c57fe5b94506000600481111561019b57fe5b8560048111156101a757fe5b14156101c657600187511415156101bd57600080fd5b6000955061069f565b600160048111156101d357fe5b8560048111156101df57fe5b141561022b57600187511415156101f557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614955061069f565b6002600481111561023857fe5b85600481111561024457fe5b14156103f7576042875114151561025a57600080fd5b86600181518110151561026957fe5b9060200101517f010000000000000000000000000000000000000000000000000000000000000090047f0100000000000000000000000000000000000000000000000000000000000000027f0100000000000000000000000000000000000000000000000000000000000000900493506102e48760026106ab565b92506102f18760226106ab565b915060018960405180807f19457468657265756d205369676e6564204d6573736167653a0a333200000000815250601c0182600019166000191681526020019150506040518091039020858585604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f115156103b657600080fd5b50506020604051035190508073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614955061069f565b6003600481111561040457fe5b85600481111561041057fe5b141561056e5786600181518110151561042557fe5b9060200101517f010000000000000000000000000000000000000000000000000000000000000090047f0100000000000000000000000000000000000000000000000000000000000000027f0100000000000000000000000000000000000000000000000000000000000000900493506104a08760026106ab565b92506104ad8760236106ab565b9150600189858585604051600081526020016040526000604051602001526040518085600019166000191681526020018460ff1660ff16815260200183600019166000191681526020018260001916600019168152602001945050505050602060405160208103908084039060008661646e5a03f1151561052d57600080fd5b50506020604051035190508073ffffffffffffffffffffffffffffffffffffffff168873ffffffffffffffffffffffffffffffffffffffff1614955061069f565b60048081111561057a57fe5b85600481111561058657fe5b141561069a578773ffffffffffffffffffffffffffffffffffffffff16631626ba7e8a896000604051602001526040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180836000191660001916815260200180602001828103825283818151815260200191508051906020019080838360005b8381101561062c578082015181840152602081019050610611565b50505050905090810190601f1680156106595780820380516001836020036101000a031916815260200191505b509350505050602060405180830381600087803b151561067857600080fd5b6102c65a03f1151561068957600080fd5b50505060405180519050955061069f565b600080fd5b50505050509392505050565b6000602082019150818301519050929150505600a165627a7a7230582002eaa289662ab55ef2d17be1fdb3194d0029d430146d733446b4ec5c86c99e260029", + "updated_at": 1518568845350 + } + } +} diff --git a/packages/contracts/src/artifacts/MixinWrapperFunctions.json b/packages/contracts/src/artifacts/MixinWrapperFunctions.json index 35a4bf043d..372d928da2 100644 --- a/packages/contracts/src/artifacts/MixinWrapperFunctions.json +++ b/packages/contracts/src/artifacts/MixinWrapperFunctions.json @@ -3,7 +3,7 @@ "networks": { "50": { "solc_version": "0.4.19", - "keccak256": "0x0b08661bcc2c16332b0b855d286f851aa448e9f7e0b6d1ba6b3b1e73bc3f4dad", + "keccak256": "0x447410f6eaf35c198065f85df8e0530fd736117b9474cfcbfc79ade1d5621897", "optimizer_enabled": 0, "abi": [ { @@ -11,31 +11,24 @@ "inputs": [ { "name": "orderAddresses", - "type": "address[5][]" + "type": "address[5]" }, { "name": "orderValues", - "type": "uint256[6][]" - }, - { - "name": "takerTokenFillAmounts", - "type": "uint256[]" - }, - { - "name": "v", - "type": "uint8[]" + "type": "uint256[6]" }, { - "name": "r", - "type": "bytes32[]" - }, + "name": "takerTokenCancelAmount", + "type": "uint256" + } + ], + "name": "cancelOrder", + "outputs": [ { - "name": "s", - "type": "bytes32[]" + "name": "takerTokenCancelledAmount", + "type": "uint256" } ], - "name": "batchFillOrdersNoThrow", - "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -56,25 +49,12 @@ "type": "uint256" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" - } - ], - "name": "fillOrder", - "outputs": [ - { - "name": "takerTokenFilledAmount", - "type": "uint256" + "name": "signature", + "type": "bytes" } ], + "name": "fillOrKillOrder", + "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -91,14 +71,22 @@ "type": "uint256[6]" }, { - "name": "takerTokenCancelAmount", + "name": "takerTokenFillAmount", "type": "uint256" + }, + { + "name": "signature", + "type": "bytes" } ], - "name": "cancelOrder", + "name": "fillOrderNoThrow", "outputs": [ { - "name": "takerTokenCancelledAmount", + "name": "success", + "type": "bool" + }, + { + "name": "takerTokenFilledAmount", "type": "uint256" } ], @@ -122,20 +110,17 @@ "type": "uint256[]" }, { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, + "name": "signatures", + "type": "bytes[]" + } + ], + "name": "fillOrdersUpTo", + "outputs": [ { - "name": "s", - "type": "bytes32[]" + "name": "", + "type": "uint256" } ], - "name": "batchFillOrKillOrders", - "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -152,29 +137,16 @@ "type": "uint256[6][]" }, { - "name": "takerTokenFillAmount", - "type": "uint256" - }, - { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" + "name": "takerTokenFillAmounts", + "type": "uint256[]" }, { - "name": "s", - "type": "bytes32[]" - } - ], - "name": "marketFillOrdersNoThrow", - "outputs": [ - { - "name": "totalTakerTokenFilledAmount", - "type": "uint256" + "name": "signatures", + "type": "bytes[]" } ], + "name": "batchFillOrKillOrders", + "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -184,31 +156,28 @@ "inputs": [ { "name": "orderAddresses", - "type": "address[5]" + "type": "address[5][]" }, { "name": "orderValues", - "type": "uint256[6]" + "type": "uint256[6][]" }, { "name": "takerTokenFillAmount", "type": "uint256" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, + "name": "signatures", + "type": "bytes[]" + } + ], + "name": "marketFillOrdersNoThrow", + "outputs": [ { - "name": "s", - "type": "bytes32" + "name": "totalTakerTokenFilledAmount", + "type": "uint256" } ], - "name": "fillOrKillOrder", - "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -229,16 +198,8 @@ "type": "uint256" }, { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" + "name": "signatures", + "type": "bytes[]" } ], "name": "marketFillOrders", @@ -264,11 +225,15 @@ "type": "uint256[6][]" }, { - "name": "takerTokenCancelAmounts", + "name": "takerTokenFillAmounts", "type": "uint256[]" + }, + { + "name": "signatures", + "type": "bytes[]" } ], - "name": "batchCancelOrders", + "name": "batchFillOrders", "outputs": [], "payable": false, "stateMutability": "nonpayable", @@ -286,23 +251,11 @@ "type": "uint256[6][]" }, { - "name": "takerTokenFillAmounts", + "name": "takerTokenCancelAmounts", "type": "uint256[]" - }, - { - "name": "v", - "type": "uint8[]" - }, - { - "name": "r", - "type": "bytes32[]" - }, - { - "name": "s", - "type": "bytes32[]" } ], - "name": "batchFillOrders", + "name": "batchCancelOrders", "outputs": [], "payable": false, "stateMutability": "nonpayable", @@ -324,24 +277,12 @@ "type": "uint256" }, { - "name": "v", - "type": "uint8" - }, - { - "name": "r", - "type": "bytes32" - }, - { - "name": "s", - "type": "bytes32" + "name": "signature", + "type": "bytes" } ], - "name": "fillOrderNoThrow", + "name": "fillOrder", "outputs": [ - { - "name": "success", - "type": "bool" - }, { "name": "takerTokenFilledAmount", "type": "uint256" @@ -353,7 +294,7 @@ } ], "unlinked_binary": "0x", - "updated_at": 1518411927272 + "updated_at": 1518561351619 } } }