diff options
| author | Greg Hysen <hysz@users.noreply.github.com> | 2018-06-09 02:58:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 02:58:23 +0800 |
| commit | 817c332d11835f02726f0609374d1c25c9ab39b5 (patch) | |
| tree | d84c9a96465b5e862629be3dd04325dcccdbc780 /packages/fill-scenarios | |
| parent | add9a9db9ba4294cf12489bf589c527b0921ed1e (diff) | |
| parent | 05fbc8e6b061e5cef5bb8b8078176f9b375c2ec5 (diff) | |
| download | dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.gz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.bz2 dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.lz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.xz dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.tar.zst dexon-sol-tools-817c332d11835f02726f0609374d1c25c9ab39b5.zip | |
Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom
On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy
Diffstat (limited to 'packages/fill-scenarios')
| -rw-r--r-- | packages/fill-scenarios/src/index.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/fill-scenarios/src/index.ts b/packages/fill-scenarios/src/index.ts index dc877a0fd..038826af2 100644 --- a/packages/fill-scenarios/src/index.ts +++ b/packages/fill-scenarios/src/index.ts @@ -169,10 +169,10 @@ export class FillScenarios { feeRecepientAddress: string, expirationTimeSeconds?: BigNumber, ): Promise<SignedOrder> { - const makerERC20ProxyData = assetProxyUtils.decodeERC20ProxyData(makerAssetData); - const makerTokenAddress = makerERC20ProxyData.tokenAddress; - const takerERC20ProxyData = assetProxyUtils.decodeERC20ProxyData(takerAssetData); - const takerTokenAddress = takerERC20ProxyData.tokenAddress; + const makerERC20AssetData = assetProxyUtils.decodeERC20AssetData(makerAssetData); + const makerTokenAddress = makerERC20AssetData.tokenAddress; + const takerERC20AssetData = assetProxyUtils.decodeERC20AssetData(takerAssetData); + const takerTokenAddress = takerERC20AssetData.tokenAddress; await Promise.all([ this._increaseERC20BalanceAndAllowanceAsync(makerTokenAddress, makerAddress, makerFillableAmount), this._increaseERC20BalanceAndAllowanceAsync(takerTokenAddress, takerAddress, takerFillableAmount), |