Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions packages/crypto-wallet-core/src/transactions/erc20/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export class ERC20TxProvider extends ETHTxProvider {

create(params: {
recipients: Array<{ address: string; amount: string }>;
from: string;
nonce: number;
gasPrice: number;
data: string;
Expand All @@ -20,12 +19,22 @@ export class ERC20TxProvider extends ETHTxProvider {
chainId?: number;
}) {
const { tokenAddress } = params;
const [{ address, amount }] = params.recipients;
const data = this.getERC20Contract(tokenAddress)
.methods.transfer(address, amount)
.encodeABI();
const data = this.encodeData(params);
const recipients = [{ address: tokenAddress, amount: '0' }];
const newParams = { ...params, recipients, data };
return super.create(newParams);
}

encodeData(params: {
recipients: Array<{ address: string; amount: string }>;
tokenAddress: string;
}) {
const { tokenAddress } = params;
const [{ address, amount }] = params.recipients;
const amountStr = Number(amount).toLocaleString('en', {useGrouping: false});
const data = this.getERC20Contract(tokenAddress)
.methods.transfer(address, amountStr)
.encodeABI();
return data;
}
}
10 changes: 10 additions & 0 deletions packages/crypto-wallet-core/test/transactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ describe('Transaction Creation', () => {
expect(cryptoTx).to.equal(expectedTx);
});

it('should be able to encode Data in ERC20 tx', () => {
const recipients = [{ address: '0x37d7B3bBD88EFdE6a93cF74D2F5b0385D3E3B08A', amount: 3896000000000000 }];
const tokenAddress = '0x692a70d2e424a56d2c6c27aa97d1a86395877b3a';
const data = Transactions.get({chain: 'ERC20'}).encodeData({recipients, tokenAddress});
const expectedData =
'0xa9059cbb00000000000000000000000037d7b3bbd88efde6a93cf74d2f5b0385d3e3b08a000000000000000000000000000000000000000000000000000dd764300b8000';

expect(data).to.equal(expectedData);
});

it('should be only create a mainnet ETH tx with one recipient', () => {
const rawEthTx = {
network: 'mainnet',
Expand Down