Merge branch 'dev'

package.json

@@ -5,7 +5,7 @@
     "@babel/polyfill": "^7.0.0-beta.44",
     "@babel/preset-env": "^7.0.0-beta.44",
     "@babel/register": "^7.0.0-beta.44",
-    "axios-mock-adapter": "^1.14.0",
+    "axios-mock-adapter": "^1.15.0",
     "babel-loader": "^8.0.0-beta.0",
     "babel-plugin-istanbul": "^4.1.6",
     "chai": "^4.0.2",
@@ -21,8 +21,8 @@
     "mocha": "^5.0.5",
     "nyc": "^11.5.0",
     "typescript": "^2.8.1",
-    "webpack": "^4.4.1",
-    "webpack-cli": "^2.0.13",
+    "webpack": "^4.5.0",
+    "webpack-cli": "^2.0.14",
     "zopfli-webpack-plugin": "^0.1.0"
   },
   "name": "@cityofzion/neon-js",

src/transactions/strategy.js

@@ -32,9 +32,9 @@ export const biggestFirst = (assetBalance, requiredAmt) => {
  */
 export const balancedApproach = (assetBalance, requiredAmt) => {
   // Ascending sort first
-  assetBalance.unspent.sort((a, b) => a.value.sub(b.value))
+  assetBalance.unspent.sort((a, b) => a.value.sub(b.value).toNumber())
   // Trim off coins larger than requiredAmt
-  const smallCoins = assetBalance.unspent.filter((c) => c.value <= requiredAmt)
+  const smallCoins = assetBalance.unspent.filter((c) => c.value.lte(requiredAmt))
   if (smallCoins.length === 0) return [assetBalance.unspent[0]]
   // Check for naive solution
   const i = smallCoins.findIndex((c) => requiredAmt.eq(c.value))

test/unit/transactions/strategy.js

@@ -1,20 +1,20 @@
 import { smallestFirst, biggestFirst, balancedApproach } from '../../../src/transactions/strategy'
 import Coin from '../../../src/wallet/components/Coin'
-import {Fixed8} from '../../../src/utils'
+import { Fixed8 } from '../../../src/utils'
 
 describe('Strategy', function () {
   let coins
   let assetBalance
 
   beforeEach(() => {
     coins = [
-      Coin({txid: '1', value: 1}),
-      Coin({txid: '2', value: 2}),
-      Coin({txid: '3', value: 3}),
-      Coin({txid: '4', value: 4}),
-      Coin({txid: '5', value: 5}),
-      Coin({txid: '6', value: 6}),
-      Coin({txid: '7', value: 7})
+      Coin({ txid: '1', value: 1 }),
+      Coin({ txid: '2', value: 2 }),
+      Coin({ txid: '3', value: 3 }),
+      Coin({ txid: '4', value: 4 }),
+      Coin({ txid: '5', value: 5 }),
+      Coin({ txid: '6', value: 6 }),
+      Coin({ txid: '7', value: 7 })
     ]
     assetBalance = {
       unspent: coins.slice(0)
@@ -45,5 +45,15 @@ describe('Strategy', function () {
       const result = balancedApproach(assetBalance, new Fixed8(4.1))
       result.should.have.members([coins[0], coins[3]])
     })
+
+    it('big amt', () => {
+      const result = balancedApproach(assetBalance, new Fixed8(20))
+      result.should.have.members([coins[6], coins[0], coins[1], coins[2], coins[3], coins[4]])
+    })
+
+    it('all', () => {
+      const result = balancedApproach(assetBalance, new Fixed8(28))
+      result.should.have.members([coins[0], coins[1], coins[2], coins[3], coins[4], coins[5], coins[6]])
+    })
   })
 })