Merge pull request #258 from Permissionless-Software-Foundation/ct-unstable

feat(tx history): Updating to reflect changes in bch-api

package.json

@@ -40,7 +40,7 @@
     "@chris.troutner/bip32-utils": "1.0.5",
     "@psf/bip21": "2.0.1",
     "@psf/bitcoincash-ops": "2.0.0",
-    "@psf/bitcoincashjs-lib": "4.0.2",
+    "@psf/bitcoincashjs-lib": "4.0.3",
     "@psf/coininfo": "4.0.0",
     "axios": "0.26.1",
     "bc-bip68": "1.0.5",

src/electrumx.js

@@ -289,12 +289,12 @@ class ElectrumX {
    *   }
    *
    */
-  async transactions (address, usrObj = null) {
+  async transactions (address, usrObj = null, allTxs = false) {
     try {
       // Handle single address.
       if (typeof address === 'string') {
         const response = await axios.get(
-          `${this.restURL}electrumx/transactions/${address}`,
+          `${this.restURL}electrumx/transactions/${address}/${allTxs}`,
           this.axiosOptions
         )
         return response.data
@@ -305,7 +305,8 @@ class ElectrumX {
           `${this.restURL}electrumx/transactions`,
           {
             addresses: address,
-            usrObj // pass user data when making an internal call.
+            usrObj, // pass user data when making an internal call.
+            allTxs
           },
           this.axiosOptions
         )
@@ -315,6 +316,7 @@ class ElectrumX {
 
       throw new Error('Input address must be a string or array of strings.')
     } catch (error) {
+      // console.log('Error in transactions(): ', error)
       if (error.response && error.response.data) throw error.response.data
       else throw error
     }

src/encryption.js

@@ -32,6 +32,28 @@ class Encryption {
     _this = this
   }
 
+  /**
+   * @api encryption.getPubKey() getPubKey()
+   * @apiName Encryption getPubKey()
+   * @apiGroup Encryption
+   * @apiDescription Get the public key for an address
+   * Given an address, the command will search the blockchain for a public
+   * key associated with that address. The address needs to have made at least
+   * one spend transaction, in order for its public key to be retrievable.
+   *
+   * @apiExample Example usage:
+   *(async () => {
+   *  try {
+   *    const addr = 'bitcoincash:qqlrzp23w08434twmvr4fxw672whkjy0py26r63g3d'
+   *    const pubkey = await bchjs.encryption.getPubKey(addr);
+   *    console.log(pubkey);
+   *  } catch(err) {
+   *   console.error(err)
+   *  }
+   *})()
+   *
+   */
+
   // Search the blockchain for a public key associated with a BCH address.
   async getPubKey (addr) {
     try {

src/psf-slp-indexer.js

@@ -514,7 +514,7 @@ class PsfSlpIndexer {
    * }
    *
    */
-  async getTokenData2 (tokenId) {
+  async getTokenData2 (tokenId, updateCache = false) {
     try {
       const url = `${this.restURL}psf/slp/token/data2`
       // console.log(`url: ${url}`)
@@ -524,7 +524,7 @@ class PsfSlpIndexer {
         const response = await axios.post(
           // 'https://bchn.fullstack.cash/v5/psf/slp/token/data/',
           url,
-          { tokenId },
+          { tokenId, updateCache },
           this.axiosOptions
         )
         return response.data

test/integration/blockchain.js

@@ -318,7 +318,9 @@ describe('#blockchain', () => {
     it('should get info about the blockchain', async () => {
       const result = await bchjs.Blockchain.getBlockchainInfo()
 
-      console.log(`blockchain info: ${JSON.stringify(result, null, 2)}`)
+      // console.log(`blockchain info: ${JSON.stringify(result, null, 2)}`)
+
+      assert.property(result, 'blocks')
     })
   })
 })

test/integration/chains/bchn/utxo-integration.js

@@ -126,7 +126,7 @@ describe('#UTXO', () => {
   describe('#isValid', () => {
     it('should return true for valid UTXO with fullnode properties', async () => {
       const utxo = {
-        txid: 'b94e1ff82eb5781f98296f0af2488ff06202f12ee92b0175963b8dba688d1b40',
+        txid: '260d4fb4006a330660c805327c840d569d7547b7e3e9659fb423b3a041c2e254',
         vout: 0
       }
 
@@ -138,7 +138,7 @@ describe('#UTXO', () => {
 
     it('should return true for valid UTXO with fulcrum properties', async () => {
       const utxo = {
-        tx_hash: 'b94e1ff82eb5781f98296f0af2488ff06202f12ee92b0175963b8dba688d1b40',
+        tx_hash: '260d4fb4006a330660c805327c840d569d7547b7e3e9659fb423b3a041c2e254',
         tx_pos: 0
       }
 
@@ -173,7 +173,7 @@ describe('#UTXO', () => {
     })
 
     it('should process output of Utxo.get()', async () => {
-      const utxo = await bchjs.Utxo.get('bitcoincash:qr4yscpw9jgq8ltajfeknpj32kamkf9knujffcdhyq')
+      const utxo = await bchjs.Utxo.get('bitcoincash:qqgahqa5zkknmhmvsc98jndpwn3r77gqgc02x03jce')
       // console.log(`utxo: ${JSON.stringify(utxo, null, 2)}`)
 
       const result = await bchjs.Utxo.isValid(utxo.bchUtxos[0])

test/integration/control.js

@@ -15,7 +15,7 @@ describe('#control', () => {
   describe('#getNetworkInfo', () => {
     it('should get info on the full node', async () => {
       const result = await bchjs.Control.getNetworkInfo()
-      console.log(`result: ${JSON.stringify(result, null, 2)}`)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
       assert.property(result, 'version')
     })

test/integration/rawtransaction.js

@@ -204,7 +204,9 @@ describe('#rawtransaction', () => {
       const result = await bchjs.RawTransactions.decodeScript(hex)
       // console.log(`result ${JSON.stringify(result, null, 2)}`)
 
-      assert.hasAllKeys(result, ['asm', 'type', 'p2sh'])
+      assert.property(result, 'asm')
+      assert.property(result, 'type')
+      assert.property(result, 'p2sh')
     })
 
     // CT 2/20/19 - Waiting for this PR to be merged complete the test: