From cbdce6b67ee4ad44feb63766c4af613c18bf505d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 3 Jul 2018 15:36:30 +0300 Subject: Update ABI in compact_artifacts --- .../src/compact_artifacts/ERC20Proxy.json | 167 ++++++++++ .../src/compact_artifacts/ERC721Proxy.json | 167 ++++++++++ .../src/compact_artifacts/Exchange.json | 337 +++++++++++++++------ 3 files changed, 585 insertions(+), 86 deletions(-) diff --git a/packages/contract-wrappers/src/compact_artifacts/ERC20Proxy.json b/packages/contract-wrappers/src/compact_artifacts/ERC20Proxy.json index 430a8af68..82a08e23d 100644 --- a/packages/contract-wrappers/src/compact_artifacts/ERC20Proxy.json +++ b/packages/contract-wrappers/src/compact_artifacts/ERC20Proxy.json @@ -2,6 +2,125 @@ "contractName": "ERC20Proxy", "compilerOutput": { "abi": [ + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + } + ], + "name": "addAuthorizedAddress", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "name": "", + "type": "uint256" + } + ], + "name": "authorities", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + } + ], + "name": "removeAuthorizedAddress", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "owner", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + }, + { + "name": "index", + "type": "uint256" + } + ], + "name": "removeAuthorizedAddressAtIndex", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "assetData", + "type": "bytes" + }, + { + "name": "from", + "type": "address" + }, + { + "name": "to", + "type": "address" + }, + { + "name": "amount", + "type": "uint256" + } + ], + "name": "transferFrom", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "getProxyId", + "outputs": [ + { + "name": "", + "type": "bytes4" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": true, "inputs": [ @@ -34,6 +153,54 @@ "payable": false, "stateMutability": "view", "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "target", + "type": "address" + }, + { + "indexed": true, + "name": "caller", + "type": "address" + } + ], + "name": "AuthorizedAddressAdded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "target", + "type": "address" + }, + { + "indexed": true, + "name": "caller", + "type": "address" + } + ], + "name": "AuthorizedAddressRemoved", + "type": "event" } ] }, diff --git a/packages/contract-wrappers/src/compact_artifacts/ERC721Proxy.json b/packages/contract-wrappers/src/compact_artifacts/ERC721Proxy.json index 8924ede96..a31f5b858 100644 --- a/packages/contract-wrappers/src/compact_artifacts/ERC721Proxy.json +++ b/packages/contract-wrappers/src/compact_artifacts/ERC721Proxy.json @@ -2,6 +2,125 @@ "contractName": "ERC20Proxy", "compilerOutput": { "abi": [ + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + } + ], + "name": "addAuthorizedAddress", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [ + { + "name": "", + "type": "uint256" + } + ], + "name": "authorities", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + } + ], + "name": "removeAuthorizedAddress", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "owner", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "target", + "type": "address" + }, + { + "name": "index", + "type": "uint256" + } + ], + "name": "removeAuthorizedAddressAtIndex", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "assetData", + "type": "bytes" + }, + { + "name": "from", + "type": "address" + }, + { + "name": "to", + "type": "address" + }, + { + "name": "amount", + "type": "uint256" + } + ], + "name": "transferFrom", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "getProxyId", + "outputs": [ + { + "name": "", + "type": "bytes4" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": true, "inputs": [ @@ -34,6 +153,54 @@ "payable": false, "stateMutability": "view", "type": "function" + }, + { + "constant": false, + "inputs": [ + { + "name": "newOwner", + "type": "address" + } + ], + "name": "transferOwnership", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "target", + "type": "address" + }, + { + "indexed": true, + "name": "caller", + "type": "address" + } + ], + "name": "AuthorizedAddressAdded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "target", + "type": "address" + }, + { + "indexed": true, + "name": "caller", + "type": "address" + } + ], + "name": "AuthorizedAddressRemoved", + "type": "event" } ] }, diff --git a/packages/contract-wrappers/src/compact_artifacts/Exchange.json b/packages/contract-wrappers/src/compact_artifacts/Exchange.json index 5ba9017c3..7d0bac63a 100644 --- a/packages/contract-wrappers/src/compact_artifacts/Exchange.json +++ b/packages/contract-wrappers/src/compact_artifacts/Exchange.json @@ -2,6 +2,20 @@ "contractName": "Exchange", "compilerOutput": { "abi": [ + { + "constant": true, + "inputs": [], + "name": "EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH", + "outputs": [ + { + "name": "", + "type": "bytes32" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": true, "inputs": [ @@ -88,7 +102,30 @@ } ], "name": "batchFillOrders", - "outputs": [], + "outputs": [ + { + "components": [ + { + "name": "makerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "takerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "makerFeePaid", + "type": "uint256" + }, + { + "name": "takerFeePaid", + "type": "uint256" + } + ], + "name": "totalFillResults", + "type": "tuple" + } + ], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -112,20 +149,6 @@ "stateMutability": "view", "type": "function" }, - { - "constant": true, - "inputs": [], - "name": "zrxAssetData", - "outputs": [ - { - "name": "", - "type": "bytes" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, { "constant": false, "inputs": [ @@ -134,7 +157,7 @@ "type": "bytes32" }, { - "name": "signer", + "name": "signerAddress", "type": "address" }, { @@ -148,25 +171,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint8" - } - ], - "name": "assetProxies", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, { "constant": false, "inputs": [ @@ -443,6 +447,25 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "name": "", + "type": "bytes4" + } + ], + "name": "assetProxies", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -574,7 +597,30 @@ } ], "name": "batchFillOrKillOrders", - "outputs": [], + "outputs": [ + { + "components": [ + { + "name": "makerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "takerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "makerFeePaid", + "type": "uint256" + }, + { + "name": "takerFeePaid", + "type": "uint256" + } + ], + "name": "totalFillResults", + "type": "tuple" + } + ], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -583,7 +629,7 @@ "constant": false, "inputs": [ { - "name": "salt", + "name": "targetOrderEpoch", "type": "uint256" } ], @@ -660,31 +706,51 @@ } ], "name": "batchFillOrdersNoThrow", - "outputs": [], + "outputs": [ + { + "components": [ + { + "name": "makerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "takerAssetFilledAmount", + "type": "uint256" + }, + { + "name": "makerFeePaid", + "type": "uint256" + }, + { + "name": "takerFeePaid", + "type": "uint256" + } + ], + "name": "totalFillResults", + "type": "tuple" + } + ], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { - "constant": false, + "constant": true, "inputs": [ { "name": "assetProxyId", - "type": "uint8" - }, - { - "name": "newAssetProxy", - "type": "address" - }, + "type": "bytes4" + } + ], + "name": "getAssetProxy", + "outputs": [ { - "name": "oldAssetProxy", + "name": "", "type": "address" } ], - "name": "registerAssetProxy", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { @@ -801,30 +867,11 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "makerEpoch", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, { "constant": false, "inputs": [ { - "name": "validator", + "name": "validatorAddress", "type": "address" }, { @@ -979,6 +1026,28 @@ "stateMutability": "view", "type": "function" }, + { + "constant": false, + "inputs": [ + { + "name": "assetProxyId", + "type": "bytes4" + }, + { + "name": "newAssetProxy", + "type": "address" + }, + { + "name": "oldAssetProxy", + "type": "address" + } + ], + "name": "registerAssetProxy", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function" + }, { "constant": true, "inputs": [], @@ -997,15 +1066,23 @@ "constant": true, "inputs": [ { - "name": "assetProxyId", - "type": "uint8" + "name": "hash", + "type": "bytes32" + }, + { + "name": "signerAddress", + "type": "address" + }, + { + "name": "signature", + "type": "bytes" } ], - "name": "getAssetProxy", + "name": "isValidSignature", "outputs": [ { - "name": "", - "type": "address" + "name": "isValid", + "type": "bool" } ], "payable": false, @@ -1210,7 +1287,7 @@ "type": "uint256" }, { - "name": "signer", + "name": "signerAddress", "type": "address" }, { @@ -1375,6 +1452,43 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "name": "", + "type": "address" + }, + { + "name": "", + "type": "address" + } + ], + "name": "orderEpoch", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, + { + "constant": true, + "inputs": [], + "name": "ZRX_ASSET_DATA", + "outputs": [ + { + "name": "", + "type": "bytes" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -1470,6 +1584,20 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "constant": true, + "inputs": [], + "name": "EIP712_DOMAIN_HASH", + "outputs": [ + { + "name": "", + "type": "bytes32" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -1622,22 +1750,22 @@ "anonymous": false, "inputs": [ { - "indexed": false, - "name": "id", - "type": "uint8" + "indexed": true, + "name": "signerAddress", + "type": "address" }, { - "indexed": false, - "name": "newAssetProxy", + "indexed": true, + "name": "validatorAddress", "type": "address" }, { "indexed": false, - "name": "oldAssetProxy", - "type": "address" + "name": "approved", + "type": "bool" } ], - "name": "AssetProxySet", + "name": "SignatureValidatorApproval", "type": "event" }, { @@ -1648,14 +1776,19 @@ "name": "makerAddress", "type": "address" }, + { + "indexed": true, + "name": "feeRecipientAddress", + "type": "address" + }, { "indexed": false, "name": "takerAddress", "type": "address" }, { - "indexed": true, - "name": "feeRecipientAddress", + "indexed": false, + "name": "senderAddress", "type": "address" }, { @@ -1710,6 +1843,11 @@ "name": "feeRecipientAddress", "type": "address" }, + { + "indexed": false, + "name": "senderAddress", + "type": "address" + }, { "indexed": true, "name": "orderHash", @@ -1737,14 +1875,41 @@ "name": "makerAddress", "type": "address" }, + { + "indexed": true, + "name": "senderAddress", + "type": "address" + }, { "indexed": false, - "name": "makerEpoch", + "name": "orderEpoch", "type": "uint256" } ], "name": "CancelUpTo", "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "name": "id", + "type": "bytes4" + }, + { + "indexed": false, + "name": "newAssetProxy", + "type": "address" + }, + { + "indexed": false, + "name": "oldAssetProxy", + "type": "address" + } + ], + "name": "AssetProxySet", + "type": "event" } ] }, -- cgit v1.2.3