Skip to content

Commit

Permalink
fixup! adjustDecimalAmountForTokenTransfer
Browse files Browse the repository at this point in the history
  • Loading branch information
mhuggins committed Jan 2, 2018
1 parent c677cd8 commit bbe73d2
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion app/modules/transactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { getNetwork } from './metadata'

import { isToken, validateTransactionsBeforeSending } from '../core/wallet'
import { ASSETS } from '../core/constants'
import { adjustDecimalAmountForTokenTransfer } from '../core/nep5'
import asyncWrap from '../core/asyncHelper'

import { log } from '../util/Logs'
Expand Down Expand Up @@ -85,9 +86,19 @@ const buildTransferScript = (net: NetworkType, sendEntries: Array<SendEntryType>
tokenEntries.forEach(({ address, amount, symbol }) => {
const toAcct = new wallet.Account(address)
const scriptHash = getScriptHashForNetwork(net, symbol)
const args = [u.reverseHex(fromAcct.scriptHash), u.reverseHex(toAcct.scriptHash), parseFloat(amount)]
const args = [u.reverseHex(fromAcct.scriptHash), u.reverseHex(toAcct.scriptHash), adjustDecimalAmountForTokenTransfer(amount)]

scriptBuilder.emitAppCall(scriptHash, 'transfer', args)

/*
const tokenScriptHash = getScriptHashForNetwork(net, symbol)
const fromAddrScriptHash = sc.ContractParam.byteArray(fromAddress, 'address')
const toAddrScriptHash = sc.ContractParam.byteArray(address, 'address')
const transferAmount = sc.ContractParam.byteArray(parseFloat(amount), 'fixed8') // TODO: fixed8 won't work for tokens that are no divisible by 8
const args = sc.ContractParam.array(fromAddrScriptHash, toAddrScriptHash, transferAmount)
scriptBuilder.emitAppCall(tokenScriptHash, 'transfer', args)
*/
})

return scriptBuilder.str
Expand Down

0 comments on commit bbe73d2

Please sign in to comment.