Fix USDT payment

dapps/marketplace/src/components/WithPrices.js

@@ -4,10 +4,7 @@ import floor from 'lodash/floor'
 
 import supportedTokens from '@origin/graphql/src/utils/supportedTokens'
 
-// web3.utils.toWei only accepts up to 18 decimal places
-function removeExtraDecimals(numStr) {
-  return numStr.replace(/^([0-9]+\.[0-9]{18}).*/, '$1')
-}
+import getUnitTokenValue from '@origin/graphql/src/utils/unitTokenValue'
 
 /**
  * Given a list of tokens and a price, returns an object with information on
@@ -131,12 +128,19 @@ const WithPrices = ({
     }
   }
 
+  if (!suggestedToken) {
+    // Let's default to something
+    suggestedToken = listing.acceptedTokens[0].id
+  }
+
   return children({ prices: wallet, tokenStatus, suggestedToken })
 }
 
 function tokenStatusFor(target, wallet, proxy) {
-  const targetWei = removeExtraDecimals(get(wallet, `${target}.amount`) || '0')
-  const targetValue = web3.utils.toBN(web3.utils.toWei(targetWei, 'ether'))
+  const targetValue = getUnitTokenValue(
+    get(wallet, `${target}.amount`) || '0',
+    target
+  )
 
   const walletBalance = get(wallet, `${target}.currency.balance`) || '0'
   const availableBalance = web3.utils.toBN(walletBalance)

dapps/marketplace/src/pages/listing/PaymentMethods.js

@@ -41,7 +41,7 @@ const PaymentAmountRaw = ({
     }
   }, [paymentMethod, token])
 
-  if (!tokenObj || tokenObj.loading) {
+  if (tokenStatus.loading || !tokenObj) {
     return (
       <div className="actions">
         <button className="btn btn-primary btn-rounded" disabled={true}>

packages/contracts/build/contracts_rinkeby.json

@@ -11,5 +11,5 @@
   "IdentityProxyImplementation": "0x8ACcCe67F87508814e79f3970F58c5D0cd31CacB",
   "OGN": "0xa115e16ef6e217f7a327a57031f75ce0487aadb8",
   "DAI": "0x2448eE2641d78CC42D7AD76498917359D961A783",
-  "USDT": "0xfb1d709cb959ac0ea14cad0927eabc7832e65058"
+  "USDT": "0xd2e491c652b9eff6b4dbdc0cb041c7ad2242630b"
 }

packages/graphql/fixtures/populate.js

@@ -337,7 +337,7 @@ export default async function populate(gqlClient, log, done) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18',
+    decimals: '6',
     supply: '3000000000'
   })
   log(`Deployed Tether to ${USDT.contractAddress}`)

packages/graphql/src/configs/docker.js

@@ -99,7 +99,7 @@ if (addresses.USDT) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18'
+    decimals: '6'
   })
 }
 

packages/graphql/src/configs/localhost.js

@@ -80,7 +80,7 @@ if (addresses.USDT) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18'
+    decimals: '6'
   })
 }
 

packages/graphql/src/configs/localsecure.js

@@ -57,7 +57,7 @@ if (addresses.USDT) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18'
+    decimals: '6'
   })
 }
 

packages/graphql/src/configs/mainnet.js

@@ -85,7 +85,7 @@ export default {
       type: 'Standard',
       name: 'Tether',
       symbol: 'USDT',
-      decimals: '18'
+      decimals: '6'
     }
   ],
   DaiExchange: addresses.UniswapDaiExchange,

packages/graphql/src/configs/origin.js

@@ -53,7 +53,7 @@ export default {
       type: 'Standard',
       name: 'Tether',
       symbol: 'USDT',
-      decimals: '18'
+      decimals: '6'
     }
   ],
 

packages/graphql/src/configs/rinkeby.js

@@ -63,7 +63,7 @@ export default {
       type: 'Standard',
       name: 'Tether',
       symbol: 'USDT',
-      decimals: '18'
+      decimals: '6'
     }
   ],
 

packages/graphql/src/configs/test.js

@@ -73,7 +73,7 @@ if (addresses.USDT) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18'
+    decimals: '6'
   })
 }
 

packages/graphql/src/configs/truffle.js

@@ -58,7 +58,7 @@ if (addresses.USDT) {
     type: 'Standard',
     name: 'Tether',
     symbol: 'USDT',
-    decimals: '18'
+    decimals: '6'
   })
 }
 

packages/graphql/src/mutations/token/deployToken.js

@@ -2,11 +2,12 @@ import OriginToken from '@origin/contracts/build/contracts/OriginToken'
 import StandardToken from '@origin/contracts/build/contracts/TestToken'
 import contracts from '../../contracts'
 import txHelper, { checkMetaMask } from '../_txHelper'
+import getUnitTokenValue from '../../utils/unitTokenValue'
 
 async function deployToken(_, { type, name, decimals, supply, symbol, from }) {
   const web3 = contracts.web3Exec
   await checkMetaMask(from)
-  const supplyWei = web3.utils.toWei(supply, 'ether')
+  const supplyWei = getUnitTokenValue(supply, parseInt(decimals))
   let tx, Contract
 
   if (type === 'Standard') {

packages/graphql/src/mutations/token/transferToken.js

@@ -1,5 +1,6 @@
 import txHelper, { checkMetaMask } from '../_txHelper'
 import contracts from '../../contracts'
+import getUnitTokenValue from '../../utils/unitTokenValue'
 
 async function transferToken(_, { token, from, to, value }) {
   const contract = contracts.tokens.find(
@@ -10,7 +11,7 @@ async function transferToken(_, { token, from, to, value }) {
     console.log(token, 'not found')
     return
   }
-  value = contracts.web3.utils.toWei(value, 'ether')
+  value = getUnitTokenValue(value, token)
   const tx = contract.methods.transfer(to, value)
   return txHelper({ tx, from, mutation: 'transferToken', gas: 4612388 })
 }

packages/graphql/src/mutations/token/updateTokenAllowance.js

@@ -1,5 +1,8 @@
 import txHelper, { checkMetaMask } from '../_txHelper'
 import contracts from '../../contracts'
+
+import getUnitTokenValue from '../../utils/unitTokenValue'
+
 import createDebug from 'debug'
 const debug = createDebug('origin:updateTokenAllowance:')
 
@@ -17,7 +20,7 @@ async function updateTokenAllowance(_, { token, from, to, value }) {
   }
 
   await checkMetaMask(from)
-  value = contracts.web3.utils.toWei(value, 'ether')
+  value = getUnitTokenValue(value, token)
   const tx = tokenContract.contractExec.methods.approve(to, value)
   const gas = await tx.estimateGas({ from })
   debug({ token, from, to, value })

packages/graphql/src/utils/unitTokenValue.js

@@ -0,0 +1,77 @@
+import memoize from 'lodash/memoize'
+import contracts from '../contracts'
+import currencies from './currencies'
+
+/**
+ * Get the ether unit that has a certain number of decimals
+ *
+ * Ref: https://web3js.readthedocs.io/en/v1.2.0/web3-utils.html#id88
+ *
+ * @param {Number} decimals number of decimals
+ *
+ * @returns {String} the ether unit that has `decimals` decimals
+ */
+const getUnitWithDecimals = memoize(decimals => {
+  const web3 = contracts.web3
+
+  const unit = Object.keys(web3.utils.unitMap).find(unit => {
+    const valueInWei = web3.utils.unitMap[unit]
+
+    const zeroCount = valueInWei.length - valueInWei.replace(/0/g, '').length
+
+    return zeroCount === decimals
+  })
+
+  return unit
+})
+
+/**
+ * Truncates the big numbers upto `n` decimals
+ *
+ * @param {String} numStr The big number as string
+ * @param {Number} decimals Number of decimals to truncate to
+ *
+ * @return {String} truncated number as string
+ */
+function removeExtraDecimals(numStr, decimals) {
+  return numStr.replace(
+    new RegExp(`^([0-9]+\\.[0-9]{${decimals || 18}}).*`),
+    '$1'
+  )
+}
+
+/**
+ * Takes in a token value with decimals and returns the token's value
+ * with the smallest unit possible without any decimals
+ *
+ * @param {String} amount The token value with decimals
+ * @param {String|Number} token The token ID or the number of decimals
+ *
+ * @returns {String} `amount` represented in smallest unit of `token`
+ */
+function getUnitTokenValue(amount, tokenOrDecimals) {
+  const web3 = contracts.web3
+
+  let tokenDecimals = tokenOrDecimals
+
+  if (typeof tokenOrDecimals === 'string') {
+    const tokenObj = currencies.data[tokenOrDecimals]
+
+    if (!tokenObj) {
+      // Fallback
+      return web3.utils.toWei(removeExtraDecimals(amount, 18), 'ether')
+    }
+
+    tokenDecimals = tokenObj.decimals
+  }
+
+  const targetWei = removeExtraDecimals(amount, tokenDecimals)
+
+  const targetUnit = getUnitWithDecimals(tokenDecimals)
+
+  const targetValue = web3.utils.toBN(web3.utils.toWei(targetWei, targetUnit))
+
+  return targetValue
+}
+
+export default getUnitTokenValue