Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix token functionality #441

Merged
merged 7 commits into from Aug 29, 2020
Merged

Fix token functionality #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
062e0d4
Fix token create display & debug token balances
jplomas Aug 25, 2020
b144407
Fix token balances display
jplomas Aug 27, 2020
6507e4a
Transfer list refactor
jplomas Aug 28, 2020
ef9d184
Remove rogue devnet hexseeds
jplomas Aug 28, 2020
1116008
Fix token details in transfer_token diplay
jplomas Aug 28, 2020
81d1e63
Fix display of token transfer amounts
jplomas Aug 29, 2020
fd5334a
Merge pull request #440 from jplomas/master
jplomas Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
157 changes: 90 additions & 67 deletions imports/startup/client/functions.js
View file
Open in desktop
@@ -1,9 +1,11 @@
/* eslint no-console:0 */
/* eslint no-global-assign: 0 */
/* eslint max-len: 0 */
/* eslint no-unused-vars: 0 */
/* global QRLLIB, XMSS_OBJECT, LocalStore, QrlLedger, isElectrified, selectedNetwork,loadAddressTransactions, getTokenBalances, updateBalanceField, refreshTransferPage */
/* global pkRawToB32Address, hexOrB32, rawToHexOrB32, anyAddressToRawAddress, stringToBytes, binaryToBytes, bytesToString, bytesToHex, hexToBytes, toBigendianUint64BytesUnsigned, numberToString, decimalToBinary */
/* global getMnemonicOfFirstAddress, getXMSSDetails, isWalletFileDeprecated, waitForQRLLIB, addressForAPI, binaryToQrlAddress, toUint8Vector, concatenateTypedArrays, getQrlProtoShasum */
/* global resetWalletStatus, passwordPolicyValid, countDecimals, supportedBrowser, wrapMeteorCall, getBalance, otsIndexUsed, ledgerHasNoTokenSupport, resetLocalStorageState, nodeReturnedValidResponse */
/* global resetWalletStatus, passwordPolicyValid, countDecimals, supportedBrowser, wrapMeteorCall, getBalance, otsIndexUsed, ledgerHasNoTokenSupport, resetLocalStorageState, nodeReturnedValidResponse, TransportStatusError */
/* global POLL_TXN_RATE, POLL_MAX_CHECKS, DEFAULT_NETWORKS, findNetworkData, SHOR_PER_QUANTA, WALLET_VERSION, QRLPROTO_SHA256, */

import aes256 from 'aes256'
Expand All @@ -12,41 +14,41 @@ import helpers from '@theqrl/explorer-helpers'

import 'babel-polyfill'
import Qrl from '@theqrl/hw-app-qrl'
import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
import TransportWebUSB from '@ledgerhq/hw-transport-webusb'


bech32 = require('bech32') // eslint-disable-line

export function ledgerReturnedError(e) {
let r = false;
let r = false
try {
if (e instanceof DOMException) {
// DOMException will be thrown if WebUSB device is unplugged during Ledger UI event
r = true;
r = true
}
} catch (e) {
r = false;
} catch (err) {
r = false
}
try {
if (e.name === 'TransportStatusError' || e instanceof TransportStatusError || e.name === 'TransportOpenUserCancelled') {
r = true;
r = true
}
} catch (e) {
r = false;
} catch (err) {
r = false
}
return r;
return r
}

export async function createTransport() {
var transport = null;
transport = await TransportWebUSB.create();
console.log('USING WEBUSB');
var qrl = await new Qrl(transport);
let transport = null
transport = await TransportWebUSB.create()
console.log('USING WEBUSB')
const qrl = await new Qrl(transport)
return qrl
}

