swapped currency

removed log

added returns back in just in case

added original rates

removed helper references

updated runtime currency to cache for 5 mins

linted

updated calls to use fewer custom ones

fixed tests

added choices to adFree

updated runtime currency

updated relativeCurrencyQuery

removed tonumber as return changed

remove strict checks on publisher and owner in settlement doc (#414)

Log sentry release (#410)

updated require structure for bat utils and balance server (#291)

added tests and reconnect mechanisms to redis (#343)

delete all the things (#416)

rework signed txn validation (#418)

added check for accounts transactions endpoint (#420)

changed response to string (#419)

added grafana and prometheus... unable to login (#406)

fix error code on claim no longer avail, add count on grants b4 offer (#422)

remove dependency on unsignedTx (#423)

fixes failure from extra promo in db (#425)

Sentry upgrade (#428)

swapped currency

changed ratios url to staging

Author: maikelmclauflin

bat-utils/lib/runtime-currency.test.js

@@ -70,12 +70,13 @@ test('capture exception is passed up to runtime', async (t) => {
 
 test('rates are provided for basic tokens', async (t) => {
   const knownRateKeys = currency.knownRateKeys
-  t.plan(2 + knownRateKeys.length)
+  t.plan(2 + knownRateKeys.length * 2)
   let result
   result = await currency.rates('BAT')
   t.true(_.isObject(result))
   t.true(knownRateKeys.length > 1)
   knownRateKeys.forEach((key) => {
+    t.true(_.isString(result[key]))
     t.true(_.isNumber(+result[key]))
   })
 })

config.js

@@ -109,7 +109,7 @@ module.exports =
 { altcurrency           : process.env.ALTCURRENCY               || 'BAT'
 , cache                 :
   { redis               :
-    { url                 : process.env.REDIS_URL                 || 'redis://localhost:6379' }
+    { url               : process.env.REDIS_URL                 || 'redis://localhost:6379' }
   }
 , currency              :
   { altcoins            : process.env.CRYPTO_CURRENCIES ? process.env.CRYPTO_CURRENCIES.split(',')

ledger/controllers/surveyor.js

@@ -33,10 +33,47 @@ const server = async (request, reply, runtime) => {
     surveyor.payload = entry.payload
     surveyor.parentId = entry.parentId
   }
-
+  if (surveyor) {
+    await addChoices(runtime, surveyor)
+  }
   return surveyor
 }
 
+async function addChoices (runtime, surveyor) {
+  const payload = surveyor.payload || {}
+  surveyor.payload = payload
+  const adFree = payload.adFree || {}
+  payload.adFree = adFree
+  adFree.choices = await getAdjustedChoices(runtime, 'USD', ['BAT'])
+}
+
+async function getAdjustedChoices (runtime, base, currencies) {
+  const rates = await runtime.currency.rates(base, currencies)
+  return underscore.mapObject(rates, choicesPrices)
+}
+
+function choicesPrices (ratio) {
+  const basePrice = 1 / ratio
+  const table = [
+    [3, 5, 7, 10, 20],
+    [4, 6, 9, 12, 25],
+    [5, 8, 11, 17, 35],
+    [6, 10, 14, 20, 40],
+    [9, 12, 20, 35, 50],
+    [15, 25, 35, 50, 100],
+    [20, 35, 50, 85, 175],
+    [30, 50, 70, 100, 200]
+  ]
+  const priceIncrements = [1, 0.8, 0.6, 0.5, 0.35, 0.2, 0.15, 0.1]
+  let index = underscore.findIndex(priceIncrements, (increment) => {
+    return increment <= basePrice
+  })
+  if (underscore.isUndefined(index)) {
+    index = priceIncrements.length - 1
+  }
+  return table[index]
+}
+
 const registrarType = (surveyorType) => {
   return { contribution: 'persona', voting: 'viewing' }[surveyorType]
 }
@@ -305,8 +342,12 @@ v2.phase1 =
     })
 
     const payload = surveyor.payload
+    const surveyorJSON = underscore.extend({
+      signature,
+      payload
+    }, surveyor.publicInfo())
 
-    reply(underscore.extend({ signature: signature, payload: payload }, surveyor.publicInfo()))
+    reply(surveyorJSON)
   }
 },
 

test/e2e.integration.test.js

@@ -168,6 +168,10 @@ test('ledger : v2 contribution workflow with uphold BAT wallet', async t => {
 
   t.true(response.body.hasOwnProperty('payload'))
   t.true(response.body.payload.hasOwnProperty('adFree'))
+  t.true(response.body.payload.adFree.hasOwnProperty('choices'))
+  t.true(_.isArray(response.body.payload.adFree.choices.BAT))
+  t.true(response.body.payload.adFree.choices.BAT.length === 5)
+  console.log(response.body.payload.adFree)
   t.true(response.body.payload.adFree.hasOwnProperty('probi'))
   const donateAmt = new BigNumber(response.body.payload.adFree.probi).dividedBy('1e18').toNumber()