Merge branch 'dev-alessandro'

provable-things · Dec 10, 2020 · 826a03f · 826a03f
2 parents 9cffabb + 2c37259
commit 826a03f
Show file tree

Hide file tree

Showing 32 changed files with 543 additions and 192 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.7.1"
+  "version": "0.8.0"
 }
diff --git a/packages/ptokens-deposit-address/package.json b/packages/ptokens-deposit-address/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ptokens-deposit-address",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "repo holding the code related to deposit addresses",
   "repository": "https://github.com/provable-things/ptokens.js/tree/master/packages/ptokens-deposit-address",
   "main": "dist/ptokens-deposit-address.cjs.js",
@@ -32,9 +32,9 @@
     "bitcoinjs-lib": "^5.1.6",
     "chai": "^4.2.0",
     "eosjs": "^20.0.3",
-    "ptokens-node": "^0.7.1",
-    "ptokens-providers": "^0.7.1",
-    "ptokens-utils": "^0.7.1",
+    "ptokens-node": "^0.8.0",
+    "ptokens-providers": "^0.8.0",
+    "ptokens-utils": "^0.8.0",
     "web3": "^1.2.2"
   },
   "devDependencies": {

diff --git a/packages/ptokens-deposit-address/src/index.js b/packages/ptokens-deposit-address/src/index.js
@@ -133,7 +133,8 @@ export class DepositAddress {
 
     // NOTE: eos account name are utf-8 encoded
     const hostAddressBuf =
-      this.hostBlockchain === constants.blockchains.Eosio
+      this.hostBlockchain === constants.blockchains.Eosio ||
+      this.hostBlockchain === constants.blockchains.Telos
         ? Buffer.from(this.hostAddress, 'utf-8')
         : Buffer.from(utils.eth.removeHexPrefix(this.hostAddress), 'hex')
 
@@ -185,35 +186,38 @@ export class DepositAddress {
         this.hostBlockchain
       )
 
-      const nativeTxId = await utils[
-        shortNativeBlockchain
-      ].monitorUtxoByAddress(
-        this.nativeNetwork,
-        this.value,
-        promiEvent.eventEmitter,
-        POLLING_TIME,
-        'nativeTxBroadcasted',
-        'nativeTxConfirmed',
-        confirmations[shortNativeBlockchain]
-      )
+      // prettier-ignore
+      const nativeTxId = await utils[shortNativeBlockchain]
+        .monitorUtxoByAddress(
+          this.nativeNetwork,
+          this.value,
+          promiEvent.eventEmitter,
+          POLLING_TIME,
+          'nativeTxBroadcasted',
+          'nativeTxConfirmed',
+          confirmations[shortNativeBlockchain]
+        )
 
       const broadcastedHostTxReport = await this.node.monitorIncomingTransaction(
         nativeTxId,
         promiEvent.eventEmitter
       )
 
-      const hostTxReceipt = await utils[
-        shortHostBlockchain
-      ].waitForTransactionConfirmation(
-        this.hostApi,
-        broadcastedHostTxReport.broadcast_tx_hash,
-        HOST_NODE_POLLING_TIME_INTERVAL
-      )
-
-      promiEvent.eventEmitter.emit(
-        hostBlockchainEvents[this.hostBlockchain],
-        hostTxReceipt
-      )
+      // prettier-ignore
+      const hostTxReceipt = await utils[shortHostBlockchain]
+        .waitForTransactionConfirmation(
+          this.hostApi,
+          broadcastedHostTxReport.broadcast_tx_hash,
+          HOST_NODE_POLLING_TIME_INTERVAL
+        )
+
+      if (this.hostBlockchain !== utils.constants.blockchains.Telos) {
+        // NOTE: 'onEosTxConfirmed & onEthTxConfirmed' will be removed in version >= 1.0.0
+        promiEvent.eventEmitter.emit(
+          hostBlockchainEvents[this.hostBlockchain],
+          hostTxReceipt
+        )
+      }
       promiEvent.eventEmitter.emit('hostTxConfirmed', hostTxReceipt)
 
       promiEvent.resolve({

diff --git a/packages/ptokens-node-selector/package.json b/packages/ptokens-node-selector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ptokens-node-selector",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "repo holding the code for selecting validator nodes",
   "repository": "https://github.com/provable-things/ptokens.js/tree/master/packages/ptokens-node-selector",
   "main": "dist/ptokens-node-selector.cjs.js",
@@ -21,9 +21,9 @@
     "@types/node": "^12.6.1",
     "axios": "^0.19.0",
     "chai": "^4.2.0",
-    "ptokens-node": "^0.7.1",
-    "ptokens-utils": "^0.7.1",
-    "ptokens-providers": "^0.7.1"
+    "ptokens-node": "^0.8.0",
+    "ptokens-providers": "^0.8.0",
+    "ptokens-utils": "^0.8.0"
   },
   "devDependencies": {
     "dtslint": "0.4.2",

diff --git a/packages/ptokens-node/package.json b/packages/ptokens-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ptokens-node",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "repo holding the code for interacting with a Node",
   "repository": "https://github.com/provable-things/ptokens.js/tree/master/packages/ptokens-node",
   "main": "dist/ptokens-node.cjs.js",
@@ -31,8 +31,8 @@
     "eventemitter3": "^4.0.0",
     "jsonrpc-lite": "^2.2.0",
     "light-async-polling": "^1.0.2",
-    "ptokens-providers": "^0.7.1",
-    "ptokens-utils": "^0.7.1",
+    "ptokens-providers": "^0.8.0",
+    "ptokens-utils": "^0.8.0",
     "uuid": "^8.3.1",
     "web3-core-promievent": "^1.2.5-rc.0"
   },

diff --git a/packages/ptokens-node/src/index.js b/packages/ptokens-node/src/index.js
@@ -3,7 +3,7 @@ import { helpers } from 'ptokens-utils'
 import jsonrpc from 'jsonrpc-lite'
 import { v4 as uuidv4 } from 'uuid'
 
-const NODE_POLLING_TIME = 200
+const NODE_POLLING_TIME = 2000
 const REPORT_LIMIT = 100
 
 export class Node {

diff --git a/packages/ptokens-pbtc/package.json b/packages/ptokens-pbtc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ptokens-pbtc",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "repo holding the code for interacting with pBTC",
   "repository": "https://github.com/provable-things/ptokens.js/tree/master/packages/ptokens-pbtc",
   "main": "dist/ptokens-pbtc.cjs.js",
@@ -31,11 +31,11 @@
     "bitcoinjs-lib": "^5.1.6",
     "chai": "^4.2.0",
     "eosjs": "^20.0.0",
-    "ptokens-deposit-address": "^0.7.1",
-    "ptokens-node": "^0.7.1",
-    "ptokens-node-selector": "^0.7.1",
-    "ptokens-providers": "^0.7.1",
-    "ptokens-utils": "^0.7.1",
+    "ptokens-deposit-address": "^0.8.0",
+    "ptokens-node": "^0.8.0",
+    "ptokens-node-selector": "^0.8.0",
+    "ptokens-providers": "^0.8.0",
+    "ptokens-utils": "^0.8.0",
     "web3": "^1.2.2",
     "web3-core-promievent": "^1.2.1",
     "web3-utils": "^1.2.4"

diff --git a/packages/ptokens-pbtc/src/index.js b/packages/ptokens-pbtc/src/index.js
@@ -4,7 +4,6 @@ import { NodeSelector } from 'ptokens-node-selector'
 import { constants, eth, eos, btc, helpers, redeemFrom } from 'ptokens-utils'
 import { DepositAddress } from 'ptokens-deposit-address'
 import Web3Utils from 'web3-utils'
-import BigNumber from 'bignumber.js'
 
 const MINIMUM_BTC_REDEEMABLE = 0.00005
 
@@ -113,7 +112,7 @@ export class pBTC extends NodeSelector {
   }
 
   /**
-   * @param {Number} _amount
+   * @param {Number|BigNumber|String} _amount
    * @param {String} _btcAddress
    * @param {RedeemOptions} _options
    */
@@ -138,7 +137,6 @@ export class pBTC extends NodeSelector {
         if (!this.selectedNode) await this.select()
 
         // prettier-ignore
-        const decimals = this.hostBlockchain === constants.blockchains.Ethereum ? 18 : 8
         const contractAddress = await this._getContractAddress()
 
         const { redeemFromEthereum, redeemFromEosio } = redeemFrom
@@ -154,31 +152,33 @@ export class pBTC extends NodeSelector {
               contractAddress,
               value: 0
             },
-            [
-              eth.onChainFormat(new BigNumber(_amount), decimals).toFixed(),
-              _btcAddress
-            ],
+            [_amount, _btcAddress],
             promiEvent,
-            'nativeTxBroadcasted'
+            'hostTxBroadcasted'
           )
           // NOTE: 'onEthTxConfirmed' will be removed in version >= 1.0.0
           promiEvent.eventEmitter.emit('onEthTxConfirmed', ethTxReceipt)
           promiEvent.eventEmitter.emit('hostTxConfirmed', ethTxReceipt)
           hostTxHash = ethTxReceipt.transactionHash
         }
 
-        if (this.hostBlockchain === constants.blockchains.Eosio) {
+        if (
+          this.hostBlockchain === constants.blockchains.Eosio ||
+          this.hostBlockchain === constants.blockchains.Telos
+        ) {
           const eosTxReceipt = await redeemFromEosio(
             this.hostApi,
             _amount,
             _btcAddress,
-            decimals,
+            8,
             contractAddress,
             constants.pTokens.pBTC
           )
 
-          // NOTE: 'onEosTxConfirmed' will be removed in version >= 1.0.0
-          promiEvent.eventEmitter.emit('onEosTxConfirmed', eosTxReceipt)
+          if (this.hostBlockchain === constants.blockchains.Eosio) {
+            // NOTE: 'onEosTxConfirmed' will be removed in version >= 1.0.0
+            promiEvent.eventEmitter.emit('onEosTxConfirmed', eosTxReceipt)
+          }
           promiEvent.eventEmitter.emit('hostTxConfirmed', eosTxReceipt)
           hostTxHash = eosTxReceipt.transaction_id
         }
@@ -200,7 +200,7 @@ export class pBTC extends NodeSelector {
         promiEvent.eventEmitter.emit('nativeTxConfirmed', broadcastedBtcTxReceipt)
 
         promiEvent.resolve({
-          amount: _amount.toFixed(decimals),
+          amount: _amount,
           hostTx: hostTxHash,
           nativeTx: broadcastedBtcTxReport.broadcast_tx_hash,
           to: _btcAddress

diff --git a/packages/ptokens-pbtc/tests/ptokens-pbtc-on-eth.test.js b/packages/ptokens-pbtc/tests/ptokens-pbtc-on-eth.test.js
@@ -2,6 +2,7 @@ import { pBTC } from '../src/index'
 import { expect } from 'chai'
 import { sendBitcoin } from './utils'
 import { constants } from 'ptokens-utils'
+import BigNumber from 'bignumber.js'
 // import qrcode from 'qrcode-terminal'
 
 const ETH_TESTING_ADDRESS = ''
@@ -110,7 +111,9 @@ test('Should monitor an issuing of 0.00050100 pBTC on Ethereum', async () => {
 })
 
 test('Should redeem 0.0005 pBTC on Ethereum', async () => {
-  const amountToRedeem = 0.0005
+  const amountToRedeem = BigNumber(0.0005)
+    .multipliedBy(10 ** 18)
+    .toFixed()
   let ethTxBroadcasted = 0
   let ethTxIsConfirmed = 0
   let nodeHasReceivedTx = 0
@@ -123,10 +126,7 @@ test('Should redeem 0.0005 pBTC on Ethereum', async () => {
           gasPrice: 75e9,
           gas: 200000
         })
-        .once('onEthTxBroadcasted', () => {
-          ethTxBroadcasted += 1
-        })
-        .once('nativeTxBroadcasted', () => {
+        .once('hostTxBroadcasted', () => {
           ethTxBroadcasted += 1
         })
         .once('onEthTxConfirmed', () => {
@@ -158,7 +158,7 @@ test('Should redeem 0.0005 pBTC on Ethereum', async () => {
     })
   await start()
 
-  expect(ethTxBroadcasted).to.equal(2)
+  expect(ethTxBroadcasted).to.equal(1)
   expect(ethTxIsConfirmed).to.equal(2)
   expect(nodeHasReceivedTx).to.equal(2)
   expect(nodeHasBroadcastedTx).to.equal(2)