Merge pull request #23 from navcoindev/v1.1.1

navcoindev · web-flow · commit d0c6bcc02f51 · 2017-04-22T16:09:33.000+12:00
V1.1.1
diff --git a/README.md b/README.md
@@ -98,9 +98,11 @@ Here are the detailed explaination of what the settings control and their defaul
 | `GLOBAL` | `object`      | true    | `none` | contains the global settings which control how your server operates |
 | `GLOBAL.serverType` | `string`      | true    | `INCOMING` | determines if your server is of incoming or outgoing type |
 | `GLOBAL.encryptedWallet` | `boolean`      | true    | `false` | flag for if the NavCoin and Subchain wallets are encrypted  |
+| `GLOBAL.preventSend` | `boolean`      | false    | `false` | flag to prevent sending of NAV & SUB for testing purposes  |
 | `GLOBAL.maintenance` | `boolean`      | false    | `false` | flag to turn your wallet to maintenance mode and restrict IP access  |
 | `GLOBAL.allowedIps` | `array`      | false    | `none` | array of allowed ip addresses when server is in maintenance mode  |
-| `GLOBAL.allowedIps[n]`       | `string`      | false    | `none` | ip address to allow for maintenance testing |
+| `GLOBAL.allowedIps[n]`       | `object`      | true    | `none` | contains the address information of a single user allowed while in maintenance |
+| `GLOBAL.allowedIps[n].ipAddress` |  `string` | true | `none` | ip address to allow for maintenance testing |
 | `INCOMING` | `object`      | true    | `none` | contains all the settings which are unique to incoming servers |
 | `INCOMING.local`       | `object`      | true    | `none` | contains the address information of the local (incoming) server |
 | `INCOMING.local.ipAddress` |  `string` | true | `none` | IP address of the local server |
