Merge pull request #114 from rsksmart/fix/refactor-for-rsk-contract-parser-usage

fix: update for new rsk-contract-parser's bridge abi handling

Author: nicov-iov

dist/services/classes/BcStats.js

@@ -26,7 +26,8 @@ class BcStats extends _BlocksBase.BlocksBase {
     try {
       const { nod3, initConfig } = this;
       const address = initConfig.nativeContracts.bridge;
-      const abi = _rskContractParser.abi.bridge;
+      const bitcoinNetwork = this.net.id;
+      const abi = _rskContractParser.abi.bridge({ bitcoinNetwork });
       const contract = (0, _rskContractParser.Contract)(abi, { address, nod3 });
       const res = await contract.call(method, params);
       return res;

dist/services/classes/Contract.js

@@ -28,7 +28,7 @@ class Contract extends _BcThing.BcThing {
     try {
       let { deployedCode, fetched } = this;
       if (fetched) return this.getData();
-      let contract = await this.setContract();
+      let contract = await this.setContract(this.block.number);
       if (!this.isNative) {
         // new contracts
         if (!this.data.contractInterfaces) {
@@ -70,26 +70,26 @@ class Contract extends _BcThing.BcThing {
     }
   }
 
-  async getParser() {
+  async getParser(txBlockNumber) {
     try {
       let { nod3, initConfig, log } = this;
       if (!this.parser) {
         let abi = await this.getAbi();
-        this.parser = new _rskContractParser.default({ abi, nod3, initConfig, log });
+        this.parser = new _rskContractParser.default({ abi, nod3, initConfig, log, txBlockNumber });
       }
       return this.parser;
     } catch (err) {
       return Promise.reject(err);
     }
   }
 
-  async setContract() {
+  async setContract(txBlockNumber) {
     try {
       let { address, contract } = this;
       if (contract) return contract;
       // get abi
       let abi = await this.getAbi();
-      let parser = await this.getParser();
+      let parser = await this.getParser(txBlockNumber);
       this.contract = parser.makeContract(address, abi);
       return this.contract;
     } catch (err) {

dist/services/classes/Tx.js

@@ -193,7 +193,7 @@ class Tx extends _BcThing.BcThing {
           events[index] = (0, _Event.formatEvent)(log, tx);
         } else {
           contracts[address] = contract;
-          let parser = await contract.getParser();
+          let parser = await contract.getParser(tx.blockNumber);
           let [event] = parser.parseTxLogs([log]);
           events[index] = (0, _Event.formatEvent)(event, tx);
           const { _addresses } = event;

package.json

@@ -27,7 +27,7 @@
   "homepage": "https://github.com/rsksmart/rsk-explorer-api",
   "dependencies": {
     "@rsksmart/nod3": "^0.5.0",
-    "@rsksmart/rsk-contract-parser": "^0.0.12",
+    "@rsksmart/rsk-contract-parser": "^1.0.0",
     "@rsksmart/rsk-js-cli": "^1.0.0",
     "@rsksmart/rsk-utils": "^1.1.0",
     "bignumber.js": "^7.2.1",

src/services/classes/BcStats.js

@@ -26,7 +26,8 @@ export class BcStats extends BlocksBase {
     try {
       const { nod3, initConfig } = this
       const address = initConfig.nativeContracts.bridge
-      const abi = ABI.bridge
+      const bitcoinNetwork = this.net.id
+      const abi = ABI.bridge({ bitcoinNetwork })
       const contract = Contract(abi, { address, nod3 })
       const res = await contract.call(method, params)
       return res

src/services/classes/Contract.js

@@ -28,7 +28,7 @@ class Contract extends BcThing {
     try {
       let { deployedCode, fetched } = this
       if (fetched) return this.getData()
-      let contract = await this.setContract()
+      let contract = await this.setContract(this.block.number)
       if (!this.isNative) {
         // new contracts
         if (!this.data.contractInterfaces) {
@@ -70,26 +70,26 @@ class Contract extends BcThing {
     }
   }
 
-  async getParser () {
+  async getParser (txBlockNumber) {
     try {
       let { nod3, initConfig, log } = this
       if (!this.parser) {
         let abi = await this.getAbi()
-        this.parser = new ContractParser({ abi, nod3, initConfig, log })
+        this.parser = new ContractParser({ abi, nod3, initConfig, log, txBlockNumber })
       }
       return this.parser
     } catch (err) {
       return Promise.reject(err)
     }
   }
 
-  async setContract () {
+  async setContract (txBlockNumber) {
     try {
       let { address, contract } = this
       if (contract) return contract
       // get abi
       let abi = await this.getAbi()
-      let parser = await this.getParser()
+      let parser = await this.getParser(txBlockNumber)
       this.contract = parser.makeContract(address, abi)
       return this.contract
     } catch (err) {

src/services/classes/Tx.js

@@ -193,7 +193,7 @@ export class Tx extends BcThing {
           events[index] = formatEvent(log, tx)
         } else {
           contracts[address] = contract
-          let parser = await contract.getParser()
+          let parser = await contract.getParser(tx.blockNumber)
           let [event] = parser.parseTxLogs([log])
           events[index] = formatEvent(event, tx)
           const { _addresses } = event