diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index ddadd60fd9..ce56849125 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -51,15 +51,15 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contract-wrappers": "^13.15.0", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", + "@0x/tslint-config": "^4.1.4", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -67,7 +67,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereumjs-util": "^5.1.1", + "ethereumjs-util": "^7.0.10", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", "npm-run-all": "^4.1.2", @@ -79,17 +79,17 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-erc1155": "^2.1.27", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-erc721": "^3.1.27", "@0x/contracts-exchange-libs": "^4.3.27", "@0x/order-utils": "^10.4.19", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", - "ethereum-types": "^3.4.0", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", + "ethereum-types": "^3.5.0", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/asset-proxy/test/static_call_proxy.ts b/contracts/asset-proxy/test/static_call_proxy.ts index baa212acab..b7e776c18d 100644 --- a/contracts/asset-proxy/test/static_call_proxy.ts +++ b/contracts/asset-proxy/test/static_call_proxy.ts @@ -168,7 +168,7 @@ describe('StaticCallProxy', () => { it('should revert if the hash of the output is different than expected expected', async () => { const staticCallData = staticCallTarget.isOddNumber(new BigNumber(0)).getABIEncodedTransactionData(); const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001'); - const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer)); + const expectedResultHash = ethUtil.bufferToHex(ethUtil.keccak256(trueAsBuffer)); const assetData = assetDataInterface .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash) .getABIEncodedTransactionData(); @@ -199,7 +199,7 @@ describe('StaticCallProxy', () => { it('should be successful if a function call with one static input returns the correct value', async () => { const staticCallData = staticCallTarget.isOddNumber(new BigNumber(1)).getABIEncodedTransactionData(); const trueAsBuffer = ethUtil.toBuffer('0x0000000000000000000000000000000000000000000000000000000000000001'); - const expectedResultHash = ethUtil.bufferToHex(ethUtil.sha3(trueAsBuffer)); + const expectedResultHash = ethUtil.bufferToHex(ethUtil.keccak256(trueAsBuffer)); const assetData = assetDataInterface .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash) .getABIEncodedTransactionData(); @@ -232,7 +232,7 @@ describe('StaticCallProxy', () => { const offset = '0000000000000000000000000000000000000000000000000000000000000020'; const encodedExpectedResultWithOffset = `0x${offset}${abiEncoder.encode(expectedResults).slice(2)}`; const expectedResultHash = ethUtil.bufferToHex( - ethUtil.sha3(ethUtil.toBuffer(encodedExpectedResultWithOffset)), + ethUtil.keccak256(ethUtil.toBuffer(encodedExpectedResultWithOffset)), ); const assetData = assetDataInterface .StaticCall(staticCallTarget.address, staticCallData, expectedResultHash) diff --git a/contracts/broker/package.json b/contracts/broker/package.json index 4e0621aee3..effa3c72cc 100644 --- a/contracts/broker/package.json +++ b/contracts/broker/package.json @@ -51,20 +51,20 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-erc721": "^3.1.27", "@0x/contracts-exchange": "^3.2.28", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -84,11 +84,11 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/order-utils": "^10.4.19", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0" + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/coordinator/package.json b/contracts/coordinator/package.json index 5ded7b9810..9d66078ba9 100644 --- a/contracts/coordinator/package.json +++ b/contracts/coordinator/package.json @@ -52,17 +52,17 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-dev-utils": "^1.3.26", "@0x/contracts-erc20": "^3.3.6", - "@0x/contracts-gen": "^2.0.32", - "@0x/dev-utils": "^4.2.1", + "@0x/contracts-gen": "^2.0.37", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -82,17 +82,17 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/assert": "^3.0.21", - "@0x/base-contract": "^6.2.18", + "@0x/assert": "^3.0.26", + "@0x/base-contract": "^6.3.2", "@0x/contract-addresses": "^6.0.0", "@0x/contracts-exchange": "^3.2.28", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/json-schemas": "^5.4.1", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0", + "@0x/json-schemas": "^6.1.2", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0", "http-status-codes": "^1.3.2" }, "publishConfig": { diff --git a/contracts/coordinator/src/client/utils/assert.ts b/contracts/coordinator/src/client/utils/assert.ts index 908bdc2d6f..719b9dae3c 100644 --- a/contracts/coordinator/src/client/utils/assert.ts +++ b/contracts/coordinator/src/client/utils/assert.ts @@ -1,8 +1,4 @@ import { assert as sharedAssert } from '@0x/assert'; -// HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here -import { Schema } from '@0x/json-schemas'; // tslint:disable-line:no-unused-variable -import { Order } from '@0x/types'; // tslint:disable-line:no-unused-variable -import { BigNumber } from '@0x/utils'; // tslint:disable-line:no-unused-variable import { Web3Wrapper } from '@0x/web3-wrapper'; export const assert = { diff --git a/contracts/dev-utils/package.json b/contracts/dev-utils/package.json index 407cdc384d..a243998163 100644 --- a/contracts/dev-utils/package.json +++ b/contracts/dev-utils/package.json @@ -41,18 +41,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/dev-utils", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/assert": "^3.0.21", + "@0x/abi-gen": "^5.5.2", + "@0x/assert": "^3.0.26", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-erc20": "^3.3.6", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0", "ethers": "~4.0.4", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -63,7 +63,7 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@types/node": "12.12.54" }, "publishConfig": { diff --git a/contracts/erc1155/package.json b/contracts/erc1155/package.json index b7201312d5..89d0c2fa43 100644 --- a/contracts/erc1155/package.json +++ b/contracts/erc1155/package.json @@ -52,15 +52,15 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/contracts-gen": "^2.0.32", + "@0x/abi-gen": "^5.5.2", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -68,7 +68,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", "npm-run-all": "^4.1.2", @@ -80,10 +80,10 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-test-utils": "^5.3.24", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json index 6cf79966e4..dad47b96f9 100644 --- a/contracts/erc20/package.json +++ b/contracts/erc20/package.json @@ -51,18 +51,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/contracts-gen": "^2.0.32", + "@0x/abi-gen": "^5.5.2", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -70,7 +70,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "lodash": "^4.17.11", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -82,7 +82,7 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18" + "@0x/base-contract": "^6.3.2" }, "publishConfig": { "access": "public" diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json index 0c4457058d..5b41cd7a8a 100644 --- a/contracts/erc721/package.json +++ b/contracts/erc721/package.json @@ -52,18 +52,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/contracts-gen": "^2.0.32", + "@0x/abi-gen": "^5.5.2", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -71,7 +71,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "lodash": "^4.17.11", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -84,7 +84,7 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18" + "@0x/base-contract": "^6.3.2" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json index f79f36e868..dcd4f4ecb8 100644 --- a/contracts/exchange-forwarder/package.json +++ b/contracts/exchange-forwarder/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-dev-utils": "^1.3.26", "@0x/contracts-erc1155": "^2.1.27", @@ -60,17 +60,17 @@ "@0x/contracts-erc721": "^3.1.27", "@0x/contracts-exchange": "^3.2.28", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -90,9 +90,9 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", - "@0x/typescript-typings": "^5.1.6", - "ethereum-types": "^3.4.0" + "@0x/base-contract": "^6.3.2", + "@0x/typescript-typings": "^5.2.0", + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json index 015f778382..5513a0c0be 100644 --- a/contracts/exchange-libs/package.json +++ b/contracts/exchange-libs/package.json @@ -52,14 +52,14 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/libs", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/contracts-gen": "^2.0.32", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", - "@0x/subproviders": "^6.4.1", + "@0x/abi-gen": "^5.5.2", + "@0x/contracts-gen": "^2.0.37", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", + "@0x/subproviders": "^6.5.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -67,7 +67,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereumjs-util": "^5.1.1", + "ethereumjs-util": "^7.0.10", "lodash": "^4.17.11", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -80,14 +80,14 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", "@0x/order-utils": "^10.4.19", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0" + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index af0f69bc18..e9f5ca56cd 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -52,21 +52,21 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/protocol", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-multisig": "^4.1.28", "@0x/contracts-staking": "^2.0.35", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -74,8 +74,8 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10", "js-combinatorics": "^0.5.3", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -88,13 +88,13 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-dev-utils": "^1.3.26", "@0x/contracts-erc1155": "^2.1.27", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-erc721": "^3.1.27", "@0x/order-utils": "^10.4.19", - "@0x/utils": "^6.2.0", + "@0x/utils": "^6.4.2", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/exchange/test/signature_validator.ts b/contracts/exchange/test/signature_validator.ts index 07d66760d2..f610cf63a2 100644 --- a/contracts/exchange/test/signature_validator.ts +++ b/contracts/exchange/test/signature_validator.ts @@ -86,7 +86,7 @@ blockchainTests.resets('MixinSignatureValidator', env => { const SIGNATURE_LENGTH = 65; const generateRandomSignature = (): string => hexUtils.random(SIGNATURE_LENGTH); - const hashBytes = (bytesHex: string): string => ethUtil.bufferToHex(ethUtil.sha3(ethUtil.toBuffer(bytesHex))); + const hashBytes = (bytesHex: string): string => hexUtils.hash(bytesHex); const signDataHex = (dataHex: string, privateKey: Buffer): string => { const ecSignature = ethUtil.ecsign(ethUtil.toBuffer(dataHex), privateKey); return hexUtils.concat(ecSignature.v, ecSignature.r, ecSignature.s); diff --git a/contracts/exchange/test/wrapper_unit_tests.ts b/contracts/exchange/test/wrapper_unit_tests.ts index 881ca4a0f3..25a8d89be1 100644 --- a/contracts/exchange/test/wrapper_unit_tests.ts +++ b/contracts/exchange/test/wrapper_unit_tests.ts @@ -12,7 +12,6 @@ import { ReferenceFunctions as UtilReferenceFunctions, SafeMathRevertErrors } fr import { FillResults, Order } from '@0x/types'; import { AnyRevertError, BigNumber, ExchangeRevertErrors, hexUtils, StringRevertError } from '@0x/utils'; import { LogEntry, LogWithDecodedArgs } from 'ethereum-types'; -import * as ethjs from 'ethereumjs-util'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; @@ -104,7 +103,7 @@ blockchainTests('Exchange wrapper functions unit tests.', env => { // Creates a deterministic order signature, even though no signature validation // actually occurs in the test contract. function createOrderSignature(order: Order): string { - return ethjs.bufferToHex(ethjs.sha3(ethjs.toBuffer(orderHashUtils.getOrderHashHex(order)))); + return hexUtils.hash(orderHashUtils.getOrderHashHex(order)); } // Asserts that `_fillOrder()` was called in the same order and with the same diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json index f7aa219238..08d3a31074 100644 --- a/contracts/extensions/package.json +++ b/contracts/extensions/package.json @@ -52,23 +52,23 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-dev-utils": "^1.3.26", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-erc721": "^3.1.27", "@0x/contracts-exchange": "^3.2.28", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -77,7 +77,7 @@ "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", "ethereumjs-abi": "0.6.5", - "ethereumjs-util": "^5.1.1", + "ethereumjs-util": "^7.0.10", "lodash": "^4.17.11", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -90,10 +90,10 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-test-utils": "^5.3.24", - "@0x/typescript-typings": "^5.1.6", - "ethereum-types": "^3.4.0" + "@0x/typescript-typings": "^5.2.0", + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/integrations/package.json b/contracts/integrations/package.json index 8bf1c15bae..d460f51838 100644 --- a/contracts/integrations/package.json +++ b/contracts/integrations/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/extensions", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contract-addresses": "^6.0.0", "@0x/contract-wrappers": "^13.15.0", "@0x/contracts-broker": "^1.1.27", @@ -61,16 +61,16 @@ "@0x/contracts-exchange-forwarder": "^4.2.28", "@0x/contracts-exchange-libs": "^4.3.27", "@0x/contracts-extensions": "^6.2.22", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-utils": "^4.7.6", "@0x/coordinator-server": "^1.0.5", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/migrations": "^8.0.2", "@0x/order-utils": "^10.4.19", "@0x/protocol-utils": "^1.5.0", - "@0x/sol-compiler": "^4.6.1", - "@0x/tslint-config": "^4.1.3", - "@0x/web3-wrapper": "^7.4.1", + "@0x/sol-compiler": "^4.7.2", + "@0x/tslint-config": "^4.1.4", + "@0x/web3-wrapper": "^7.5.2", "@azure/core-asynciterator-polyfill": "^1.0.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -94,7 +94,7 @@ }, "dependencies": { "@0x/asset-swapper": "^6.7.0", - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-erc1155": "^2.1.27", "@0x/contracts-erc20": "^3.3.6", @@ -104,12 +104,12 @@ "@0x/contracts-staking": "^2.0.35", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-zero-ex": "^0.22.0", - "@0x/subproviders": "^6.4.1", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^6.2.0", + "@0x/subproviders": "^6.5.2", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10", "lodash": "^4.17.11" }, "publishConfig": { diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json index d27cdd149c..ab71836272 100644 --- a/contracts/multisig/package.json +++ b/contracts/multisig/package.json @@ -49,18 +49,18 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/multisig", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-erc20": "^3.3.6", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", - "@0x/sol-compiler": "^4.6.1", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/dev-utils": "^4.2.6", + "@0x/sol-compiler": "^4.7.2", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", @@ -78,9 +78,9 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", - "@0x/typescript-typings": "^5.1.6", - "ethereum-types": "^3.4.0" + "@0x/base-contract": "^6.3.2", + "@0x/typescript-typings": "^5.2.0", + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/staking/package.json b/contracts/staking/package.json index 40eaee1698..9062138378 100644 --- a/contracts/staking/package.json +++ b/contracts/staking/package.json @@ -53,20 +53,20 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/tokens", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-dev-utils": "^1.3.26", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-utils": "^4.7.6", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/web3-wrapper": "^7.5.2", "@types/lodash": "4.14.104", "@types/node": "12.12.54", "chai": "^4.0.1", @@ -87,12 +87,12 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-test-utils": "^5.3.24", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1" + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10" }, "publishConfig": { "access": "public" diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json index 70b268b323..49cabdd836 100644 --- a/contracts/test-utils/package.json +++ b/contracts/test-utils/package.json @@ -34,28 +34,28 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/test-utils", "devDependencies": { - "@0x/sol-compiler": "^4.6.1", - "@0x/tslint-config": "^4.1.3", + "@0x/sol-compiler": "^4.7.2", + "@0x/tslint-config": "^4.1.4", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.11.0", "typescript": "4.2.2" }, "dependencies": { - "@0x/assert": "^3.0.21", - "@0x/base-contract": "^6.2.18", + "@0x/assert": "^3.0.26", + "@0x/base-contract": "^6.3.2", "@0x/contract-addresses": "^6.0.0", - "@0x/dev-utils": "^4.2.1", - "@0x/json-schemas": "^5.4.1", + "@0x/dev-utils": "^4.2.6", + "@0x/json-schemas": "^6.1.2", "@0x/order-utils": "^10.4.19", - "@0x/sol-coverage": "^4.0.31", - "@0x/sol-profiler": "^4.1.21", - "@0x/sol-trace": "^3.0.31", - "@0x/subproviders": "^6.4.1", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/sol-coverage": "^4.0.36", + "@0x/sol-profiler": "^4.1.26", + "@0x/sol-trace": "^3.0.36", + "@0x/subproviders": "^6.5.2", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/bn.js": "^4.11.0", "@types/js-combinatorics": "^0.5.29", "@types/lodash": "4.14.104", @@ -67,8 +67,8 @@ "chai-bignumber": "^3.0.0", "decimal.js": "^10.2.0", "dirty-chai": "^2.0.1", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10", "ethers": "~4.0.4", "js-combinatorics": "^0.5.3", "lodash": "^4.17.11", diff --git a/contracts/test-utils/src/constants.ts b/contracts/test-utils/src/constants.ts index efffa4f075..1c945cd35f 100644 --- a/contracts/test-utils/src/constants.ts +++ b/contracts/test-utils/src/constants.ts @@ -77,7 +77,7 @@ export const constants = { ZERO_AMOUNT: new BigNumber(0), PERCENTAGE_DENOMINATOR: new BigNumber(10).pow(18), TIME_BUFFER: new BigNumber(1000), - KECCAK256_NULL: ethUtil.addHexPrefix(ethUtil.bufferToHex(ethUtil.SHA3_NULL)), + KECCAK256_NULL: ethUtil.bufferToHex(ethUtil.keccak256(Buffer.alloc(0))), MAX_UINT256_ROOT: new BigNumber('340282366920938463463374607431768211456'), ONE_ETHER: new BigNumber(1e18), EIP712_DOMAIN_NAME: '0x Protocol', diff --git a/contracts/test-utils/test/order_hash_test.ts b/contracts/test-utils/test/order_hash_test.ts index edc5930bee..8fe0347c11 100644 --- a/contracts/test-utils/test/order_hash_test.ts +++ b/contracts/test-utils/test/order_hash_test.ts @@ -57,9 +57,7 @@ describe('Order hashing', () => { ...order, takerAddress: (null as any) as string, }; - const expectedErrorMessage = `Order taker must be of type string. If you want anyone to be able to fill an order - pass ${ - constants.NULL_ADDRESS - }`; + const expectedErrorMessage = `Expected order to conform to schema`; expect(() => orderHashUtils.getOrderHashHex(orderWithInvalidtakerFormat)).to.throw(expectedErrorMessage); }); }); diff --git a/contracts/treasury/package.json b/contracts/treasury/package.json index 1c527fb19e..ddfa401125 100644 --- a/contracts/treasury/package.json +++ b/contracts/treasury/package.json @@ -46,16 +46,16 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contract-addresses": "^6.0.0", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-erc20": "^3.3.6", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-staking": "^2.0.35", "@0x/contracts-test-utils": "^5.3.24", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", + "@0x/tslint-config": "^4.1.4", "@types/isomorphic-fetch": "^0.0.35", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -72,15 +72,15 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/protocol-utils": "^1.5.0", - "@0x/subproviders": "^6.4.1", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1" + "@0x/subproviders": "^6.5.2", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10" }, "publishConfig": { "access": "public" diff --git a/contracts/utils/package.json b/contracts/utils/package.json index 7a99d9b594..762fd8ed61 100644 --- a/contracts/utils/package.json +++ b/contracts/utils/package.json @@ -50,15 +50,15 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/utils", "devDependencies": { - "@0x/abi-gen": "^5.4.21", - "@0x/contracts-gen": "^2.0.32", + "@0x/abi-gen": "^5.5.2", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/web3-wrapper": "^7.4.1", + "@0x/sol-compiler": "^4.7.2", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/web3-wrapper": "^7.5.2", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -67,7 +67,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereumjs-util": "^5.1.1", + "ethereumjs-util": "^7.0.10", "lodash": "^4.17.11", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -79,11 +79,11 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", + "@0x/base-contract": "^6.3.2", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", "bn.js": "^4.11.8", - "ethereum-types": "^3.4.0" + "ethereum-types": "^3.5.0" }, "publishConfig": { "access": "public" diff --git a/contracts/utils/test/lib_eip712.ts b/contracts/utils/test/lib_eip712.ts index 01b7547c23..4e6ecaed1e 100644 --- a/contracts/utils/test/lib_eip712.ts +++ b/contracts/utils/test/lib_eip712.ts @@ -2,7 +2,6 @@ import { chaiSetup, constants, provider, txDefaults, web3Wrapper } from '@0x/con import { BlockchainLifecycle } from '@0x/dev-utils'; import { BigNumber, hexUtils, signTypedDataUtils } from '@0x/utils'; import * as chai from 'chai'; -import * as ethUtil from 'ethereumjs-util'; import * as _ from 'lodash'; import { artifacts } from './artifacts'; @@ -78,7 +77,7 @@ describe('LibEIP712', () => { // Hash the provided input to get the expected hash const input = '0x1901'.concat(unprefixedDomainHash.concat(unprefixedHashStruct)); - const expectedHash = '0x'.concat(ethUtil.sha3(input).toString('hex')); + const expectedHash = hexUtils.hash(input); // Get the actual hash by calling the smart contract const actualHash = await lib.externalHashEIP712Message(domainHash, hashStruct).callAsync(); diff --git a/contracts/zero-ex/package.json b/contracts/zero-ex/package.json index 75bbdf4954..ad9cbd5988 100644 --- a/contracts/zero-ex/package.json +++ b/contracts/zero-ex/package.json @@ -55,16 +55,16 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex", "devDependencies": { - "@0x/abi-gen": "^5.4.21", + "@0x/abi-gen": "^5.5.2", "@0x/contract-addresses": "^6.0.0", "@0x/contracts-erc20": "^3.3.6", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/order-utils": "^10.4.19", - "@0x/sol-compiler": "^4.6.1", + "@0x/sol-compiler": "^4.7.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", + "@0x/tslint-config": "^4.1.4", "@types/isomorphic-fetch": "^0.0.35", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", @@ -82,15 +82,15 @@ "typescript": "4.2.2" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/protocol-utils": "^1.5.0", - "@0x/subproviders": "^6.4.1", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1" + "@0x/subproviders": "^6.5.2", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10" }, "publishConfig": { "access": "public" diff --git a/contracts/zero-ex/src/nonce_utils.ts b/contracts/zero-ex/src/nonce_utils.ts index 157829fcb2..0cc85a7d55 100644 --- a/contracts/zero-ex/src/nonce_utils.ts +++ b/contracts/zero-ex/src/nonce_utils.ts @@ -20,6 +20,7 @@ export function rlpEncodeNonce(nonce: number): string { return ethjs.bufferToHex(ethjs.toBuffer(nonce)); } else { const rlpNonce = ethjs.toBuffer(nonce); + // tslint:disable-next-line: restrict-plus-operands return hexUtils.concat(rlpNonce.length + 0x80, ethjs.bufferToHex(rlpNonce)); } } diff --git a/contracts/zero-ex/test/permissionless_transformer_deployer_test.ts b/contracts/zero-ex/test/permissionless_transformer_deployer_test.ts index 1773d34236..1494e53be3 100644 --- a/contracts/zero-ex/test/permissionless_transformer_deployer_test.ts +++ b/contracts/zero-ex/test/permissionless_transformer_deployer_test.ts @@ -1,6 +1,5 @@ import { blockchainTests, expect, verifyEventsFromLogs } from '@0x/contracts-test-utils'; import { BigNumber, hexUtils } from '@0x/utils'; -import * as ethjs from 'ethereumjs-util'; import { artifacts } from './artifacts'; import { @@ -41,9 +40,9 @@ blockchainTests.resets('PermissionlessTransformerDeployer', env => { it('deploys at predictable address', async () => { const salt = hexUtils.random(); const targetAddress = await deployer.deploy(deployBytes, salt).callAsync(); - const initCodeHash = hexUtils.toHex(ethjs.sha3(deployBytes)); + const initCodeHash = hexUtils.hash(deployBytes); const expectedAddress = hexUtils.slice( - hexUtils.toHex(ethjs.sha3(hexUtils.concat('0xFF', deployer.address, salt, initCodeHash))), + hexUtils.hash(hexUtils.concat('0xFF', deployer.address, salt, initCodeHash)), 12, ); @@ -94,7 +93,7 @@ blockchainTests.resets('PermissionlessTransformerDeployer', env => { const targetAddress = await deployer.deploy(deployBytes, salt).callAsync({ from: sender }); await deployer.deploy(deployBytes, salt).awaitTransactionSuccessAsync({ from: sender }); expect(hexUtils.toHex(await deployer.toInitCodeHash(targetAddress).callAsync())).to.eq( - hexUtils.toHex(ethjs.sha3(deployBytes)), + hexUtils.hash(deployBytes), ); }); }); diff --git a/package.json b/package.json index 93f5ed4282..411b02c804 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "ignoreDependencyVersionsForPackage": "contract-wrappers" }, "devDependencies": { - "@0x/monorepo-scripts": "^3.1.1", + "@0x/monorepo-scripts": "^3.1.6", "@0x-lerna-fork/lerna": "3.16.10", "@0xproject/npm-cli-login": "^0.0.11", "async-child-process": "^1.1.1", diff --git a/packages/asset-swapper/package.json b/packages/asset-swapper/package.json index c520f048d8..557ad9e052 100644 --- a/packages/asset-swapper/package.json +++ b/packages/asset-swapper/package.json @@ -57,20 +57,20 @@ "registry": "git@github.com:0xProject/gitpkg-registry.git" }, "dependencies": { - "@0x/assert": "^3.0.21", - "@0x/base-contract": "^6.2.18", + "@0x/assert": "^3.0.26", + "@0x/base-contract": "^6.3.2", "@0x/contract-addresses": "^6.0.0", "@0x/contract-wrappers": "^13.15.0", "@0x/contracts-erc20": "^3.3.6", "@0x/contracts-zero-ex": "^0.22.0", - "@0x/dev-utils": "^4.2.1", - "@0x/json-schemas": "^5.4.1", + "@0x/dev-utils": "^4.2.6", + "@0x/json-schemas": "^6.1.2", "@0x/protocol-utils": "^1.5.0", "@0x/quote-server": "^5.0.0", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@balancer-labs/sor": "0.3.2", "@bancor/sdk": "0.2.9", "@ethersproject/abi": "^5.0.1", @@ -82,26 +82,26 @@ "axios-mock-adapter": "^1.19.0", "cream-sor": "^0.3.3", "decimal.js": "^10.2.0", - "ethereum-types": "^3.4.0", - "ethereumjs-util": "^5.1.1", + "ethereum-types": "^3.5.0", + "ethereumjs-util": "^7.0.10", "heartbeats": "^5.0.1", "lodash": "^4.17.11" }, "devDependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-exchange": "^3.2.28", "@0x/contracts-exchange-libs": "^4.3.27", - "@0x/contracts-gen": "^2.0.32", + "@0x/contracts-gen": "^2.0.37", "@0x/contracts-test-utils": "^5.3.24", "@0x/contracts-utils": "^4.7.6", "@0x/mesh-rpc-client": "^9.4.2", "@0x/migrations": "^8.0.2", - "@0x/sol-compiler": "^4.6.1", - "@0x/subproviders": "^6.4.1", + "@0x/sol-compiler": "^4.7.2", + "@0x/subproviders": "^6.5.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", diff --git a/packages/contract-artifacts/package.json b/packages/contract-artifacts/package.json index 22f8988284..93b232156c 100644 --- a/packages/contract-artifacts/package.json +++ b/packages/contract-artifacts/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-artifacts", "devDependencies": { - "@0x/utils": "^6.2.0", + "@0x/utils": "^6.4.2", "@types/mocha": "^5.2.7", "chai": "^4.0.1", "lodash": "^4.17.11", diff --git a/packages/contract-wrappers-test/package.json b/packages/contract-wrappers-test/package.json index 01653f3c74..70087d321e 100644 --- a/packages/contract-wrappers-test/package.json +++ b/packages/contract-wrappers-test/package.json @@ -33,15 +33,15 @@ "devDependencies": { "@0x/contract-wrappers": "^13.15.0", "@0x/contracts-test-utils": "^5.3.24", - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/migrations": "^8.0.2", "@0x/order-utils": "^10.4.19", - "@0x/subproviders": "^6.4.1", + "@0x/subproviders": "^6.5.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@types/nock": "^10.0.3", "chai": "^4.0.1", "dirty-chai": "^2.0.1", diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 4d7e3eb3dd..123413a395 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "13.16.0", + "changes": [ + { + "note": "Regenerate wrappers with new abi-gen", + "pr": 212 + } + ] + }, { "version": "13.15.0", "changes": [ diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 55abc40ecd..f648feb4c4 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -48,21 +48,21 @@ "homepage": "https://github.com/0xProject/protocol/tree/main/packages/contract-wrappers", "devDependencies": { "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", + "@0x/tslint-config": "^4.1.4", "gitpkg": "https://github.com/0xProject/gitpkg.git", "tslint": "5.11.0", "typedoc": "~0.16.11", "typescript": "4.2.2" }, "dependencies": { - "@0x/assert": "^3.0.21", - "@0x/base-contract": "^6.2.18", + "@0x/assert": "^3.0.26", + "@0x/base-contract": "^6.3.2", "@0x/contract-addresses": "^6.0.0", - "@0x/json-schemas": "^5.4.1", - "@0x/types": "^3.3.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", - "ethereum-types": "^3.4.0", + "@0x/json-schemas": "^6.1.2", + "@0x/types": "^3.3.3", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", + "ethereum-types": "^3.5.0", "ethers": "~4.0.4" }, "publishConfig": { diff --git a/packages/contract-wrappers/src/generated-wrappers/broker.ts b/packages/contract-wrappers/src/generated-wrappers/broker.ts index 07a6f52d75..1feb186448 100644 --- a/packages/contract-wrappers/src/generated-wrappers/broker.ts +++ b/packages/contract-wrappers/src/generated-wrappers/broker.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -52,11 +53,7 @@ export class BrokerContract extends BaseContract { exchange: string, weth: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -89,11 +86,7 @@ export class BrokerContract extends BaseContract { exchange: string, weth: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -133,11 +126,7 @@ export class BrokerContract extends BaseContract { weth: string, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [exchange, weth] = BaseContract._formatABIDataItemList( @@ -645,6 +634,16 @@ export class BrokerContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -777,6 +776,16 @@ export class BrokerContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -867,6 +876,16 @@ export class BrokerContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -895,6 +914,7 @@ export class BrokerContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = BrokerContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'Broker', @@ -904,6 +924,7 @@ export class BrokerContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); BrokerContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/coordinator.ts b/packages/contract-wrappers/src/generated-wrappers/coordinator.ts index 9c96be3994..e0782c7fe0 100644 --- a/packages/contract-wrappers/src/generated-wrappers/coordinator.ts +++ b/packages/contract-wrappers/src/generated-wrappers/coordinator.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -53,11 +54,7 @@ export class CoordinatorContract extends BaseContract { exchange: string, chainId: BigNumber, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -90,11 +87,7 @@ export class CoordinatorContract extends BaseContract { exchange: string, chainId: BigNumber, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -134,11 +127,7 @@ export class CoordinatorContract extends BaseContract { chainId: BigNumber, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [exchange, chainId] = BaseContract._formatABIDataItemList( @@ -875,6 +864,16 @@ export class CoordinatorContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -967,6 +966,7 @@ export class CoordinatorContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = CoordinatorContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'Coordinator', @@ -976,6 +976,7 @@ export class CoordinatorContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); CoordinatorContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts b/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts index 676b36901d..da464a8026 100644 --- a/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts +++ b/packages/contract-wrappers/src/generated-wrappers/dev_utils.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -54,11 +55,7 @@ export class DevUtilsContract extends BaseContract { chaiBridge_: string, dydxBridge_: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -93,11 +90,7 @@ export class DevUtilsContract extends BaseContract { chaiBridge_: string, dydxBridge_: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -139,11 +132,7 @@ export class DevUtilsContract extends BaseContract { dydxBridge_: string, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [exchange_, chaiBridge_, dydxBridge_] = BaseContract._formatABIDataItemList( @@ -2312,6 +2301,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2367,6 +2366,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2425,6 +2434,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -2483,6 +2502,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2538,6 +2567,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2596,6 +2635,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -2750,6 +2799,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -2842,6 +2901,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -2934,6 +3003,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3015,6 +3094,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3097,6 +3186,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3190,6 +3289,16 @@ export class DevUtilsContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3262,6 +3371,7 @@ export class DevUtilsContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = DevUtilsContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'DevUtils', @@ -3271,6 +3381,7 @@ export class DevUtilsContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); DevUtilsContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts b/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts index ad3663cfc1..8f52c6b180 100644 --- a/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts +++ b/packages/contract-wrappers/src/generated-wrappers/erc20_token.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -72,11 +73,7 @@ export class ERC20TokenContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -99,11 +96,7 @@ export class ERC20TokenContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -133,11 +126,7 @@ export class ERC20TokenContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -486,6 +475,16 @@ export class ERC20TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -590,6 +589,16 @@ export class ERC20TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -646,6 +655,16 @@ export class ERC20TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -740,6 +759,7 @@ export class ERC20TokenContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ERC20TokenContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'ERC20Token', @@ -749,6 +769,7 @@ export class ERC20TokenContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts b/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts index 7c812416ea..7dc60a1ce2 100644 --- a/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts +++ b/packages/contract-wrappers/src/generated-wrappers/erc721_token.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -82,11 +83,7 @@ export class ERC721TokenContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -109,11 +106,7 @@ export class ERC721TokenContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -143,11 +136,7 @@ export class ERC721TokenContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -555,6 +544,16 @@ export class ERC721TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -713,6 +712,16 @@ export class ERC721TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -785,6 +794,16 @@ export class ERC721TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -844,6 +863,16 @@ export class ERC721TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -902,6 +931,16 @@ export class ERC721TokenContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1000,6 +1039,7 @@ export class ERC721TokenContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ERC721TokenContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'ERC721Token', @@ -1009,6 +1049,7 @@ export class ERC721TokenContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/exchange.ts b/packages/contract-wrappers/src/generated-wrappers/exchange.ts index bb5e048f4e..9cb0d87c17 100644 --- a/packages/contract-wrappers/src/generated-wrappers/exchange.ts +++ b/packages/contract-wrappers/src/generated-wrappers/exchange.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -139,11 +140,7 @@ export class ExchangeContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, chainId: BigNumber, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -167,11 +164,7 @@ export class ExchangeContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, chainId: BigNumber, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -202,11 +195,7 @@ export class ExchangeContract extends BaseContract { chainId: BigNumber, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [chainId] = BaseContract._formatABIDataItemList( @@ -3341,6 +3330,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3405,6 +3404,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3490,6 +3499,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3594,6 +3613,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3698,6 +3727,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3832,6 +3871,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3990,6 +4039,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4099,6 +4158,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4152,6 +4221,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4243,6 +4322,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4306,6 +4395,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4388,6 +4487,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4485,6 +4594,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4793,6 +4912,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4892,6 +5021,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4990,6 +5129,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5089,6 +5238,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5217,6 +5376,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5372,6 +5541,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5508,6 +5687,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5622,6 +5811,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5674,6 +5873,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5725,6 +5934,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5779,6 +5998,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5846,6 +6075,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5918,6 +6157,16 @@ export class ExchangeContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6012,6 +6261,7 @@ export class ExchangeContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ExchangeContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'Exchange', @@ -6021,6 +6271,7 @@ export class ExchangeContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/forwarder.ts b/packages/contract-wrappers/src/generated-wrappers/forwarder.ts index 4740c45472..1e436d0209 100644 --- a/packages/contract-wrappers/src/generated-wrappers/forwarder.ts +++ b/packages/contract-wrappers/src/generated-wrappers/forwarder.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -67,11 +68,7 @@ export class ForwarderContract extends BaseContract { _exchangeV2: string, _weth: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -106,11 +103,7 @@ export class ForwarderContract extends BaseContract { _exchangeV2: string, _weth: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -152,11 +145,7 @@ export class ForwarderContract extends BaseContract { _weth: string, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [_exchange, _exchangeV2, _weth] = BaseContract._formatABIDataItemList( @@ -877,6 +866,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -964,6 +963,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -1058,6 +1067,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -1149,6 +1168,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -1223,6 +1252,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1295,6 +1334,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1372,6 +1421,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1426,6 +1485,16 @@ export class ForwarderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1520,6 +1589,7 @@ export class ForwarderContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ForwarderContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'Forwarder', @@ -1529,6 +1599,7 @@ export class ForwarderContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts b/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts index 487085c671..317788ffe6 100644 --- a/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts +++ b/packages/contract-wrappers/src/generated-wrappers/gods_unchained_validator.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -51,11 +52,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, _godsUnchained: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -86,11 +83,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, _godsUnchained: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -128,11 +121,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { _godsUnchained: string, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [_godsUnchained] = BaseContract._formatABIDataItemList( @@ -315,6 +304,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = GodsUnchainedValidatorContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'GodsUnchainedValidator', @@ -324,6 +314,7 @@ export class GodsUnchainedValidatorContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); GodsUnchainedValidatorContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts b/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts index e86e231599..2903d50d69 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_asset_data.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -50,11 +51,7 @@ export class IAssetDataContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -77,11 +74,7 @@ export class IAssetDataContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -111,11 +104,7 @@ export class IAssetDataContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -398,6 +387,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -458,6 +457,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -513,6 +522,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -566,6 +585,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -622,6 +651,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -683,6 +722,16 @@ export class IAssetDataContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -709,6 +758,7 @@ export class IAssetDataContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = IAssetDataContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'IAssetData', @@ -718,6 +768,7 @@ export class IAssetDataContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); IAssetDataContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts index 652c2b6fab..1c9b4ab19b 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_liquidity_provider.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -50,11 +51,7 @@ export class ILiquidityProviderContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -83,11 +80,7 @@ export class ILiquidityProviderContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -123,11 +116,7 @@ export class ILiquidityProviderContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -380,6 +369,16 @@ export class ILiquidityProviderContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -478,6 +477,7 @@ export class ILiquidityProviderContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ILiquidityProviderContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'ILiquidityProvider', @@ -487,6 +487,7 @@ export class ILiquidityProviderContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); ILiquidityProviderContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts b/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts index c2a9f824bf..33e9b18670 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_transform_erc20.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -80,11 +81,7 @@ export class ITransformERC20Contract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -107,11 +104,7 @@ export class ITransformERC20Contract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -141,11 +134,7 @@ export class ITransformERC20Contract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -539,6 +528,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -590,6 +589,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -639,6 +648,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -689,6 +708,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -738,6 +767,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -790,6 +829,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -843,6 +892,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -913,6 +972,16 @@ export class ITransformERC20Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1013,6 +1082,7 @@ export class ITransformERC20Contract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = ITransformERC20Contract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'ITransformERC20', @@ -1022,6 +1092,7 @@ export class ITransformERC20Contract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/i_zero_ex.ts b/packages/contract-wrappers/src/generated-wrappers/i_zero_ex.ts index df8ed6c797..1e6d9f6769 100644 --- a/packages/contract-wrappers/src/generated-wrappers/i_zero_ex.ts +++ b/packages/contract-wrappers/src/generated-wrappers/i_zero_ex.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -193,11 +194,7 @@ export class IZeroExContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -220,11 +217,7 @@ export class IZeroExContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -254,11 +247,7 @@ export class IZeroExContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -3448,6 +3437,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3530,6 +3529,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -3596,6 +3605,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3664,6 +3683,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3726,6 +3755,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3788,6 +3827,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3854,6 +3903,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3922,6 +3981,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3988,6 +4057,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4065,6 +4144,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4148,6 +4237,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4230,6 +4329,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4317,6 +4426,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4398,6 +4517,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4460,6 +4589,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4526,6 +4665,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4594,6 +4743,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4645,6 +4804,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4712,6 +4881,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4765,6 +4944,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4839,6 +5028,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -4917,6 +5116,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -4988,6 +5197,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5060,6 +5279,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5128,6 +5357,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5193,6 +5432,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5272,6 +5521,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5340,6 +5599,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5403,6 +5672,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5454,6 +5733,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5504,6 +5793,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5553,6 +5852,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5616,6 +5925,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5679,6 +5998,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5756,6 +6085,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync( callData: Partial = {}, defaultBlock?: BlockParam, @@ -5814,6 +6153,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5865,6 +6214,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5915,6 +6274,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -5964,6 +6333,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6023,6 +6402,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6088,6 +6477,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6137,6 +6536,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6191,6 +6600,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6244,6 +6663,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6319,6 +6748,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6389,6 +6828,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6451,6 +6900,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6503,6 +6962,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6556,6 +7025,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6607,6 +7086,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6659,6 +7148,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6729,6 +7228,16 @@ export class IZeroExContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -6829,6 +7338,7 @@ export class IZeroExContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = IZeroExContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'IZeroEx', @@ -6838,6 +7348,7 @@ export class IZeroExContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts b/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts index d3072b2e03..b3bb508d19 100644 --- a/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts +++ b/packages/contract-wrappers/src/generated-wrappers/maximum_gas_price.ts @@ -24,9 +24,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -50,11 +51,7 @@ export class MaximumGasPriceContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -77,11 +74,7 @@ export class MaximumGasPriceContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -111,11 +104,7 @@ export class MaximumGasPriceContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -309,6 +298,7 @@ export class MaximumGasPriceContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = MaximumGasPriceContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'MaximumGasPrice', @@ -318,6 +308,7 @@ export class MaximumGasPriceContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); MaximumGasPriceContract.ABI().forEach((item, index) => { diff --git a/packages/contract-wrappers/src/generated-wrappers/staking.ts b/packages/contract-wrappers/src/generated-wrappers/staking.ts index c19a7802ac..2d24e15b12 100644 --- a/packages/contract-wrappers/src/generated-wrappers/staking.ts +++ b/packages/contract-wrappers/src/generated-wrappers/staking.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -183,11 +184,7 @@ export class StakingContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -210,11 +207,7 @@ export class StakingContract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -244,11 +237,7 @@ export class StakingContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -1730,6 +1719,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1781,6 +1780,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2003,6 +2012,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2100,6 +2119,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2152,6 +2181,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2227,6 +2266,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2643,6 +2692,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2694,6 +2753,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2794,6 +2863,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2876,6 +2955,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -2980,6 +3069,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3033,6 +3132,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3084,6 +3193,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3193,6 +3312,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3251,6 +3380,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3322,6 +3461,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3375,6 +3524,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3468,6 +3627,16 @@ export class StakingContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -3562,6 +3731,7 @@ export class StakingContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = StakingContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'Staking', @@ -3571,6 +3741,7 @@ export class StakingContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts b/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts index 9f0fef466a..856cfa0494 100644 --- a/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts +++ b/packages/contract-wrappers/src/generated-wrappers/staking_proxy.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -90,11 +91,7 @@ export class StakingProxyContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, _stakingContract: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -125,11 +122,7 @@ export class StakingProxyContract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, _stakingContract: string, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -167,11 +160,7 @@ export class StakingProxyContract extends BaseContract { _stakingContract: string, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [_stakingContract] = BaseContract._formatABIDataItemList( @@ -857,6 +846,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -959,6 +958,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1053,6 +1062,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1182,6 +1201,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1386,6 +1415,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1439,6 +1478,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1551,6 +1600,16 @@ export class StakingProxyContract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -1686,6 +1745,7 @@ export class StakingProxyContract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = StakingProxyContract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'StakingProxy', @@ -1695,6 +1755,7 @@ export class StakingProxyContract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/generated-wrappers/weth9.ts b/packages/contract-wrappers/src/generated-wrappers/weth9.ts index 506aa75ceb..c90066af12 100644 --- a/packages/contract-wrappers/src/generated-wrappers/weth9.ts +++ b/packages/contract-wrappers/src/generated-wrappers/weth9.ts @@ -26,9 +26,10 @@ import { TransactionReceiptWithDecodedLogs, TxData, TxDataPayable, + TxAccessListWithGas, SupportedProvider, } from 'ethereum-types'; -import { BigNumber, classUtils, hexUtils, logUtils, providerUtils } from '@0x/utils'; +import { AbiEncoder, BigNumber, classUtils, EncodingRules, hexUtils, logUtils, providerUtils } from '@0x/utils'; import { EventCallback, IndexedFilterValues, SimpleContractArtifact } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; import { assert } from '@0x/assert'; @@ -88,11 +89,7 @@ export class WETH9Contract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -115,11 +112,7 @@ export class WETH9Contract extends BaseContract { txDefaults: Partial, logDecodeDependencies: { [contractName: string]: ContractArtifact | SimpleContractArtifact }, ): Promise { - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); if (artifact.compilerOutput === undefined) { throw new Error('Compiler output not found in the artifact file'); } @@ -149,11 +142,7 @@ export class WETH9Contract extends BaseContract { logDecodeDependencies: { [contractName: string]: ContractAbi }, ): Promise { assert.isHexString('bytecode', bytecode); - assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); + assert.doesConformToSchema('txDefaults', txDefaults, schemas.txDataSchema); const provider = providerUtils.standardizeOrThrow(supportedProvider); const constructorAbi = BaseContract._lookupConstructorAbi(abi); [] = BaseContract._formatABIDataItemList(constructorAbi.inputs, [], BaseContract._bigNumberToString); @@ -604,6 +593,16 @@ export class WETH9Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -691,6 +690,16 @@ export class WETH9Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -799,6 +808,16 @@ export class WETH9Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -848,6 +867,16 @@ export class WETH9Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -895,6 +924,16 @@ export class WETH9Contract extends BaseContract { }); return self._web3Wrapper.estimateGasAsync(txDataWithDefaults); }, + async createAccessListAsync( + txData?: Partial | undefined, + defaultBlock?: BlockParam, + ): Promise { + const txDataWithDefaults = await self._applyDefaultsToTxDataAsync({ + data: this.getABIEncodedTransactionData(), + ...txData, + }); + return self._web3Wrapper.createAccessListAsync(txDataWithDefaults, defaultBlock); + }, async callAsync(callData: Partial = {}, defaultBlock?: BlockParam): Promise { BaseContract._assertCallParams(callData, defaultBlock); const rawCallResult = await self._performCallAsync( @@ -989,6 +1028,7 @@ export class WETH9Contract extends BaseContract { txDefaults?: Partial, logDecodeDependencies?: { [contractName: string]: ContractAbi }, deployedBytecode: string | undefined = WETH9Contract.deployedBytecode, + encodingRules?: EncodingRules, ) { super( 'WETH9', @@ -998,6 +1038,7 @@ export class WETH9Contract extends BaseContract { txDefaults, logDecodeDependencies, deployedBytecode, + encodingRules, ); classUtils.bindAll(this, ['_abiEncoderByFunctionSignature', 'address', '_web3Wrapper']); this._subscriptionManager = new SubscriptionManager( diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts index b48c5ab510..a492b5aacc 100644 --- a/packages/contract-wrappers/src/index.ts +++ b/packages/contract-wrappers/src/index.ts @@ -16,7 +16,7 @@ export { SimpleEvmOutput, SimpleStandardContractOutput, } from '@0x/types'; -export { AbiDecoder, DecodedCalldata } from '@0x/utils'; +export { AbiDecoder, AbiEncoder, DecodedCalldata, EncodingRules } from '@0x/utils'; export { AbiDefinition, BlockParam, diff --git a/packages/migrations/package.json b/packages/migrations/package.json index c50e974643..9db17354b4 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -48,10 +48,10 @@ "registry": "git@github.com:0xProject/gitpkg-registry.git" }, "devDependencies": { - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", "@types/yargs": "^11.0.0", "chai": "^4.0.1", "dirty-chai": "^2.0.1", @@ -67,7 +67,7 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0x/base-contract": "^6.2.18", + "@0x/base-contract": "^6.3.2", "@0x/contract-addresses": "^6.0.0", "@0x/contracts-asset-proxy": "^3.7.9", "@0x/contracts-coordinator": "^3.1.28", @@ -82,14 +82,14 @@ "@0x/contracts-staking": "^2.0.35", "@0x/contracts-utils": "^4.7.6", "@0x/contracts-zero-ex": "^0.22.0", - "@0x/sol-compiler": "^4.6.1", - "@0x/subproviders": "^6.4.1", - "@0x/typescript-typings": "^5.1.6", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/sol-compiler": "^4.7.2", + "@0x/subproviders": "^6.5.2", + "@0x/typescript-typings": "^5.2.0", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "@ledgerhq/hw-app-eth": "^4.3.0", "@types/web3-provider-engine": "^14.0.0", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "ethers": "~4.0.4", "lodash": "^4.17.11" }, diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 66f6d11a4d..4d2ae1b186 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -43,19 +43,19 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/order-utils", "devDependencies": { - "@0x/dev-utils": "^4.2.1", - "@0x/subproviders": "^6.4.1", + "@0x/dev-utils": "^4.2.6", + "@0x/subproviders": "^6.5.2", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", "@types/web3-provider-engine": "^14.0.0", "chai": "^4.0.1", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "gitpkg": "https://github.com/0xProject/gitpkg.git", "make-promises-safe": "^1.1.0", "mocha": "^6.2.0", @@ -68,13 +68,13 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/assert": "^3.0.21", + "@0x/assert": "^3.0.26", "@0x/contract-addresses": "^6.0.0", "@0x/contract-wrappers": "^13.15.0", - "@0x/json-schemas": "^5.4.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", - "ethereumjs-util": "^5.1.1", + "@0x/json-schemas": "^6.1.2", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", + "ethereumjs-util": "^7.0.10", "ethers": "~4.0.4", "lodash": "^4.17.11" }, diff --git a/packages/order-utils/src/assert.ts b/packages/order-utils/src/assert.ts index 2f73f58c43..e00f7be0c8 100644 --- a/packages/order-utils/src/assert.ts +++ b/packages/order-utils/src/assert.ts @@ -1,9 +1,5 @@ import { assert as sharedAssert } from '@0x/assert'; -// HACK: We need those two unused imports because they're actually used by sharedAssert which gets injected here -// tslint:disable:no-unused-variable -import { Schema } from '@0x/json-schemas'; -import { ECSignature, SignatureType } from '@0x/types'; -import { BigNumber } from '@0x/utils'; +import { SignatureType } from '@0x/types'; import { Web3Wrapper } from '@0x/web3-wrapper'; // tslint:enable:no-unused-variable import * as _ from 'lodash'; diff --git a/packages/protocol-utils/package.json b/packages/protocol-utils/package.json index 7af3e66879..59a6984bb5 100644 --- a/packages/protocol-utils/package.json +++ b/packages/protocol-utils/package.json @@ -41,17 +41,17 @@ }, "homepage": "https://github.com/0xProject/protocol/tree/main/packages/protocol-utils", "devDependencies": { - "@0x/dev-utils": "^4.2.1", + "@0x/dev-utils": "^4.2.6", "@0x/ts-doc-gen": "^0.0.28", - "@0x/tslint-config": "^4.1.3", - "@0x/types": "^3.3.1", - "@0x/typescript-typings": "^5.1.6", + "@0x/tslint-config": "^4.1.4", + "@0x/types": "^3.3.3", + "@0x/typescript-typings": "^5.2.0", "@types/bn.js": "^4.11.0", "@types/lodash": "4.14.104", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", "@types/web3-provider-engine": "^14.0.0", - "ethereum-types": "^3.4.0", + "ethereum-types": "^3.5.0", "mocha": "^6.2.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -62,15 +62,15 @@ "web3-provider-engine": "14.0.6" }, "dependencies": { - "@0x/assert": "^3.0.21", + "@0x/assert": "^3.0.26", "@0x/contract-addresses": "^6.0.0", "@0x/contract-wrappers": "^13.15.0", - "@0x/json-schemas": "^5.4.1", - "@0x/subproviders": "^6.4.1", - "@0x/utils": "^6.2.0", - "@0x/web3-wrapper": "^7.4.1", + "@0x/json-schemas": "^6.1.2", + "@0x/subproviders": "^6.5.2", + "@0x/utils": "^6.4.2", + "@0x/web3-wrapper": "^7.5.2", "chai": "^4.0.1", - "ethereumjs-util": "^5.1.1", + "ethereumjs-util": "^7.0.10", "ethers": "~4.0.4", "lodash": "^4.17.11" }, diff --git a/packages/protocol-utils/src/signature_utils.ts b/packages/protocol-utils/src/signature_utils.ts index fc15da4ca1..ab961010b9 100644 --- a/packages/protocol-utils/src/signature_utils.ts +++ b/packages/protocol-utils/src/signature_utils.ts @@ -61,7 +61,7 @@ export async function ethSignHashWithProviderAsync( */ export function ethSignHashWithKey(hash: string, key: string): Signature { const ethHash = hexUtils.toHex( - ethjs.sha3(hexUtils.concat(ethjs.toBuffer('\x19Ethereum Signed Message:\n32'), hash)), + ethjs.keccak256(ethjs.toBuffer(hexUtils.concat(Buffer.from('\x19Ethereum Signed Message:\n32'), hash))), ); return { ...ecSignHashWithKey(ethHash, key), diff --git a/yarn.lock b/yarn.lock index 50f31b94c3..c591112cd3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -643,19 +643,20 @@ npmlog "^4.1.2" write-file-atomic "^2.3.0" -"@0x/abi-gen@^5.4.21": - version "5.4.21" - resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.4.21.tgz#96705962c75e116bd5050784287012ede4607564" +"@0x/abi-gen@^5.5.2": + version "5.5.2" + resolved "https://registry.yarnpkg.com/@0x/abi-gen/-/abi-gen-5.5.2.tgz#541d07a9ff93017eaa4ee25b918145ca93619135" + integrity sha512-KSKiQTvdnlvRxDhplUQGfmfymnupMalKU7hJoacnDlr91x82PTN9hZi1RyXTb+mBNv6vxqPO4G6abfSE1sr55A== dependencies: - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" "@types/node" "12.12.54" "@types/toposort" "^2.0.1" chalk "^2.3.0" change-case "^3.0.2" cli-format "^3.0.9" - ethereum-types "^3.4.0" + ethereum-types "^3.5.0" glob "^7.1.2" handlebars "^4.1.2" lodash "^4.17.11" @@ -676,7 +677,19 @@ lodash "^4.17.11" valid-url "^1.0.9" -"@0x/assert@^3.0.21", "@0x/assert@^3.0.6": +"@0x/assert@^3.0.21", "@0x/assert@^3.0.26": + version "3.0.26" + resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.26.tgz#c9c3209e093c5fcbb5ff8d3b8f767d35c87195fc" + integrity sha512-CR7Y7yaj5C05Z1UCPesYp6yjf7/e9FEZUqzXi2eX6iUCsG2SMV5w7wG99jOW9wgtbgVGP3rpG6NT6TUfL5zRVg== + dependencies: + "@0x/json-schemas" "^6.1.2" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" + "@types/node" "12.12.54" + lodash "^4.17.11" + valid-url "^1.0.9" + +"@0x/assert@^3.0.6": version "3.0.21" resolved "https://registry.yarnpkg.com/@0x/assert/-/assert-3.0.21.tgz#b385868d1833625912fd9173a2477be5a4090aed" dependencies: @@ -687,18 +700,54 @@ lodash "^4.17.11" valid-url "^1.0.9" -"@0x/base-contract@^6.2.18": - version "6.2.18" - resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.2.18.tgz#d092de93d52d8cf8e5d4600d9ca852421322ab38" +"@0x/asset-swapper@^6.7.0": + version "6.7.0" + resolved "https://registry.yarnpkg.com/@0x/asset-swapper/-/asset-swapper-6.7.0.tgz#c57747cd8fc2de853ddd75592b98ca0c4ba5bd2d" + integrity sha512-CJeQohcb493MgO39BpnXWMYnhnvA2r8Q711Nso6VHQDi/wKSAnn5UqJXyq7CxGzS2qyyagUBX3xeuNfM+EkxbQ== dependencies: "@0x/assert" "^3.0.21" + "@0x/base-contract" "^6.2.18" + "@0x/contract-addresses" "^6.0.0" + "@0x/contract-wrappers" "^13.15.0" + "@0x/contracts-erc20" "^3.3.6" + "@0x/contracts-zero-ex" "^0.22.0" + "@0x/dev-utils" "^4.2.1" "@0x/json-schemas" "^5.4.1" + "@0x/protocol-utils" "^1.5.0" + "@0x/quote-server" "^5.0.0" + "@0x/types" "^3.3.1" + "@0x/typescript-typings" "^5.1.6" "@0x/utils" "^6.2.0" "@0x/web3-wrapper" "^7.4.1" + "@balancer-labs/sor" "0.3.2" + "@bancor/sdk" "0.2.9" + "@ethersproject/abi" "^5.0.1" + "@ethersproject/address" "^5.0.1" + "@ethersproject/contracts" "^5.0.1" + "@ethersproject/providers" "^5.0.4" + "@ethersproject/strings" "^5.0.10" + axios "^0.21.1" + axios-mock-adapter "^1.19.0" + cream-sor "^0.3.3" + decimal.js "^10.2.0" + ethereum-types "^3.4.0" + ethereumjs-util "^5.1.1" + heartbeats "^5.0.1" + lodash "^4.17.11" + +"@0x/base-contract@^6.2.18", "@0x/base-contract@^6.3.2": + version "6.3.2" + resolved "https://registry.yarnpkg.com/@0x/base-contract/-/base-contract-6.3.2.tgz#6d0bd9fe9720ac326c899d55635c594abe5381d4" + integrity sha512-OzveJvKfY8qvUAWboPMAnpOcSW2r4rEEJeAZx0zuTuSyLUHAOAQWgpgrwat9Pu4lYAgNryQalOBds7ERxuPt+Q== + dependencies: + "@0x/assert" "^3.0.26" + "@0x/json-schemas" "^6.1.2" + "@0x/utils" "^6.4.2" + "@0x/web3-wrapper" "^7.5.2" "@types/node" "12.12.54" ethereumjs-account "^3.0.0" ethereumjs-blockstream "^7.0.0" - ethereumjs-util "^5.1.1" + ethereumjs-util "^7.0.10" ethereumjs-vm "^4.2.0" ethers "~4.0.4" js-sha3 "^0.7.0" @@ -708,22 +757,38 @@ version "4.12.0" resolved "https://registry.yarnpkg.com/@0x/contract-addresses/-/contract-addresses-4.12.0.tgz#2adb0bcde763ad13437f782adf25c403107ff428" -"@0x/contracts-gen@^2.0.32": - version "2.0.32" - resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.32.tgz#e4817730685acc0047157e55d58a6cab87596799" +"@0x/contracts-gen@^2.0.37": + version "2.0.37" + resolved "https://registry.yarnpkg.com/@0x/contracts-gen/-/contracts-gen-2.0.37.tgz#5b15a8921355c4a2fc74609661246e1d707283d0" + integrity sha512-CWqJwGuPjSWx2H2hXfc5KreMcz7bz+s9NrK8riBBtF9kZbYsYEunuDQ2Du5Q5StzCiO4rQT42hdA3U3+nReKug== dependencies: - "@0x/sol-compiler" "^4.6.1" - "@0x/sol-resolver" "^3.1.6" - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" + "@0x/sol-compiler" "^4.7.2" + "@0x/sol-resolver" "^3.1.8" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" "@types/node" "12.12.54" - ethereum-types "^3.4.0" + ethereum-types "^3.5.0" lodash "^4.17.11" mkdirp "^0.5.1" prettier "^1.16.3" to-snake-case "^1.0.0" +"@0x/contracts-zero-ex@^0.22.0": + version "0.22.0" + resolved "https://registry.yarnpkg.com/@0x/contracts-zero-ex/-/contracts-zero-ex-0.22.0.tgz#680c0837ffc7a36dd7358f9d2713d34431269b53" + integrity sha512-F0DtG9SFY3g9c2uX7Airekg20dNiT5fHc7y/4XZ2blG5OS+IDlcEmM+ZQPjyXiJPzfqJKzEeKsNQw+LwcJobxQ== + dependencies: + "@0x/base-contract" "^6.2.18" + "@0x/protocol-utils" "^1.5.0" + "@0x/subproviders" "^6.4.1" + "@0x/types" "^3.3.1" + "@0x/typescript-typings" "^5.1.6" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" + ethereum-types "^3.4.0" + ethereumjs-util "^5.1.1" + "@0x/coordinator-server@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@0x/coordinator-server/-/coordinator-server-1.0.5.tgz#3fda0d5f2af45f0baa7663ad0a5e8465b4161081" @@ -751,22 +816,23 @@ typeorm "0.2.7" websocket "^1.0.25" -"@0x/dev-utils@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-4.2.1.tgz#f7364d218ae4ef9b2502963aba3cc34d83cf8673" +"@0x/dev-utils@^4.2.1", "@0x/dev-utils@^4.2.6": + version "4.2.6" + resolved "https://registry.yarnpkg.com/@0x/dev-utils/-/dev-utils-4.2.6.tgz#7e918d045c4aeb10aa9ce922c8315a1953b40888" + integrity sha512-JvqWNoGVye9y37eMo+0izaPVzbwBov90w0DNJ/Ek58Mi67XGWqRdHnIG3EEeQzwHrsaSmdBuye9UPXLDBMaSpQ== dependencies: - "@0x/subproviders" "^6.4.1" - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" - "@0x/web3-wrapper" "^7.4.1" + "@0x/subproviders" "^6.5.2" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" + "@0x/web3-wrapper" "^7.5.2" "@types/node" "12.12.54" "@types/web3-provider-engine" "^14.0.0" chai "^4.0.1" chai-as-promised "^7.1.0" chai-bignumber "^3.0.0" dirty-chai "^2.0.1" - ethereum-types "^3.4.0" + ethereum-types "^3.5.0" lodash "^4.17.11" web3-provider-engine "14.0.6" @@ -788,6 +854,16 @@ jsonschema "^1.2.0" lodash.values "^4.3.0" +"@0x/json-schemas@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.1.2.tgz#e25c8ba453128a529bb95973a631714ec9127356" + integrity sha512-sjoVBVhpsPKR/hKoXw/P/YwB7pIm3KpDd7piBiPbTrRlNeE6NKClR+/nGMkpGYiY8rMm3pklxx4wvsLOB4g7og== + dependencies: + "@0x/typescript-typings" "^5.2.0" + "@types/node" "12.12.54" + ajv "^6.12.5" + lodash.values "^4.3.0" + "@0x/mesh-rpc-client@^9.4.2": version "9.4.2" resolved "https://registry.yarnpkg.com/@0x/mesh-rpc-client/-/mesh-rpc-client-9.4.2.tgz#6f9690fb1cb37fb0c2fd3907241af0e543c78451" @@ -800,12 +876,46 @@ web3-providers "^2.0.0-alpha.1" websocket "^1.0.29" -"@0x/monorepo-scripts@^3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.1.1.tgz#2ded9ef1d4885bbf106612794a331e29f391733a" +"@0x/migrations@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@0x/migrations/-/migrations-8.0.2.tgz#f37a53e086b1db5e75eb6e455d9e57d4d3fc9fbb" + integrity sha512-UPK3GQ3z/hmeVXiaglj00d3bYeXRqtq2i6lFP4J2JAIxtEBuPFbTpUX/4stiPkGHZXAtM3v6Q6lz/qiNNN8hFQ== dependencies: - "@0x/types" "^3.3.1" + "@0x/base-contract" "^6.2.18" + "@0x/contract-addresses" "^6.0.0" + "@0x/contracts-asset-proxy" "^3.7.9" + "@0x/contracts-coordinator" "^3.1.28" + "@0x/contracts-dev-utils" "^1.3.26" + "@0x/contracts-erc1155" "^2.1.27" + "@0x/contracts-erc20" "^3.3.6" + "@0x/contracts-erc721" "^3.1.27" + "@0x/contracts-exchange" "^3.2.28" + "@0x/contracts-exchange-forwarder" "^4.2.28" + "@0x/contracts-extensions" "^6.2.22" + "@0x/contracts-multisig" "^4.1.28" + "@0x/contracts-staking" "^2.0.35" + "@0x/contracts-utils" "^4.7.6" + "@0x/contracts-zero-ex" "^0.22.0" + "@0x/sol-compiler" "^4.6.1" + "@0x/subproviders" "^6.4.1" + "@0x/typescript-typings" "^5.1.6" "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" + "@ledgerhq/hw-app-eth" "^4.3.0" + "@types/web3-provider-engine" "^14.0.0" + ethereum-types "^3.4.0" + ethers "~4.0.4" + lodash "^4.17.11" + optionalDependencies: + "@ledgerhq/hw-transport-node-hid" "^4.3.0" + +"@0x/monorepo-scripts@^3.1.6": + version "3.1.6" + resolved "https://registry.yarnpkg.com/@0x/monorepo-scripts/-/monorepo-scripts-3.1.6.tgz#a33a8e1706f5d6ce7277a15b48ade48b3ec2cf9a" + integrity sha512-QDGTx5mbdGBMyw+b4/sL9OmXea+UJlkhbeKuKtEdvwAu43guAyrB63jP0yFIhMoiD8exD67yaGol1qA75qBVpA== + dependencies: + "@0x/types" "^3.3.3" + "@0x/utils" "^6.4.2" "@lerna/batch-packages" "^3.0.0-beta.18" "@types/depcheck" "^0.6.0" "@types/node" "12.12.54" @@ -827,6 +937,23 @@ typedoc "~0.16.11" yargs "^10.0.3" +"@0x/protocol-utils@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@0x/protocol-utils/-/protocol-utils-1.5.0.tgz#2e479a5ecde2801a756d81dc017eece51116decf" + integrity sha512-/5pIK9ssJXx2VyZPW2zKVkNNEAZLgGHDFmuX9MzjAG7DXi4cknbYkepguFgebhKtsksvWokSEk9V8I/a608Vtg== + dependencies: + "@0x/assert" "^3.0.21" + "@0x/contract-addresses" "^6.0.0" + "@0x/contract-wrappers" "^13.15.0" + "@0x/json-schemas" "^5.4.1" + "@0x/subproviders" "^6.4.1" + "@0x/utils" "^6.2.0" + "@0x/web3-wrapper" "^7.4.1" + chai "^4.0.1" + ethereumjs-util "^5.1.1" + ethers "~4.0.4" + lodash "^4.17.11" + "@0x/quote-server@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@0x/quote-server/-/quote-server-5.0.0.tgz#15554099bdfdf71e2910430860257d622f24f703" @@ -841,23 +968,24 @@ express-async-handler "^1.1.4" http-status-codes "^1.4.0" -"@0x/sol-compiler@^4.6.1": - version "4.6.1" - resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.6.1.tgz#d1f9c1547605ddbd4ad9cc6ebed60b91f5e1ce3d" +"@0x/sol-compiler@^4.6.1", "@0x/sol-compiler@^4.7.2": + version "4.7.2" + resolved "https://registry.yarnpkg.com/@0x/sol-compiler/-/sol-compiler-4.7.2.tgz#322e3061382f3c333a0f96999abd488c02800b87" + integrity sha512-FcLdz5lfGNRw2whvoUCFouRYX5FxYJ2TDDiHOTinJNYa5cjorg7/RVWynhyg06eOTTjDPRgQ5cXRdg/hxDkjpQ== dependencies: - "@0x/assert" "^3.0.21" - "@0x/json-schemas" "^5.4.1" - "@0x/sol-resolver" "^3.1.6" - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" - "@0x/web3-wrapper" "^7.4.1" + "@0x/assert" "^3.0.26" + "@0x/json-schemas" "^6.1.2" + "@0x/sol-resolver" "^3.1.8" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" + "@0x/web3-wrapper" "^7.5.2" "@types/node" "12.12.54" "@types/yargs" "^11.0.0" chalk "^2.3.0" chokidar "^3.0.2" - ethereum-types "^3.4.0" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" lodash "^4.17.11" mkdirp "^0.5.1" pluralize "^7.0.0" @@ -869,74 +997,79 @@ web3-eth-abi "^1.0.0-beta.24" yargs "^10.0.3" -"@0x/sol-coverage@^4.0.31": - version "4.0.31" - resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.31.tgz#ec958d892dce3773059b925e442e21d7c4f9b104" +"@0x/sol-coverage@^4.0.36": + version "4.0.36" + resolved "https://registry.yarnpkg.com/@0x/sol-coverage/-/sol-coverage-4.0.36.tgz#11214f73d1f58b71df10501fce5dbe8f22f1861a" + integrity sha512-RV17AStk30bB9v74DC45cyv/ky92pCzfwoxGGEpZ1aF36GvtL5lMBp/UkAUTSG8TlV4ZSUs6iXWhmj50eAnxOw== dependencies: - "@0x/sol-tracing-utils" "^7.1.21" - "@0x/subproviders" "^6.4.1" - "@0x/typescript-typings" "^5.1.6" + "@0x/sol-tracing-utils" "^7.2.2" + "@0x/subproviders" "^6.5.2" + "@0x/typescript-typings" "^5.2.0" "@types/minimatch" "^3.0.3" "@types/node" "12.12.54" - ethereum-types "^3.4.0" + ethereum-types "^3.5.0" lodash "^4.17.11" minimatch "^3.0.4" web3-provider-engine "14.0.6" -"@0x/sol-profiler@^4.1.21": - version "4.1.21" - resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.21.tgz#76f4860b3e0c73b8e11ac56ce25e52164cee1476" +"@0x/sol-profiler@^4.1.26": + version "4.1.26" + resolved "https://registry.yarnpkg.com/@0x/sol-profiler/-/sol-profiler-4.1.26.tgz#dc5a590f902ae5652295ef06895ad21743295144" + integrity sha512-F+tm9xtXZ4RWEgzpC3Xf15QaKNxYML5kiiLM0pY4Qf1bZOZ+aXFZm8O9wnhWKa9G5ZphHs8T/RKAwZnFQ2QGVA== dependencies: - "@0x/sol-tracing-utils" "^7.1.21" - "@0x/subproviders" "^6.4.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" + "@0x/sol-tracing-utils" "^7.2.2" + "@0x/subproviders" "^6.5.2" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" "@types/node" "12.12.54" - ethereum-types "^3.4.0" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" lodash "^4.17.11" web3-provider-engine "14.0.6" -"@0x/sol-resolver@^3.1.6": - version "3.1.6" - resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-3.1.6.tgz#ffa68dc6716b7608539e6323a7d7cf91bd869e85" +"@0x/sol-resolver@^3.1.8": + version "3.1.8" + resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-3.1.8.tgz#eaaaf17052e88213e55daf2c6e39a585cc16fa0a" + integrity sha512-17PdOpBSLDtlBAUaIdZHWOBXFgcCrr+I0bRxlPg9mfefsJK6+0QdFLWZS35WLLnp8NJw6AeMRb13lBsY0EUuJQ== dependencies: - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" "@types/node" "12.12.54" lodash "^4.17.11" -"@0x/sol-trace@^3.0.31": - version "3.0.31" - resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.31.tgz#9ed79139c81ad8953a9947019053ead5a20f9408" +"@0x/sol-trace@^3.0.36": + version "3.0.36" + resolved "https://registry.yarnpkg.com/@0x/sol-trace/-/sol-trace-3.0.36.tgz#f1bd31b4c13b17abfec8e674896c64b8cdb67cfd" + integrity sha512-JyzaPAij4+N3qo1Iv7i2rwSBr0UTTAmbz0tNC9zBK8iY9emkFGWNBKRdgiqdBScTWCe8eZ0MNbG+O1auXwKw8g== dependencies: - "@0x/sol-tracing-utils" "^7.1.21" - "@0x/subproviders" "^6.4.1" - "@0x/typescript-typings" "^5.1.6" + "@0x/sol-tracing-utils" "^7.2.2" + "@0x/subproviders" "^6.5.2" + "@0x/typescript-typings" "^5.2.0" "@types/node" "12.12.54" chalk "^2.3.0" - ethereum-types "^3.4.0" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" lodash "^4.17.11" loglevel "^1.6.1" web3-provider-engine "14.0.6" -"@0x/sol-tracing-utils@^7.1.21": - version "7.1.21" - resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.1.21.tgz#9ffb9f51fdc6bcf0be8f95841563a6ccccbac474" +"@0x/sol-tracing-utils@^7.2.2": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@0x/sol-tracing-utils/-/sol-tracing-utils-7.2.2.tgz#330246387c8d6ad78828752d2a23e9680d8fe7b6" + integrity sha512-TM/0utPA1xJ5IJsuimHEU83lz63wQqasXuwU6l5J5Dn0F11yITohJaIMGfisZKsp9y5Y728F6t+moY7VebeiKw== dependencies: - "@0x/dev-utils" "^4.2.1" - "@0x/sol-compiler" "^4.6.1" - "@0x/sol-resolver" "^3.1.6" - "@0x/subproviders" "^6.4.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" - "@0x/web3-wrapper" "^7.4.1" + "@0x/dev-utils" "^4.2.6" + "@0x/sol-compiler" "^4.7.2" + "@0x/sol-resolver" "^3.1.8" + "@0x/subproviders" "^6.5.2" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" + "@0x/web3-wrapper" "^7.5.2" "@types/node" "12.12.54" "@types/solidity-parser-antlr" "^0.2.3" chalk "^2.3.0" - ethereum-types "^3.4.0" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" ethers "~4.0.4" glob "^7.1.2" istanbul "^0.4.5" @@ -976,15 +1109,18 @@ optionalDependencies: "@ledgerhq/hw-transport-node-hid" "^4.3.0" -"@0x/subproviders@^6.4.1": - version "6.4.1" - resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-6.4.1.tgz#aaec18651f6ae6a1c545481efa6aaebb97525998" +"@0x/subproviders@^6.4.1", "@0x/subproviders@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@0x/subproviders/-/subproviders-6.5.2.tgz#4734759b042808cba09fa6591ab645ec67262a7a" + integrity sha512-6/CXRnIr8Apmy2RqVIncKvLrDHp8RQWOL6zzwwb2FJznvTOBNNs3aHi0qVly65xIMwwlfOhA4D+oJ6h6XuEffQ== dependencies: - "@0x/assert" "^3.0.21" - "@0x/types" "^3.3.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" - "@0x/web3-wrapper" "^7.4.1" + "@0x/assert" "^3.0.26" + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" + "@0x/web3-wrapper" "^7.5.2" + "@ethereumjs/common" "^2.2.0" + "@ethereumjs/tx" "^3.1.3" "@ledgerhq/hw-app-eth" "^4.3.0" "@ledgerhq/hw-transport-u2f" "4.24.0" "@types/hdkey" "^0.7.0" @@ -992,9 +1128,8 @@ "@types/web3-provider-engine" "^14.0.0" bip39 "^2.5.0" bn.js "^4.11.8" - ethereum-types "^3.4.0" - ethereumjs-tx "^1.3.5" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" ganache-core "^2.13.2" hdkey "^0.7.1" json-rpc-error "2.0.0" @@ -1017,9 +1152,10 @@ typedoc-plugin-markdown "~2.2.17" yargs "^10.0.3" -"@0x/tslint-config@^4.1.3": - version "4.1.3" - resolved "https://registry.yarnpkg.com/@0x/tslint-config/-/tslint-config-4.1.3.tgz#3ad1b6f0b429c6dfa438fb12249453691039e48c" +"@0x/tslint-config@^4.1.4": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@0x/tslint-config/-/tslint-config-4.1.4.tgz#559cf717bf1b67d78d3eb42a0039c895e3d7daa5" + integrity sha512-4fk+CNTzWjdQ4cBivAEGbBDpPvkM771W04vQjN8qO3NMUsI0SavpbRqQQemZD+Ek+dvgxV9TEt0iEwE0PZN72w== dependencies: "@types/node" "12.12.54" lodash "^4.17.11" @@ -1044,6 +1180,15 @@ bignumber.js "~9.0.0" ethereum-types "^3.4.0" +"@0x/types@^3.3.3": + version "3.3.3" + resolved "https://registry.yarnpkg.com/@0x/types/-/types-3.3.3.tgz#5df4ec381bba9f62441474b0e54309ddb2fccd17" + integrity sha512-pImq1ukZl+YN64ZKQqNPTOK8noNw4rHMksEEPzFGM26x7Utovf8Py+VFqbZrn1TMw/9WWGeZg8lPxs+LUYxayw== + dependencies: + "@types/node" "12.12.54" + bignumber.js "~9.0.0" + ethereum-types "^3.5.0" + "@0x/typescript-typings@^5.0.0", "@0x/typescript-typings@^5.0.1", "@0x/typescript-typings@^5.1.5": version "5.1.5" resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-5.1.5.tgz#dd0ad20ef42dad9d054886fd1da72839145b5863" @@ -1066,6 +1211,18 @@ ethereum-types "^3.4.0" popper.js "1.14.3" +"@0x/typescript-typings@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-5.2.0.tgz#3eba353a27a83697f6f4f6d65ce14506687f52b7" + integrity sha512-8Gk0riQ37HTv3bNe/iWsb9mcJuRCMk/16PZTzA3IUauNQajcJgTD601pHbmBF57SJDpFhJIRg2Crcf6hePlzBA== + dependencies: + "@types/bn.js" "^4.11.0" + "@types/node" "12.12.54" + "@types/react" "*" + bignumber.js "~9.0.0" + ethereum-types "^3.5.0" + popper.js "1.14.3" + "@0x/utils@^5.1.0", "@0x/utils@^5.1.1", "@0x/utils@^5.4.0", "@0x/utils@^5.4.1": version "5.6.4" resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-5.6.4.tgz#0158ec3243bbee444d90afbd79981321d19ccdfd" @@ -1120,6 +1277,26 @@ js-sha3 "^0.7.0" lodash "^4.17.11" +"@0x/utils@^6.4.2": + version "6.4.2" + resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-6.4.2.tgz#b5d86854383bfe4a3fccdcb8e70aad2efde58250" + integrity sha512-dcWhhySAa8rZ7AGlu4ETacEPkXEsj6Rg8qMWJX69SNwjb3ZHsuEIVzt8KsFKLTGgx9sgzqyF+qqlKD2oFFiqiw== + dependencies: + "@0x/types" "^3.3.3" + "@0x/typescript-typings" "^5.2.0" + "@types/mocha" "^5.2.7" + "@types/node" "12.12.54" + abortcontroller-polyfill "^1.1.9" + bignumber.js "~9.0.0" + chalk "^2.3.0" + detect-node "2.0.3" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" + ethers "~4.0.4" + isomorphic-fetch "2.2.1" + js-sha3 "^0.7.0" + lodash "^4.17.11" + "@0x/web3-wrapper@^7.2.8": version "7.2.8" resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.2.8.tgz#7df4c52e358594338f8dbe76b1490a5c4c423633" @@ -1134,17 +1311,18 @@ ethers "~4.0.4" lodash "^4.17.11" -"@0x/web3-wrapper@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.4.1.tgz#196ed73eef6989ff953d5b2d610352b47748f73e" +"@0x/web3-wrapper@^7.4.1", "@0x/web3-wrapper@^7.5.2": + version "7.5.2" + resolved "https://registry.yarnpkg.com/@0x/web3-wrapper/-/web3-wrapper-7.5.2.tgz#135a1bc6a5cc4e3841bb11d8e82c3ee9db82dd10" + integrity sha512-kfYNYniQV2FRMRKfVgin1+ZBiWPeCxypfvrK2wE6TZif49IG35Ag+fX0IR9PM1fg1QbjvqmA5SzDhJ9SieymGQ== dependencies: - "@0x/assert" "^3.0.21" - "@0x/json-schemas" "^5.4.1" - "@0x/typescript-typings" "^5.1.6" - "@0x/utils" "^6.2.0" + "@0x/assert" "^3.0.26" + "@0x/json-schemas" "^6.1.2" + "@0x/typescript-typings" "^5.2.0" + "@0x/utils" "^6.4.2" "@types/node" "12.12.54" - ethereum-types "^3.4.0" - ethereumjs-util "^5.1.1" + ethereum-types "^3.5.0" + ethereumjs-util "^7.0.10" ethers "~4.0.4" lodash "^4.17.11" @@ -1221,6 +1399,22 @@ web3 "1.2.1" web3-typescript-typings "^0.10.2" +"@ethereumjs/common@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.2.0.tgz#850a3e3e594ee707ad8d44a11e8152fb62450535" + integrity sha512-PyQiTG00MJtBRkJmv46ChZL8u2XWxNBeAthznAUIUiefxPAXjbkuiCZOuncgJS34/XkMbNc9zMt/PlgKRBElig== + dependencies: + crc-32 "^1.2.0" + ethereumjs-util "^7.0.9" + +"@ethereumjs/tx@^3.1.3": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.1.4.tgz#04cf9e9406da5f04a1a26c458744641f4b4b8dd0" + integrity sha512-6cJpmmjCpG5ZVN9NJYtWvmrEQcevw9DIR8hj2ca2PszD2fxbIFXky3Z37gpf8S6u0Npv09kG8It+G4xjydZVLg== + dependencies: + "@ethereumjs/common" "^2.2.0" + ethereumjs-util "^7.0.10" + "@ethersproject/abi@5.0.0-beta.153": version "5.0.0-beta.153" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.0.0-beta.153.tgz#43a37172b33794e4562999f6e2d555b7599a8eee" @@ -2421,6 +2615,13 @@ dependencies: "@types/node" "*" +"@types/bn.js@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.0.tgz#32c5d271503a12653c62cf4d2b45e6eab8cebc68" + integrity sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA== + dependencies: + "@types/node" "*" + "@types/body-parser@*": version "1.19.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" @@ -2702,7 +2903,7 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" -ajv@^6.10.2, ajv@^6.12.3, ajv@^6.9.1: +ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.5, ajv@^6.9.1: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" dependencies: @@ -4628,6 +4829,14 @@ coveralls@^3.0.0: minimist "^1.2.5" request "^2.88.2" +crc-32@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + cream-sor@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/cream-sor/-/cream-sor-0.3.3.tgz#ae7ab50c68cfd36a89e2101187ceebbb79e1b14c" @@ -5728,6 +5937,14 @@ ethereum-types@^3.4.0: "@types/node" "12.12.54" bignumber.js "~9.0.0" +ethereum-types@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-3.5.0.tgz#27393f0d86f55bb1dcbff8a6af55a39c1f751c0d" + integrity sha512-vTGJl45DxOK21w3rzlqV8KrfcdIJC+4ZqxFkjNf1aw2GBMXZy2MxiibUqBth2M823d98WgOuFpVHobOfa7ejDw== + dependencies: + "@types/node" "12.12.54" + bignumber.js "~9.0.0" + ethereumjs-abi@0.6.5: version "0.6.5" resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241" @@ -5869,6 +6086,18 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum rlp "^2.0.0" safe-buffer "^5.1.1" +ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.9: + version "7.0.10" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz#5fb7b69fa1fda0acc59634cf39d6b0291180fc1f" + integrity sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw== + dependencies: + "@types/bn.js" "^5.1.0" + bn.js "^5.1.2" + create-hash "^1.1.2" + ethereum-cryptography "^0.1.3" + ethjs-util "0.1.6" + rlp "^2.2.4" + ethereumjs-util@^7.0.2: version "7.0.7" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.7.tgz#484fb9c03b766b2ee64821281070616562fb5a59" @@ -6034,6 +6263,11 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== + expand-brackets@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" @@ -10189,6 +10423,11 @@ prettyjson@^1.1.2: colors "^1.1.2" minimist "^1.2.0" +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + private@^0.1.6, private@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -10338,9 +10577,9 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -"publish-release@https://github.com/0xProject/publish-release.git#3f8be1105a356527f4b362ff456d94bf9a82f2ed": +"publish-release@git+https://github.com/0xProject/publish-release.git#3f8be1105a356527f4b362ff456d94bf9a82f2ed": version "1.3.3" - resolved "https://github.com/0xProject/publish-release.git#3f8be1105a356527f4b362ff456d94bf9a82f2ed" + resolved "git+https://github.com/0xProject/publish-release.git#3f8be1105a356527f4b362ff456d94bf9a82f2ed" dependencies: async "^0.9.0" ghauth "^2.0.0"