Skip to content

Leverage constants from BitGoJS.statics #65

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Leverage constants from BitGoJS.statics #65

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d93ce3
Leverage constants from BitGoJS.statics
wellkochi Mar 15, 2020
3ac7a58
Remove unnecessary code
wellkochi Mar 16, 2020
1730b1b
GetCoin alias
wellkochi Mar 16, 2020
cb650e8
Update sign.js
wellkochi Mar 18, 2020
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
92 changes: 49 additions & 43 deletions app/sign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,45 +11,45 @@ const bip39 = require('bip39');
const bitgojs = require('bitgo');
let bitgo;

const utxoNetworks = {
btc: utxoLib.networks.bitcoin,
ltc: utxoLib.networks.litecoin,
bch: utxoLib.networks.bitcoincash,
bsv: utxoLib.networks.bitcoinsv,
zec: utxoLib.networks.zcash,
dash: utxoLib.networks.dash,
tltc: utxoLib.networks.litecoin,
tbtc: utxoLib.networks.testnet,
tbch: utxoLib.networks.bitcoincashTestnet,
tbsv: utxoLib.networks.bitcoinsvTestnet,
tzec: utxoLib.networks.zcashTest,
tdash: utxoLib.networks.dashTest,
};

const coinDecimals = {
btc: 8,
eth: 18,
eos: 4,
trx: 6,
xrp: 6,
bch: 8,
bsv: 8,
ltc: 8,
zec: 8,
dash: 8,
xlm: 7,
tbtc: 8,
teth: 18,
teos: 4,
ttrx: 6,
txrp: 6,
tltc: 8,
txlm: 7,
tbch: 8,
tbsv: 8,
tzec: 8,
tdash: 8,
};
// const utxoNetworks = {
// btc: utxoLib.networks.bitcoin,
// ltc: utxoLib.networks.litecoin,
// bch: utxoLib.networks.bitcoincash,
// bsv: utxoLib.networks.bitcoinsv,
// zec: utxoLib.networks.zcash,
// dash: utxoLib.networks.dash,
// tltc: utxoLib.networks.litecoin,
// tbtc: utxoLib.networks.testnet,
// tbch: utxoLib.networks.bitcoincashTestnet,
// tbsv: utxoLib.networks.bitcoinsvTestnet,
// tzec: utxoLib.networks.zcashTest,
// tdash: utxoLib.networks.dashTest,
// };

// const coinDecimals = {
// btc: 8,
// eth: 18,
// eos: 4,
// trx: 6,
// xrp: 6,
// bch: 8,
// bsv: 8,
// ltc: 8,
// zec: 8,
// dash: 8,
// xlm: 7,
// tbtc: 8,
// teth: 18,
// teos: 4,
// ttrx: 6,
// txrp: 6,
// tltc: 8,
// txlm: 7,
// tbch: 8,
// tbsv: 8,
// tzec: 8,
// tdash: 8,
// };

const BCH_COINS = ['bch', 'tbch', 'bsv', 'tbsv'];
const TEN = new BN(10);
Expand Down Expand Up @@ -131,8 +131,11 @@ const getBackupSigningKey = function(key, expectedXpub) {
}

const handleSignUtxo = function(recoveryRequest, key, skipConfirm) {
const network = utxoNetworks[recoveryRequest.coin];
const decimals = coinDecimals[recoveryRequest.coin];

// const network = utxoNetworks[recoveryRequest.coin];
// const decimals = coinDecimals[recoveryRequest.coin];
const network = statics.coins.get[recoveryRequest.coin].network;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be worth adding an alias getCoinConfig(coin) to avoid having to write statics.coins.get[x] over and over

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, but consider it only used 4 times in this file so I didn't bother

Copy link
Author

@wellkochi wellkochi Mar 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. Not sure if this is the optimal way tho.
1730b1b

const decimals = statics.coins.get[recoveryRequest.coin].decimalPlaces;

if (!network) {
throw new Error(`Unsupported coin: ${recoveryRequest.coin}`);
Expand Down Expand Up @@ -232,7 +235,9 @@ const signEthTx = function(recoveryRequest, key, skipConfirm, isToken) {

// if request is for ETH, need to correct the amount decimals.
if (!isToken) {
const decimals = coinDecimals[recoveryRequest.coin];
// const decimals = coinDecimals[recoveryRequest.coin];
const decimals = statics.coins.get[recoveryRequest.coin].decimalPlaces;

outputs[0].amount = outputs[0].amount.div(TEN.pow(decimals));
}

Expand Down Expand Up @@ -305,7 +310,8 @@ const handleSignXrp = function(recoveryRequest, key, skipConfirm) {

const txHex = getTransactionHexFromRequest(recoveryRequest);

const decimals = coinDecimals[recoveryRequest.coin];
// const decimals = coinDecimals[recoveryRequest.coin];
const decimals = statics.coins.get[recoveryRequest.coin].decimalPlaces;
const transaction = rippleParse.decode(txHex);

const outputs = [{
Expand Down