crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-zero-ex: Update tests to work with ganache chainId of 1337 (#123)

Browse Source 
* `@0x/contracts-zero-ex`: Update tests to work with ganache chainId of 1337

* `update org deps

* `@0x/protocol-utils`: Use `Web3Wrapper.signTypedDataAsync()` instead of removed `Web3Wrapper.signTypedDataV4Async()` (#124)

Co-authored-by: Lawrence Forman <me@merklejerk.com>

* `update org deps
`@0x/order-utils`: Fix broken tests

* remove lingering console.logs

Co-authored-by: Lawrence Forman <me@merklejerk.com>
This commit is contained in:
Lawrence Forman
2021-01-26 02:50:09 -05:00
committed by GitHub
parent 0bd43d5265
commit 3557a5e5a9
31 changed files with 331 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/zero-ex/package.json
View File

@@ -55,14 +55,14 @@
},
"homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
"devDependencies": {
"@0x/abi-gen": "^5.4.13",
"@0x/abi-gen": "^5.4.19",
"@0x/contract-addresses": "^5.9.0",
"@0x/contracts-erc20": "^3.3.1",
"@0x/contracts-gen": "^2.0.24",
"@0x/contracts-gen": "^2.0.30",
"@0x/contracts-test-utils": "^5.3.19",
"@0x/dev-utils": "^4.1.3",
"@0x/dev-utils": "^4.2.1",
"@0x/order-utils": "^10.4.14",
"@0x/sol-compiler": "^4.4.1",
"@0x/sol-compiler": "^4.5.2",
"@0x/ts-doc-gen": "^0.0.28",
"@0x/tslint-config": "^4.1.3",
"@types/isomorphic-fetch": "^0.0.35",
@@ -82,13 +82,13 @@
"typescript": "3.0.1"
},
"dependencies": {
"@0x/base-contract": "^6.2.14",
"@0x/base-contract": "^6.2.18",
"@0x/protocol-utils": "^1.1.4",
"@0x/subproviders": "^6.2.3",
"@0x/subproviders": "^6.4.1",
"@0x/types": "^3.3.1",
"@0x/typescript-typings": "^5.1.6",
"@0x/utils": "^6.1.1",
"@0x/web3-wrapper": "^7.3.0",
"@0x/utils": "^6.2.0",
"@0x/web3-wrapper": "^7.4.1",
"ethereum-types": "^3.4.0",
"ethereumjs-util": "^5.1.1"
},

2
contracts/zero-ex/test/features/meta_transactions_test.ts
View File

@@ -94,7 +94,7 @@ blockchainTests.resets('MetaTransactions feature', env => {
value: getRandomInteger(1, '1e18'),
feeToken: feeToken.address,
feeAmount: getRandomInteger(1, MAX_FEE_AMOUNT),
chainId: 1, // Ganache's `chainid` opcode is hardcoded as 1
chainId: 1337,
verifyingContract: zeroEx.address,
...fields,
});

2
contracts/zero-ex/test/features/native_orders_feature_test.ts
View File

@@ -84,6 +84,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
return getRandomLimitOrder({
maker,
verifyingContract,
chainId: 1337,
takerToken: takerToken.address,
makerToken: makerToken.address,
taker: NULL_ADDRESS,
@@ -96,6 +97,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
return getRandomRfqOrder({
maker,
verifyingContract,
chainId: 1337,
takerToken: takerToken.address,
makerToken: makerToken.address,
txOrigin: taker,