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

fix(Jenkins): Attempting to fix CI/CD

README.md

@@ -118,3 +118,5 @@ Copies of this repository are also published on [IPFS](https://ipfs.io).
 ## License
 
 [MIT](LICENSE.md)
+
+test

package.json

@@ -36,53 +36,53 @@
     "url": "git+https://github.com/Permissionless-Software-Foundation/bch-js.git"
   },
   "dependencies": {
-    "@psf/bip21": "^2.0.1",
-    "@psf/bip32-utils": "^1.0.0",
-    "@psf/bitcoincash-ops": "^2.0.0",
-    "@psf/bitcoincashjs-lib": "^4.0.2",
-    "@psf/coininfo": "^4.0.0",
-    "@uppy/core": "^1.10.4",
-    "@uppy/tus": "^1.5.12",
-    "axios": "^0.21.1",
-    "bc-bip68": "^1.0.5",
-    "bchaddrjs-slp": "^0.2.5",
-    "bigi": "^1.4.2",
-    "bignumber.js": "^9.0.0",
-    "bip-schnorr": "^0.3.0",
-    "bip38": "^2.0.2",
-    "bip39": "^3.0.2",
-    "bip66": "^1.1.5",
-    "bitcoinjs-message": "^2.0.0",
-    "bs58": "^4.0.1",
-    "ecashaddrjs": "^1.0.7",
-    "ini": "^1.3.8",
-    "randombytes": "^2.0.6",
-    "safe-buffer": "^5.1.2",
-    "satoshi-bitcoin": "^1.0.4",
+    "@psf/bip21": "2.0.1",
+    "@psf/bip32-utils": "1.0.1",
+    "@psf/bitcoincash-ops": "2.0.0",
+    "@psf/bitcoincashjs-lib": "4.0.2",
+    "@psf/coininfo": "4.0.0",
+    "@uppy/core": "1.10.4",
+    "@uppy/tus": "1.5.12",
+    "axios": "^0.21.4",
+    "bc-bip68": "1.0.5",
+    "bchaddrjs-slp": "0.2.5",
+    "bigi": "1.4.2",
+    "bignumber.js": "9.0.0",
+    "bip-schnorr": "0.3.0",
+    "bip38": "2.0.2",
+    "bip39": "3.0.2",
+    "bip66": "1.1.5",
+    "bitcoinjs-message": "2.0.0",
+    "bs58": "4.0.1",
+    "ecashaddrjs": "1.0.7",
+    "ini": "1.3.8",
+    "randombytes": "2.0.6",
+    "safe-buffer": "5.1.2",
+    "satoshi-bitcoin": "1.0.4",
     "slp-mdm": "0.0.6",
     "slp-parser": "0.0.4",
-    "wif": "^2.0.6"
+    "wif": "2.0.6"
   },
   "devDependencies": {
-    "apidoc": "^0.17.7",
-    "assert": "^2.0.0",
-    "chai": "^4.1.2",
-    "coveralls": "^3.0.2",
-    "eslint": "5.16.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-config-standard": "^14.1.0",
-    "eslint-plugin-node": "^9.1.0",
-    "eslint-plugin-prettier": "^3.1.0",
-    "eslint-plugin-standard": "^4.0.0",
-    "husky": "^4.3.6",
-    "lodash.clonedeep": "^4.5.0",
-    "mocha": "^9.1.3",
-    "node-mocks-http": "^1.7.0",
-    "nyc": "^15.1.0",
-    "prettier": "^1.18.2",
-    "semantic-release": "^17.3.9",
-    "sinon": "^7.3.2",
-    "standard": "^16.0.3"
+    "apidoc": "0.17.7",
+    "assert": "2.0.0",
+    "chai": "4.1.2",
+    "coveralls": "3.0.2",
+    "eslint": "^8.1.0",
+    "eslint-config-prettier": "6.0.0",
+    "eslint-config-standard": "14.1.0",
+    "eslint-plugin-node": "9.1.0",
+    "eslint-plugin-prettier": "3.1.0",
+    "eslint-plugin-standard": "4.0.0",
+    "husky": "^4.3.8",
+    "lodash.clonedeep": "4.5.0",
+    "mocha": "9.1.3",
+    "node-mocks-http": "1.7.0",
+    "nyc": "15.1.0",
+    "prettier": "1.18.2",
+    "semantic-release": "18.0.0",
+    "sinon": "7.3.2",
+    "standard": "^16.0.4"
   },
   "apidoc": {
     "title": "bch-js",

src/transaction.js

@@ -102,6 +102,7 @@ class Transaction {
         // Loop through each input and retrieve the token data.
         for (let i = 0; i < txDetails.vin.length; i++) {
           const thisVin = txDetails.vin[i]
+          // console.log(`thisVin: ${JSON.stringify(thisVin, null, 2)}`)
 
           try {
             // If decodeOpReturn() throws an error, then this input is not
@@ -112,7 +113,16 @@ class Transaction {
             // )
 
             let tokenQty = 0
-            if (inTokenData.txType === 'SEND') {
+
+            // Validate the input. Mark qty as null if not valid.
+            const vinIsValid = await this.slpUtils.waterfallValidateTxid(
+              thisVin.txid
+            )
+
+            if (!vinIsValid) {
+              // If the input is not a valid, then set qty as null.
+              tokenQty = null
+            } else if (inTokenData.txType === 'SEND') {
               // Get the appropriate vout token amount. This may throw an error,
               // which means this Vin is not actually a token UTXO, it was just
               // associated with a previous token TX.
@@ -159,6 +169,9 @@ class Transaction {
               thisVin.tokenQtyStr = realQty
               thisVin.tokenQty = parseFloat(realQty)
               // txDetails.vin[i].tokenQty = tokenQty
+
+              // Add token ID to input
+              thisVin.tokenId = inTokenData.tokenId
             } else {
               thisVin.tokenQty = null
             }
@@ -174,6 +187,9 @@ class Transaction {
         // Finally, validate the SLP TX.
         // this.slpUtils.waterfallValidateTxid(txid, usrObj)
         txDetails.isValidSLPTx = await this.slpUtils.waterfallValidateTxid(txid)
+
+        // TODO: Convert the block hash to a block height. Add block height
+        // value to the transaction.
       } catch (err) {
         // console.log('Error: ', err)
 

test/integration/transaction-integration.js

@@ -56,5 +56,26 @@ describe('#Transaction', () => {
       assert.property(result, 'isValidSLPTx')
       assert.equal(result.isValidSLPTx, true)
     })
+
+    // it('should get problematic transaction', async () => {
+    //   const txid = 'a55515de32577e296c512840bcaabed5823bb773fb4f8fd8e5197cc96cbc54d1'
+    //
+    //   const result = await bchjs.Transaction.get(txid)
+    //   console.log(`result: ${JSON.stringify(result, null, 2)}`)
+    // })
+
+    // TX a19f2f395a8b0e15b6202944c56834367d128f1e3630486a4756de53424a46fe has
+    // an input TXID (bd84bc1dd5ecd976165892306992401272f6bedeb37d7b2cdbf74fc4a55967a6)
+    // that is also a valid SLP tx, but is unrelated. Both TXs pass DAG validation,
+    // but for separate tokens.
+    it('should get problematic transaction', async () => {
+      const txid = 'a19f2f395a8b0e15b6202944c56834367d128f1e3630486a4756de53424a46fe'
+
+      const result = await bchjs.Transaction.get(txid)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+      // The token ID should equal the txid for this Vin.
+      assert.equal(result.vin[2].txid, result.vin[2].tokenId)
+    })
   })
 })