diff --git a/config/example-incoming.default.json b/config/example-incoming.default.json
@@ -2,10 +2,11 @@
   "GLOBAL": {
     "serverType": "INCOMING",
     "encryptedWallet": false,
-    "maintenance": true,
-    "allowedIps": [
-      "192.168.1.1"
-    ]
+    "maintenance": false,
+    "preventSend": false,
+    "allowedIps": [{
+      "ipAddress": "192.168.1.1"
+    }]
   },
   "INCOMING": {
     "local": {
diff --git a/config/example-outgoing.default.json b/config/example-outgoing.default.json
@@ -1,7 +1,8 @@
 {
   "GLOBAL": {
     "serverType": "OUTGOING",
-    "encryptedWallet": false
+    "encryptedWallet": false,
+    "preventSend": true
   },
   "OUTGOING": {
     "local": {
diff --git a/dist/navtech.js b/dist/navtech.js
diff --git a/src/lib/ProcessIncoming.js b/src/lib/ProcessIncoming.js
@@ -2,9 +2,9 @@ const lodash = require('lodash')
 const ursa = require('ursa')
 
 let Logger = require('./Logger.js') // eslint-disable-line
-let EncryptedData = require('./EncryptedData.js')
+let EncryptedData = require('./EncryptedData.js') // eslint-disable-line
 const privateSettings = require('../settings/private.settings.json')
-let SendToAddress = require('./SendToAddress.js')
+let SendToAddress = require('./SendToAddress.js') // eslint-disable-line
 
 const ProcessIncoming = {}
 
diff --git a/src/lib/RandomizeTransactions.js b/src/lib/RandomizeTransactions.js
@@ -40,7 +40,7 @@ RandomizeTransactions.randomizeIncoming = () => {
       const randAmount = Math.round(randSatoshis / satoshiFactor)
 
       if (randAmount > sumProcessed - runningTotal || i === RandomizeTransactions.runtime.addresses.length - 1) {
-        const remainingAmount = sumProcessed - runningTotal
+        const remainingAmount = Math.round(sumProcessed - runningTotal)
         RandomizeTransactions.runtime.transactions[RandomizeTransactions.runtime.addresses[i]] = remainingAmount / satoshiFactor
         runningTotal += remainingAmount
       } else {
@@ -91,7 +91,7 @@ RandomizeTransactions.randomizeOutgoing = () => {
       const randAmount = Math.round(randSatoshis / satoshiFactor)
 
       if (randAmount > sumPendingSatoshi - runningTotal || i === numTransactions - 1) {
-        const remainingAmount = Math.floor(sumPendingSatoshi - runningTotal)
+        const remainingAmount = Math.round(sumPendingSatoshi - runningTotal)
         RandomizeTransactions.runtime.transactions.push(remainingAmount / satoshiFactor)
         runningTotal += remainingAmount
       } else {
diff --git a/src/lib/ReturnToSender.js b/src/lib/ReturnToSender.js
@@ -94,7 +94,11 @@ ReturnToSender.decodeOriginInputRaw = (options, callback) => {
 
 ReturnToSender.buildTransaction = (options, callback) => {
   const outgoingTransactions = {}
-  outgoingTransactions[options.origin] = options.transaction.amount - privateSettings.txFee
+  const satoshiFactor = 100000000
+  const newAmountFloat = options.transaction.amount - privateSettings.txFee
+  const amountSatoshi = Math.round(newAmountFloat * satoshiFactor)
+
+  outgoingTransactions[options.origin] = amountSatoshi / satoshiFactor
 
   const spentTransactions = [{
     txid: options.transaction.txid,
diff --git a/src/lib/SendRawTransaction.js b/src/lib/SendRawTransaction.js
@@ -21,6 +21,7 @@ SendRawTransaction.createRaw = (options, callback) => {
     callback(false, { message: 'invalid options provided to SelectOutgoing.run' })
     return
   }
+
   SendRawTransaction.runtime = {} // wipe the runtime variables
   if (options.encrypted) {
     options.client.createRawTransaction(options.spentTransactions, options.outgoingTransactions, options.encrypted).then((rawTrans) => {
@@ -94,6 +95,11 @@ SendRawTransaction.walletUnlocked = (success, data) => {
 }
 
 SendRawTransaction.sendRaw = (options, callback) => {
+  if (globalSettings.preventSend) {
+    Logger.writeLog('RAW_TEST_001', 'preventSend triggered', { options })
+    callback(true, { rawOutcome: 'dummy-tx-id' })
+    return
+  }
   options.client.sendRawTransaction(options.signedRaw.hex).then((rawOutcome) => {
     callback(true, { rawOutcome })
   }).catch((err) => {
diff --git a/src/lib/SendToAddress.js b/src/lib/SendToAddress.js
@@ -22,6 +22,12 @@ SendToAddress.send = (options, callback) => {
     return
   }
 
+  if (globalSettings.preventSend) {
+    Logger.writeLog('STA_TEST_001', 'preventSend triggered', { options })
+    callback(true, { sendOutcome: 'dummy-tx-id', transaction: options.transaction })
+    return
+  }
+
   SendToAddress.runtime = {}
 
   if (options.counter && options.counter > 7) {
@@ -30,7 +36,11 @@ SendToAddress.send = (options, callback) => {
     return
   }
 
-  options.client.sendToAddress(options.address, parseFloat(options.amount), null, null, options.encrypted).then((sendOutcome) => {
+  const satoshiFactor = 100000000
+  const amountSatoshi = Math.round(options.amount * satoshiFactor)
+  const safeAmount = amountSatoshi / satoshiFactor
+
+  options.client.sendToAddress(options.address, safeAmount, null, null, options.encrypted).then((sendOutcome) => {
     if (sendOutcome) {
       callback(true, { sendOutcome, transaction: options.transaction })
       return
diff --git a/src/lib/SpendToHolding.js b/src/lib/SpendToHolding.js
@@ -34,11 +34,14 @@ SpendToHolding.createHoldingTransactions = (success, data) => {
     return
   }
 
-  let sumPending = 0
+  const satoshiFactor = 100000000
+  let sumPendingSatoshi = 0
   for (const successful of SpendToHolding.runtime.successfulSubTransactions) {
-    sumPending += successful.amount - privateSettings.txFee
+    sumPendingSatoshi += Math.round(successful.amount * satoshiFactor) - Math.round(privateSettings.txFee * satoshiFactor)
   }
 
+  const sumPending = sumPendingSatoshi / satoshiFactor
+
   const spentTransactions = []
 
   for (let i = 0; i < SpendToHolding.runtime.successfulSubTransactions.length; i++) {
diff --git a/test/ReturnToSender.spec.js b/test/ReturnToSender.spec.js
@@ -264,5 +264,33 @@ describe('[ReturnSubnav]', () => {
       ReturnToSender.__set__('privateSettings', privateSettings)
       ReturnToSender.buildTransaction({ client, origin, transaction }, callback)
     })
+    it('should build check the rounding is correct', (done) => {
+      const privateSettings = { txFee: 0.001 }
+      const callback = () => {}
+      const client = {}
+      const transaction = {
+        txid: '1234',
+        vout: 0,
+        amount: 100.123456781111111,
+      }
+      const origin = 'ZXCV'
+      const mockLogger = {
+        writeLog: sinon.spy(),
+      }
+      const SendRawTransaction = {
+        createRaw: (options, parsedCallback) => {
+          expect(parsedCallback).toBe(callback)
+          expect(options.outgoingTransactions).toEqual({ ZXCV: 100.12245678 })
+          expect(options.spentTransactions).toEqual([{ txid: '1234', vout: 0 }])
+          expect(options.client).toBe(client)
+          sinon.assert.notCalled(mockLogger.writeLog)
+          done()
+        },
+      }
+      ReturnToSender.__set__('Logger', mockLogger)
+      ReturnToSender.__set__('SendRawTransaction', SendRawTransaction)
+      ReturnToSender.__set__('privateSettings', privateSettings)
+      ReturnToSender.buildTransaction({ client, origin, transaction }, callback)
+    })
   })
 })
diff --git a/test/SendToAddress.spec.js b/test/SendToAddress.spec.js
@@ -7,7 +7,7 @@ const sinon = require('sinon')
 let SendToAddress = rewire('../src/lib/SendToAddress')
 
 describe('[SendToAddress]', () => {
-  describe('(run)', () => {
+  describe('(send)', () => {
     it('should fail on params', (done) => {
       const callback = (success, data) => {
         expect(success).toBe(false)
@@ -67,7 +67,7 @@ describe('[SendToAddress]', () => {
       SendToAddress.__set__('Logger', mockLogger)
       SendToAddress.send({ address, amount, client, transaction, counter: 1 }, callback)
     })
-    it('should have the right params and fail to send due to locked wallet', (done) => {
+    it('should have the right params and succeed', (done) => {
       const callback = (success, data) => {
         expect(success).toBe(true)
         expect(data.transaction).toBe(transaction)
@@ -88,6 +88,27 @@ describe('[SendToAddress]', () => {
       SendToAddress.__set__('Logger', mockLogger)
       SendToAddress.send({ address, amount, client, transaction, counter: 1 }, callback)
     })
+    it('should have the right params and successfully round the transaction', (done) => {
+      const callback = (success, data) => {
+        expect(success).toBe(true)
+        expect(data.transaction).toBe(transaction)
+        expect(data.sendOutcome.amount).toBe(100.12345678)
+        sinon.assert.notCalled(mockLogger.writeLog)
+        done()
+      }
+      const client = {
+        sendToAddress: (address, amount) => { return Promise.resolve({ amount }) },
+        port: '44444',
+      }
+      const address = 'ADDR'
+      const amount = 100.123456781111111
+      const transaction = { txid: '1234' }
+      const mockLogger = {
+        writeLog: sinon.spy(),
+      }
+      SendToAddress.__set__('Logger', mockLogger)
+      SendToAddress.send({ address, amount, client, transaction, counter: 1 }, callback)
+    })
   })
   describe('(walletUnlocked)', () => {
     before(() => { // reset the rewired functions

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,14 @@ SpendToHolding.createHoldingTransactions = (success, data) => {`
`34`	`34`	`return`
`35`	`35`	`}`
`36`	`36`
`37`		`- let sumPending = 0`
	`37`	`+ const satoshiFactor = 100000000`
	`38`	`+ let sumPendingSatoshi = 0`
`38`	`39`	`for (const successful of SpendToHolding.runtime.successfulSubTransactions) {`
`39`		`- sumPending += successful.amount - privateSettings.txFee`
	`40`	`+ sumPendingSatoshi += Math.round(successful.amount * satoshiFactor) - Math.round(privateSettings.txFee * satoshiFactor)`
`40`	`41`	`}`
`41`	`42`
	`43`	`+ const sumPending = sumPendingSatoshi / satoshiFactor`
	`44`	`+`
`42`	`45`	`const spentTransactions = []`
`43`	`46`
`44`	`47`	`for (let i = 0; i < SpendToHolding.runtime.successfulSubTransactions.length; i++) {`