Merge pull request #40 from Lamden/hotfix-3.5.1

fixed blockservice tx checking

dist/cjs/lamden.js

@@ -8228,7 +8228,7 @@ class TransactionBuilder extends Network {
     this.txCheckResult = {};
     this.txCheckAttempts = 0;
     this.txCheckLimit = 10;
-    this.maxBlockToCheck = 10;
+    this.maxBlockToCheck = 15;
     this.startBlock = null;
 
     //Hydrate other items if passed
@@ -8471,14 +8471,14 @@ class TransactionBuilder extends Network {
 
 			// Check all the transaction in these blocks for our transction hash
 			const checkBlocks = async (blocks) => {
-				for (let block in blocks){
+				for (let block of blocks){
 					const { subblocks } = block;
 
 					if (subblocks) {
-						for (let sb in subblocks){
+						for (let sb of subblocks){
 							if (sb){
 								const { transactions } = sb;
-								for (let tx in transactions){
+								for (let tx of transactions){
 									if (tx.hash === this.txHash){
 										let found = await this.blockservice.getTransaction(this.txHash)
 										.then(res => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lamden-js",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "A javascript implementaion for creating wallets, submitting transactions and interacting with masternodes on the Lamden Blockchain.",
   "main": "dist/cjs/lamden.js",
   "module": "dist/esm/lamden.js",

src/js/transactionBuilder.js

@@ -74,7 +74,7 @@ export class TransactionBuilder extends Network {
     this.txCheckResult = {};
     this.txCheckAttempts = 0;
     this.txCheckLimit = 10;
-    this.maxBlockToCheck = 10;
+    this.maxBlockToCheck = 15;
     this.startBlock = null;
 
     //Hydrate other items if passed
@@ -317,14 +317,14 @@ export class TransactionBuilder extends Network {
 
 			// Check all the transaction in these blocks for our transction hash
 			const checkBlocks = async (blocks) => {
-				for (let block in blocks){
+				for (let block of blocks){
 					const { subblocks } = block
 
 					if (subblocks) {
-						for (let sb in subblocks){
+						for (let sb of subblocks){
 							if (sb){
 								const { transactions } = sb
-								for (let tx in transactions){
+								for (let tx of transactions){
 									if (tx.hash === this.txHash){
 										let found = await this.blockservice.getTransaction(this.txHash)
 										.then(res => {

test/transactionBuilder-test.js

@@ -439,7 +439,7 @@ describe("Test TransactionBuilder class", () => {
 				let res = await newTx1.checkBlockserviceForTransactionResult()
 				expect(res.errors.length).to.be.greaterThan(0)
 				expect(res.status).to.equal(2)
-				expect(res.errors.includes("No transaction result found within 20 blocks after sending.")).to.equal(true)
+				expect(res.errors[0]).to.equal(`No transaction result found within ${newTx1.maxBlockToCheck} blocks after sending.`)
 			});
 			it("Fails back to masternode checker if blockservice is not available.", async function () {
 				let newTx1 = new Lamden.TransactionBuilder(goodNetwork, txInfo_noNonce);
@@ -487,7 +487,7 @@ describe("Test TransactionBuilder class", () => {
 					newTx1.checkBlockserviceForTransactionResult((res) => {
 						expect(res.errors.length).to.be.greaterThan(0)
 						expect(res.status).to.equal(2)
-						expect(res.errors.includes("No transaction result found within 20 blocks after sending.")).to.equal(true)
+						expect(res.errors[0]).to.equal(`No transaction result found within ${newTx1.maxBlockToCheck} blocks after sending.`)
 						resolver()
 					});
 				})