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

Fix bug where passing in signerAddress instead of exchangeAddress

Browse Source
This commit is contained in:
Fabio Berger 2019-02-04 16:03:25 +00:00
parent 1d3fff32a2
commit c03e24e10b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/order-utils/package.json
View File

@ -57,6 +57,7 @@
"@0x/assert": "^1.0.23", "@0x/assert": "^1.0.23",
"@0x/base-contract": "^3.0.13", "@0x/base-contract": "^3.0.13",
"@0x/contract-artifacts": "^1.3.0", "@0x/contract-artifacts": "^1.3.0",
"@0x/contract-addresses": "^2.2.0",
"@0x/json-schemas": "^2.1.7", "@0x/json-schemas": "^2.1.7",
"@0x/types": "^1.5.2", "@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8", "@0x/typescript-typings": "^3.0.8",

10
packages/order-utils/src/signature_utils.ts
View File

@ -1,4 +1,5 @@
import { ExchangeContract, IValidatorContract, IWalletContract } from '@0x/abi-gen-wrappers'; import { ExchangeContract, IValidatorContract, IWalletContract } from '@0x/abi-gen-wrappers';
import { getContractAddressesForNetworkOrThrow } from '@0x/contract-addresses';
import * as artifacts from '@0x/contract-artifacts'; import * as artifacts from '@0x/contract-artifacts';
import { schemas } from '@0x/json-schemas'; import { schemas } from '@0x/json-schemas';
import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0x/types'; import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0x/types';
@ -92,7 +93,14 @@ export const signatureUtils = {
assert.isWeb3Provider('provider', provider); assert.isWeb3Provider('provider', provider);
assert.isHexString('data', data); assert.isHexString('data', data);
assert.isETHAddressHex('signerAddress', signerAddress); assert.isETHAddressHex('signerAddress', signerAddress);
const exchangeContract = new ExchangeContract(artifacts.Exchange.compilerOutput.abi, signerAddress, provider); const web3Wrapper = new Web3Wrapper(provider);
const networkId = await web3Wrapper.getNetworkIdAsync();
const addresses = getContractAddressesForNetworkOrThrow(networkId);
const exchangeContract = new ExchangeContract(
artifacts.Exchange.compilerOutput.abi,
addresses.exchange,
provider,
);
const isValid = await exchangeContract.preSigned.callAsync(data, signerAddress); const isValid = await exchangeContract.preSigned.callAsync(data, signerAddress);
return isValid; return isValid;
}, },