diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-05-25 06:33:56 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-25 06:39:19 +0800 |
commit | 237ebb07161c46fa85ca778a1c2ff60f63611bd7 (patch) | |
tree | 67deae8c77054c06435521b05016fda3ac63e780 /packages/contracts/src/utils/erc721_wrapper.ts | |
parent | fdea260e41111f3d27c05ab2d2523d2473c1ac05 (diff) | |
download | dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar.gz dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar.bz2 dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar.lz dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar.xz dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.tar.zst dexon-sol-tools-237ebb07161c46fa85ca778a1c2ff60f63611bd7.zip |
Use web3-wrapper instead of 0x.js, update logDecoder
Diffstat (limited to 'packages/contracts/src/utils/erc721_wrapper.ts')
-rw-r--r-- | packages/contracts/src/utils/erc721_wrapper.ts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/contracts/src/utils/erc721_wrapper.ts b/packages/contracts/src/utils/erc721_wrapper.ts index aee796e4b..bea801f3d 100644 --- a/packages/contracts/src/utils/erc721_wrapper.ts +++ b/packages/contracts/src/utils/erc721_wrapper.ts @@ -1,6 +1,7 @@ import { generatePseudoRandomSalt } from '@0xproject/order-utils'; import { Provider } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; +import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import { DummyERC721TokenContract } from '../contract_wrappers/generated/dummy_e_r_c721_token'; @@ -14,11 +15,13 @@ import { txDefaults } from './web3_wrapper'; export class ERC721Wrapper { private _tokenOwnerAddresses: string[]; private _contractOwnerAddress: string; + private _web3Wrapper: Web3Wrapper; private _provider: Provider; private _dummyTokenContracts?: DummyERC721TokenContract[]; private _proxyContract?: ERC721ProxyContract; private _initialTokenIdsByOwner: ERC721TokenIdsByOwner = {}; constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) { + this._web3Wrapper = new Web3Wrapper(provider); this._provider = provider; this._tokenOwnerAddresses = tokenOwnerAddresses; this._contractOwnerAddress = contractOwnerAddress; @@ -80,7 +83,8 @@ export class ERC721Wrapper { ); }); }); - await Promise.all([...setBalancePromises, ...setAllowancePromises]); + const txHashes = await Promise.all([...setBalancePromises, ...setAllowancePromises]); + await Promise.all(_.map(txHashes, async txHash => this._web3Wrapper.awaitTransactionSuccessAsync(txHash))); } public async getBalancesAsync(): Promise<ERC721TokenIdsByOwner> { this._validateDummyTokenContractsExistOrThrow(); |