diff options
| -rw-r--r-- | src/contract_wrappers/token_wrapper.ts | 17 | ||||
| -rw-r--r-- | src/types.ts | 1 | ||||
| -rw-r--r-- | test/token_wrapper_test.ts | 19 |
3 files changed, 36 insertions, 1 deletions
diff --git a/src/contract_wrappers/token_wrapper.ts b/src/contract_wrappers/token_wrapper.ts index 35e008905..cedbfbdae 100644 --- a/src/contract_wrappers/token_wrapper.ts +++ b/src/contract_wrappers/token_wrapper.ts @@ -52,7 +52,7 @@ export class TokenWrapper extends ContractWrapper { * of an owner address. */ public async setProxyAllowanceAsync(tokenAddress: string, ownerAddress: string, - amountInBaseUnits: BigNumber.BigNumber) { + amountInBaseUnits: BigNumber.BigNumber): Promise<void> { assert.isETHAddressHex('ownerAddress', ownerAddress); assert.isETHAddressHex('tokenAddress', tokenAddress); assert.isBigNumber('amountInBaseUnits', amountInBaseUnits); @@ -69,6 +69,21 @@ export class TokenWrapper extends ContractWrapper { gas, }); } + /** + * Transfers `amountInBaseUnits` ERC20 tokens from `fromAddress` to `toAddress`. + */ + public async transferAsync(tokenAddress: string, fromAddress: string, toAddress: string, + amountInBaseUnits: BigNumber.BigNumber): Promise<void> { + assert.isETHAddressHex('tokenAddress', tokenAddress); + assert.isETHAddressHex('fromAddress', fromAddress); + assert.isETHAddressHex('toAddress', toAddress); + assert.isBigNumber('amountInBaseUnits', amountInBaseUnits); + + const tokenContract = await this.getTokenContractAsync(tokenAddress); + await tokenContract.transfer(toAddress, amountInBaseUnits, { + from: fromAddress, + }); + } private async getTokenContractAsync(tokenAddress: string): Promise<TokenContract> { let tokenContract = this.tokenContractsByAddress[tokenAddress]; if (!_.isUndefined(tokenContract)) { diff --git a/src/types.ts b/src/types.ts index 3619c800f..5b514bdc4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -38,6 +38,7 @@ export interface TokenContract { allowance: { call: (ownerAddress: string, allowedAddress: string) => Promise<BigNumber.BigNumber>; }; + transfer: (to: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => Promise<boolean>; approve: (proxyAddress: string, amountInBaseUnits: BigNumber.BigNumber, txOpts: TxOpts) => void; } diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts index 5ce3efb14..113dd32d6 100644 --- a/test/token_wrapper_test.ts +++ b/test/token_wrapper_test.ts @@ -28,6 +28,25 @@ describe('TokenWrapper', () => { afterEach(async () => { await blockchainLifecycle.revertAsync(); }); + describe('#transferAsync', () => { + it('should successfully transfer tokens', async () => { + const token = tokens[0]; + const fromAddress = userAddresses[0]; + const toAddress = userAddresses[1]; + const preBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress); + expect(preBalance).to.be.bignumber.equal(0); + await zeroEx.token.transferAsync(token.address, fromAddress, toAddress, new BigNumber(42)); + const postBalance = await zeroEx.token.getBalanceAsync(token.address, toAddress); + expect(postBalance).to.be.bignumber.equal(42); + }); + it('should throw a CONTRACT_DOES_NOT_EXIST error for a non-existent token contract', async () => { + const nonExistentTokenAddress = '0x9dd402f14d67e001d8efbe6583e51bf9706aa065'; + const aOwnerAddress = userAddresses[0]; + expect(zeroEx.token.transferAsync( + nonExistentTokenAddress, userAddresses[0], userAddresses[1], new BigNumber(42), + )).to.be.rejectedWith(ZeroExError.CONTRACT_DOES_NOT_EXIST); + }); + }); describe('#getBalanceAsync', () => { it('should return the balance for an existing ERC20 token', async () => { const aToken = tokens[0]; |