// Client side function to detmine if running within Electron
export function isElectrified () {
export function isElectrified() {
const userAgent = navigator.userAgent.toLowerCase()
if (userAgent.indexOf(' electron/') > -1) {
return true
Expand Down Expand Up @@ -483,7 +485,7 @@ getBalance = (getAddress, callBack) => {
// prefer to rely on state tracked in ledger device
console.log('-- Getting QRL Ledger Nano App State --')
if (isElectrified()) {
Meteor.call('ledgerGetState', [], (err, data) => {
Meteor.call('ledgerGetState', [], (gsErr, data) => {
console.log('> Got Ledger Nano State from USB')
Session.set('otsKeyEstimate', data.xmss_index)
// Get remaining OTS Keys
Expand Down Expand Up @@ -541,87 +543,108 @@ loadAddressTransactions = (a, p) => {
Session.set('loadingTransactions', true)

wrapMeteorCall('getTransactionsByAddress', request, (err, res) => {
// console.log('err:', err)
if (err) { console.log('err:', err) }
// console.log('res:', res)
if (err) {
Session.set('addressTransactions', { error: err })
Session.set('errorLoadingTransactions', true)
} else {
Session.set('active', p)
Session.set('addressTransactions', res.transactions_detail)

const transactions = []
const thisAddress = a
_.each(res.transactions_detail, (transaction) => {
const y = transaction
// Update timestamp from unix epoch to human readable time/date.
if (moment.unix(transaction.timestamp).isValid()) {
y.timestamp = moment.unix(transaction.timestamp).format('HH:mm D MMM YYYY')
} else {
y.timestamp = 'Unconfirmed Tx'
}
// Set total received amount if sent to this address
let thisReceivedAmount = 0
let totalSent = 0
if (y.tx.transactionType === 'transfer') {
_.each(y.tx.transfer.addrs_to, (output, index) => {
totalSent += parseFloat(y.tx.transfer.amounts[index] / SHOR_PER_QUANTA)
if (output === thisAddress) {
thisReceivedAmount += parseFloat(y.tx.transfer.amounts[index] / SHOR_PER_QUANTA)
}
})
}
if (y.tx.transactionType === 'transfer_token') {
// FIXME: sort token decimals here
_.each(y.tx.transfer_token.addrs_to, (output, index) => {
totalSent += parseFloat(y.tx.transfer_token.amounts[index])
if (output === thisAddress) {
thisReceivedAmount += parseFloat(y.tx.transfer_token.amounts[index])
}
})
}
y.thisReceivedAmount = numberToString(thisReceivedAmount)
y.totalTransferred = totalSent
transactions.push(y)
Session.set('addressTransactions', transactions)
})
Session.set('loadingTransactions', false)
Session.set('errorLoadingTransactions', false)
$('#noTransactionsFound').show()
}
})
}

getTokenBalances = (getAddress, callback) => {
const getTokenBalances = (getAddress, callback) => {
const request = {
address: addressForAPI(getAddress),
address: Buffer.from(getAddress.substring(1), 'hex'),
network: selectedNetwork(),
}

wrapMeteorCall('getAddressState', request, (err, res) => {
const tokensHeld = []
Meteor.call('getFullAddressState', request, (err, res) => {
if (err) {
console.log('err: ', err)
Session.set('transferFromBalance', 0)
Session.set('transferFromTokenState', [])
Session.set('address', 'Error')
Session.set('otsKeyEstimate', 0)
Session.set('otsKeysRemaining', 0)
// TODO - Error handling
} else {
if (res.state.address !== '') { // eslint-disable-line
const tokensHeld = []

// Now for each res.state.token we find, go discover token name and symbol
for (let i in res.state.tokens) { // eslint-disable-line
const tokenHash = i
const tokenBalance = res.state.tokens[i]
// Now for each res.state.token we find, go discover token name and symbol
// eslint-disable-next-line
if (res.state.address !== '') {
Object.keys(res.state.tokens).forEach((key) => {
const tokenHash = key
const tokenBalance = res.state.tokens[key]

const thisToken = {}

const txnRequest = {
query: tokenHash,
const req = {
query: Buffer.from(tokenHash, 'hex'),
network: selectedNetwork(),
}

wrapMeteorCall('getTxnHash', txnRequest, (err, res) => { // eslint-disable-line
Meteor.call('getObject', req, (objErr, objRes) => {
if (err) {
console.log('err:', err)
Session.set('tokensHeld', [])
// TODO - Error handling here
console.log('err:', objErr)
} else {
// Check if this is a token hash.
if (res.transaction.tx.transactionType !== 'token') { // eslint-disable-line
console.log('err: ', err)
Session.set('tokensHeld', [])
// eslint-disable-next-line
if (objRes.transaction.tx.transactionType !== 'token') {
// TODO - Error handling here
} else {
const tokenDetails = res.transaction.tx.token
const tokenDetails = objRes.transaction.tx.token

thisToken.hash = tokenHash
thisToken.name = bytesToString(tokenDetails.name)
thisToken.symbol = bytesToString(tokenDetails.symbol)
thisToken.balance = tokenBalance / Math.pow(10, tokenDetails.decimals) // eslint-disable-line
thisToken.symbol = bytesToString(tokenDetails.symbol) // eslint-disable-next-line
thisToken.balance = tokenBalance / Math.pow(10, tokenDetails.decimals)
thisToken.decimals = tokenDetails.decimals

tokensHeld.push(thisToken)

Session.set('tokensHeld', tokensHeld)
}
}
})
}
callback()

// When done hide loading section
Session.set('errorLoadingTransactions', false)
$('#loading').hide()
} else {
// Wallet not found, put together an empty response
callback()
})
}
}
})
$('#tokenBalancesLoading').hide()
}

updateBalanceField = () => {
Expand All @@ -632,7 +655,9 @@ updateBalanceField = () => {
if (selectedType === 'quanta') {
Session.set('balanceAmount', Session.get('transferFromBalance'))
Session.set('balanceSymbol', 'Quanta')
$('#showMessageField').show()
} else {
$('#showMessageField').hide()
// First extract the token Hash
const tokenHash = selectedType.split('-')[1]

Expand All @@ -658,7 +683,16 @@ refreshTransferPage = (callback) => {
waitForQRLLIB(function () {
// Set transfer from address
Session.set('transferFromAddress', getXMSSDetails().address)
// Get Tokens and Balances
getTokenBalances(getXMSSDetails().address, function () {
// Update balance field
updateBalanceField()

$('#tokenBalancesLoading').hide()

// Render dropdown
$('.ui.dropdown').dropdown()
})
// Get address balance
getBalance(getXMSSDetails().address, function () {
// Load Wallet Transactions
Expand All @@ -678,17 +712,6 @@ refreshTransferPage = (callback) => {
loadAddressTransactions(getXMSSDetails().address, 1)
callback()
})

// Get Tokens and Balances
getTokenBalances(getXMSSDetails().address, function () {
// Update balance field
updateBalanceField()

$('#tokenBalancesLoading').hide()

// Render dropdown
$('.ui.dropdown').dropdown()
})
})
}

Expand Down