feat: tickers, exchanges, tron_usdt

lib/db.js

@@ -51,7 +51,7 @@ const searchPathWrapper = (t, cb) => {
 }
 
 const pgp = Pgp({
-  pgNative: true,
+  // pgNative: true,
   schema: 'ERROR_SCHEMA',
   extend (obj, dbContext) {
     obj.__taskEx = function (cb, throwOnError = true) {

lib/plugins/common/ccxt.js

@@ -10,7 +10,7 @@ const bitpay = require('../ticker/bitpay')
 const binance = require('../exchange/binance')
 const logger = require('../../logger')
 
-const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT } = COINS
+const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, TRX, USDT_TRON } = COINS
 
 const ALL = {
   cex: cex,
@@ -20,7 +20,7 @@ const ALL = {
   itbit: itbit,
   bitpay: bitpay,
   coinbase: {
-    CRYPTO: [BTC, ETH, LTC, DASH, ZEC, BCH, USDT],
+    CRYPTO: [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON, TRX],
     FIAT: 'ALL_CURRENCIES'
   },
   binance: binance

lib/plugins/exchange/binanceus.js

@@ -4,8 +4,8 @@ const _ = require('lodash/fp')
 const { ORDER_TYPES } = require('./consts')
 
 const ORDER_TYPE = ORDER_TYPES.MARKET
-const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT } = COINS
+const { BTC, BCH, DASH, ETH, LTC, ZEC, USDT, USDT_TRON } = COINS
-const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, USDT]
+const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, USDT, USDT_TRON]
 const FIAT = ['USD']
 const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey']
 

lib/plugins/exchange/ccxt.js

@@ -9,8 +9,9 @@ const DEFAULT_PRICE_PRECISION = 2
 const DEFAULT_AMOUNT_PRECISION = 8
 
 function trade (side, account, tradeEntry, exchangeName) {
-  const { cryptoAtoms, fiatCode, cryptoCode, tradeId } = tradeEntry
+  const { cryptoAtoms, fiatCode, _cryptoCode, tradeId } = tradeEntry
   try {
+    const cryptoCode = coinUtils.getEquivalentCode(_cryptoCode)
     const exchangeConfig = ALL[exchangeName]
     if (!exchangeConfig) throw Error('Exchange configuration not found')
 

lib/plugins/exchange/cex.js

@@ -4,8 +4,8 @@ const _ = require('lodash/fp')
 const { ORDER_TYPES } = require('./consts')
 
 const ORDER_TYPE = ORDER_TYPES.MARKET
-const { BTC, BCH, DASH, ETH, LTC, USDT } = COINS
+const { BTC, BCH, DASH, ETH, LTC, USDT, TRX, USDT_TRON } = COINS
-const CRYPTO = [BTC, ETH, LTC, DASH, BCH, USDT]
+const CRYPTO = [BTC, ETH, LTC, DASH, BCH, USDT, TRX, USDT_TRON]
 const FIAT = ['USD', 'EUR']
 const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey']
 

lib/plugins/exchange/ftx.js

@@ -1,20 +0,0 @@
-const { COINS } = require('@lamassu/coins')
-const _ = require('lodash/fp')
-
-const { ORDER_TYPES } = require('./consts')
-
-const ORDER_TYPE = ORDER_TYPES.MARKET
-const { BTC, BCH, ETH, LTC, USDT } = COINS
-const CRYPTO = [BTC, ETH, LTC, BCH, USDT]
-const FIAT = ['USD']
-const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey']
-
-const loadConfig = (account) => {
-  const mapper = {
-    'privateKey': 'secret'
-  }
-  const mapped = _.mapKeys(key => mapper[key] ? mapper[key] : key)(account)
-  return { ...mapped, timeout: 3000 }
-}
-
-module.exports = { loadConfig, REQUIRED_CONFIG_FIELDS, CRYPTO, FIAT, ORDER_TYPE }

lib/plugins/exchange/kraken.js

@@ -4,8 +4,8 @@ const { ORDER_TYPES } = require('./consts')
 const { COINS } = require('@lamassu/coins')
 
 const ORDER_TYPE = ORDER_TYPES.MARKET
-const { BTC, BCH, DASH, ETH, LTC, ZEC, XMR, USDT } = COINS
+const { BTC, BCH, DASH, ETH, LTC, ZEC, XMR, USDT, TRX, USDT_TRON } = COINS
-const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, XMR, USDT]
+const CRYPTO = [BTC, ETH, LTC, DASH, ZEC, BCH, XMR, USDT, TRX, USDT_TRON]
 const FIAT = ['USD', 'EUR']
 const AMOUNT_PRECISION = 6
 const REQUIRED_CONFIG_FIELDS = ['apiKey', 'privateKey']

lib/plugins/wallet/geth/base.js

@@ -16,8 +16,6 @@ const BN = require('../../../bn')
 const ABI = require('../../tokens')
 const logger = require('../../../logger')
 
-exports.SUPPORTED_MODULES = ['wallet']
-
 const paymentPrefixPath = "m/44'/60'/0'/0'"
 const defaultPrefixPath = "m/44'/60'/1'/0'"
 let lastUsedNonces = {}

lib/plugins/wallet/tron/base.js

@@ -1,9 +1,10 @@
 const TronWeb = require('tronweb')
 const coins = require('@lamassu/coins')
 
+const BN = require('../../../bn')
+
 let tronWeb = null
 
-const PAYMENT_PREFIX_PATH = "m/44'/195'/0'/0"
 const DEFAULT_PREFIX_PATH = "m/44'/195'/1'/0"
 
 function checkCryptoCode (cryptoCode) {
@@ -17,7 +18,7 @@ function defaultWallet (account) {
   const mnemonic = account.mnemonic
   if (!mnemonic) throw new Error('No mnemonic seed!')
 
-  const key = TronWeb.fromMnemonic(masterSeed, `${DEFAULT_PREFIX_PATH}\\0`)
+  const key = TronWeb.fromMnemonic(mnemonic.replace(/[\r\n]/gm, ' ').trim(), `${DEFAULT_PREFIX_PATH}\/0`)
 
   return key
 }
@@ -39,9 +40,10 @@ const _balance = async (address, cryptoCode) => {
     const { abi } = await tronWeb.trx.getContract(contractAddress)
     const contract = tronWeb.contract(abi.entrys, contractAddress)
 
-    const balance = await contract.methods.balanceOf(account).call()
+    const balance = await contract.methods.balanceOf(address).call()
-    const decimals = await contract.methods.decimals().call()
+    // const decimals = await contract.methods.decimals().call()
-    return BN(balance).div(10 ** decimals)
+    // BN(balance.toString()).div(10 ** decimals).toString()
+    return BN(balance.toString())
   }
 
   const balance = await tronWeb.trx.getBalance(address)
@@ -53,36 +55,47 @@ const sendCoins = async (account, tx) => {
   const isTrc20Token = coins.utils.isTrc20Token(cryptoCode)
 
   const txFunction = isTrc20Token ? generateTrc20Tx : generateTx
-  const tx = await txFunction(toAddress, defaultWallet(account), cryptoAtoms, cryptoCode)
+  const rawTx = await txFunction(toAddress, defaultWallet(account), cryptoAtoms.toString(), cryptoCode)
-  const { transaction } = await tronWeb.trx.sendRawTransaction(tx)
+
+  let response = null
+
+  try {
+    response = await tronWeb.trx.sendRawTransaction(rawTx)
+  } catch (err) {
+    // for some reason err here is just a string
+    throw new Error(err)
+  }
+
+  const transaction = response.transaction
   const txId = transaction.txId
   const transactionInfo = tronWeb.trx.getTransactionInfo(txId)
 
-  if (!transactionInfo) return { txId }
+  if (!transactionInfo || !transactionInfo.fee) return { txId }
 
-  const fee = new BN(tx.fee).decimalPlaces(0)
+  const fee = new BN(transactionInfo.fee).decimalPlaces(0)
-  return { txid, fee }
+  return { txId, fee }
 }
 
-const generateTrc20Tx = async (toAddress, wallet, amount, includesFee, cryptoCode) => {
+const generateTrc20Tx = async (toAddress, wallet, amount, cryptoCode) => {
   const contractAddress = coins.utils.getTrc20Token(cryptoCode).contractAddress
-  const functionSelector = 'transferFrom(address,address,uint256)'
+  const functionSelector = 'transfer(address,uint256)'
   const parameters = [
-    { type: 'address', value: wallet.address },
+    { type: 'address', value: tronWeb.address.toHex(toAddress) },
-    { type: 'address', value: toAddress},
     { type: 'uint256', value: amount }
   ]
 
-  const tx = await tronWeb.transactionBuilder.triggerSmartContract(contractAddress, functionSelector, {}, parameters)
+  const tx = await tronWeb.transactionBuilder.triggerSmartContract(contractAddress, functionSelector, {}, parameters, wallet.address)
 
-  return tronWeb.trx.sign(tx.transaction, privateKey)
+  return tronWeb.trx.sign(tx.transaction, wallet.privateKey.slice(2))
 }
 
-function generateTx (toAddress, wallet, amount) {
+const generateTx = async (toAddress, wallet, amount) => {
-  const transaction = tronWeb.transactionBuilder.sendTrx(toAddress, amount, wallet.address)
+  const transaction = await tronWeb.transactionBuilder.sendTrx(toAddress, amount, wallet.address)
 
-  const privateKey = wallet.getPrivateKey()
+  const privateKey = wallet.privateKey
-  return tronWeb.trx.sign(transaction, privateKey)
+
+  // their api return a hex string starting with 0x but expects without it
+  return tronWeb.trx.sign(transaction, privateKey.slice(2))
 }
 
 function newFunding (account, cryptoCode) {
@@ -92,7 +105,7 @@ function newFunding (account, cryptoCode) {
 
       return confirmedBalance(fundingAddress, code)
         .then((balance) => ({
-          fundingPendingBalance: 0,
+          fundingPendingBalance: BN(0),
           fundingConfirmedBalance: balance,
           fundingAddress
         }))
@@ -100,10 +113,23 @@ function newFunding (account, cryptoCode) {
 }
 
 function connect(account) {
+  if (tronWeb != null) return
+  const endpoint = account.endpoint
   const apiKey = account.apiKey
   tronWeb = new TronWeb({
-    fullHost: 'https://api.trongrid.io',
+    fullHost: endpoint,
-    headers: { "TRON-PRO-API-KEY": apiKey }
+    headers: { "TRON-PRO-API-KEY": apiKey },
+    privateKey: '01'
+  })
+}
+
+function getStatus (account, tx, requested, settings, operatorId) {
+  const { toAddress, cryptoCode } = tx
+  return checkCryptoCode(cryptoCode)
+    .then(code => confirmedBalance(toAddress, code))
+    .then((confirmed) => {
+      if (confirmed.gte(requested)) return { receivedCryptoAtoms: confirmed, status: 'confirmed' }
+      return { receivedCryptoAtoms: 0, status: 'notSeen' }
     })
 }
 
@@ -111,12 +137,11 @@ module.exports = {
   balance,
   sendCoins,
 //   newAddress,
-//   getStatus,
+  getStatus,
 //   sweep,
   defaultAddress,
   supportsHd: true,
   newFunding,
   connect,
 //   getTxHashesByAddress,
-//   _balance
 }

lib/plugins/wallet/trongrid/trongrid.js

@@ -1 +1,15 @@
+const _ = require('lodash/fp')
+const base = require('../tron/base')
+
 const NAME = 'trongrid'
+
+function run (account) {
+  if (!account.endpoint) throw new Error('Need to configure API endpoint for Infura')
+
+  const endpoint = _.startsWith('https://')(account.endpoint)
+    ? account.endpoint : `https://${account.endpoint}`
+
+  base.connect(endpoint)
+}
+
+module.exports = _.merge(base, { NAME, run })

lib/ticker.js

@@ -1,3 +1,4 @@
+const { utils: coinUtils } = require('@lamassu/coins')
 const _ = require('lodash/fp')
 const mem = require('mem')
 const configManager = require('./new-config-manager')
@@ -35,10 +36,13 @@ function _getRates (settings, fiatCode, cryptoCode) {
     })
 }
 
-function buildTicker (fiatCode, cryptoCode, tickerName) {
+function buildTicker (fiatCode, _cryptoCode, tickerName) {
   const fiatPeggedEquivalent = _.includes(fiatCode, _.keys(PEGGED_FIAT_CURRENCIES))
     ? PEGGED_FIAT_CURRENCIES[fiatCode]
     : fiatCode
+
+  const cryptoCode = coinUtils.getEquivalentCode(_cryptoCode)
+
   if (tickerName === 'bitpay') return bitpay.ticker(fiatPeggedEquivalent, cryptoCode)
   if (tickerName === 'mock-ticker') return mockTicker.ticker(fiatPeggedEquivalent, cryptoCode)
   return ccxt.ticker(fiatPeggedEquivalent, cryptoCode, tickerName)

new-lamassu-admin/package.json

@@ -4,7 +4,7 @@
   "license": "unlicense",
   "dependencies": {
     "@apollo/react-hooks": "^3.1.3",
-    "@lamassu/coins": "1.2.0",
+    "@lamassu/coins": "v1.3.1-trx.1",
     "@material-ui/core": "4.11.0",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.56",

new-lamassu-admin/src/pages/Services/schemas/index.js

@@ -10,9 +10,9 @@ import itbit from './itbit'
 import kraken from './kraken'
 import mailgun from './mailgun'
 import telnyx from './telnyx'
+import trongrid from './trongrid'
 import twilio from './twilio'
 import vonage from './vonage'
-import trongrid from './trongrid'
 
 export default {
   [bitgo.code]: bitgo,

new-lamassu-admin/src/pages/Wallet/WizardSplash.js

@@ -10,6 +10,7 @@ import { ReactComponent as EthereumLogo } from 'src/styling/logos/icon-ethereum-
 import { ReactComponent as LitecoinLogo } from 'src/styling/logos/icon-litecoin-colour.svg'
 import { ReactComponent as MoneroLogo } from 'src/styling/logos/icon-monero-colour.svg'
 import { ReactComponent as TetherLogo } from 'src/styling/logos/icon-tether-colour.svg'
+import { ReactComponent as TronLogo } from 'src/styling/logos/icon-tron-colour.svg'
 import { ReactComponent as ZCashLogo } from 'src/styling/logos/icon-zcash-colour.svg'
 
 const styles = {
@@ -53,9 +54,12 @@ const getLogo = code => {
     case 'ZEC':
       return ZCashLogo
     case 'USDT':
+    case 'USDT_TRON':
       return TetherLogo
     case 'XMR':
       return MoneroLogo
+    case 'TRX':
+      return TronLogo
     default:
       return null
   }

new-lamassu-admin/src/styling/logos/icon-tron-colour.svg

@@ -0,0 +1,7 @@
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" viewBox="0 0 2680.2 2915.7" style="enable-background:new 0 0 2680.2 2915.7;" xml:space="preserve">
+<style type="text/css">
+	#tron{fill:#EB0029;}
+</style>
+<path id="tron" class="st0" d="M1929.1,757.7L332,463.8l840.5,2114.9l1171.1-1426.8L1929.1,757.7z M1903.4,887.2l244.3,232.2l-668.2,121  L1903.4,887.2z M1334.4,1216.2L630.1,632.1l1151.1,211.8L1334.4,1216.2z M1284.2,1319.5l-114.8,949.4L550.2,710.7L1284.2,1319.5z   M1390.5,1369.9l739.9-134l-848.7,1034L1390.5,1369.9z"/>
+</svg>

new-lamassu-admin/src/utils/coin.js

@@ -1,59 +0,0 @@
-import * as R from 'ramda'
-
-const CRYPTO_CURRENCIES = [
-  {
-    cryptoCode: 'BTC',
-    display: 'Bitcoin',
-    code: 'bitcoin',
-    unitScale: 8
-  },
-  {
-    cryptoCode: 'ETH',
-    display: 'Ethereum',
-    code: 'ethereum',
-    unitScale: 18
-  },
-  {
-    cryptoCode: 'LTC',
-    display: 'Litecoin',
-    code: 'litecoin',
-    unitScale: 8
-  },
-  {
-    cryptoCode: 'DASH',
-    display: 'Dash',
-    code: 'dash',
-    unitScale: 8
-  },
-  {
-    cryptoCode: 'ZEC',
-    display: 'Zcash',
-    code: 'zcash',
-    unitScale: 8
-  },
-  {
-    cryptoCode: 'BCH',
-    display: 'Bitcoin Cash',
-    code: 'bitcoincash',
-    unitScale: 8
-  }
-]
-
-function getCryptoCurrency(cryptoCode) {
-  const coin = R.find(R.propEq('cryptoCode', cryptoCode))(CRYPTO_CURRENCIES)
-
-  if (!coin) throw new Error(`Unsupported crypto: ${cryptoCode}`)
-  return coin
-}
-
-function toUnit(cryptoAtoms, cryptoCode) {
-  const cryptoRec = getCryptoCurrency(cryptoCode)
-  const unitScale = cryptoRec.unitScale
-  return cryptoAtoms.shiftedBy(-unitScale)
-}
-
-function formatCryptoAddress(cryptoCode = '', address = '') {
-  return cryptoCode === 'BCH' ? address.replace('bitcoincash:', '') : address
-}
-
-export { toUnit, formatCryptoAddress }

package-lock.json

@@ -6494,14 +6494,6 @@
         }
       }
     },
-    "@haensl/subset-sum": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@haensl/subset-sum/-/subset-sum-3.0.5.tgz",
-      "integrity": "sha512-ySEbozvn6tzZNemM+3Sm2ZBkALuwzTQnhlIhA6Sw5Ja55QOPeEtZJMtR+TqHCvxdhfP61I9XxXpqZVlyvgvcqw==",
-      "requires": {
-        "@babel/runtime": "^7.11.2"
-      }
-    },
     "@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",

package.json

@@ -9,7 +9,7 @@
     "@ethereumjs/common": "^2.6.4",
     "@ethereumjs/tx": "^3.5.1",
     "@graphql-tools/merge": "^6.2.5",
-    "@lamassu/coins": "../lamassu-coins",
+    "@lamassu/coins": "v1.3.1-trx.1",
     "@simplewebauthn/server": "^3.0.0",
     "@vonage/auth": "^1.5.0",
     "@vonage/sms": "^1.7.0",