changing decodelog implementation

dist/lib/ContractParser.js

@@ -6,13 +6,15 @@ var _Contract = _interopRequireDefault(require("./Contract"));
 var _EventDecoder = _interopRequireDefault(require("./EventDecoder"));
 var _Abi = _interopRequireDefault(require("./Abi"));
 var _types = require("./types");
-var _utils = require("./utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _utils = require("./utils");
 
 
 
 
 
 
+var _strings = require("@rsksmart/rsk-utils/dist/strings");
+var _Constants = require("./Constants");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 
 class ContractParser {
   constructor({ abi, log, initConfig, nod3 } = {}) {
@@ -160,13 +162,24 @@ class ContractParser {
     }
     let interfaces;
     if (isErc165) interfaces = await this.getInterfacesERC165(contract);else
+    if (this.isEIP1167(txInputData)) interfaces = { EIP1167: true };else
     interfaces = this.getInterfacesByMethods(methods);
     interfaces = Object.keys(interfaces).
     filter(k => interfaces[k] === true).
     map(t => _types.contractsInterfaces[t] || t);
     return { methods, interfaces };
   }
 
+  getEip1167MasterCopy(bytecode) {
+    const implementationAddress = bytecode.replace(_Constants.EIP_1167_PREFIX, '').replace(_Constants.EIP_1167_SUFFIX, '');
+    return implementationAddress;
+  }
+
+  isEIP1167(bytecode) {
+    const re = new RegExp(`^${_Constants.EIP_1167_PREFIX}[a-f0-9]{40}${_Constants.EIP_1167_SUFFIX}$`, 'i');
+    return re.test((0, _strings.remove0x)(bytecode));
+  }
+
   async getInterfacesERC165(contract) {
     let ifaces = {};
     let keys = Object.keys(_interfacesIds.default);

dist/lib/EventDecoder.js

@@ -1,10 +1,17 @@
-"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _ethereumjsAbi = _interopRequireDefault(require("ethereumjs-abi"));
-var _utils = require("./utils");
-var _rskUtils = require("@rsksmart/rsk-utils");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _utils = require("./utils");
+var _rskUtils = require("@rsksmart/rsk-utils");
+var _web3EthAbi = _interopRequireDefault(require("web3-eth-abi"));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
 
 function EventDecoder(abi) {
   abi = (0, _utils.addSignatureDataToAbi)(abi);
 
+  const rawDecode = (types, data) => {
+    const decoded = _web3EthAbi.default.decodeParameters(types, data);
+    delete decoded['__length__'];
+    const arrDecoded = Object.keys(decoded).map(key => decoded[key]);
+    return arrDecoded;
+  };
+
   const formatDecoded = decoded => {
     return (0, _rskUtils.add0x)(Buffer.isBuffer(decoded) ? (0, _rskUtils.bufferToHex)(decoded) : decoded.toString(16));
   };
@@ -22,20 +29,31 @@ function EventDecoder(abi) {
   };
 
   const decodeElement = (data, types) => {
-    let decoded = _ethereumjsAbi.default.rawDecode(types, (0, _rskUtils.toBuffer)(data));
-    if (Array.isArray(decoded)) {
-      decoded = decoded.map(d => formatDecoded(d));
-      if (decoded.length === 1) decoded = decoded.join();
-    } else {
-      decoded = formatDecoded(decoded);
+    try {
+      let decoded = rawDecode(types, data);
+      if (Array.isArray(decoded)) {
+        decoded = decoded.map(d => formatDecoded(d));
+        if (decoded.length === 1) decoded = decoded.join();
+      } else {
+        decoded = formatDecoded(decoded);
+      }
+      return decoded;
+    } catch (e) {
+      console.log(e);
+      return '';
     }
-    return decoded;
   };
 
   const decodeData = (data, types) => {
-    let decoded = _ethereumjsAbi.default.rawDecode(types, (0, _rskUtils.toBuffer)(data));
-    return decoded.map(d => formatDecoded(d));
+    try {
+      let decoded = rawDecode(types, data);
+      return decoded.map(d => formatDecoded(d));
+    } catch (e) {
+      console.log(e);
+      return [''];
+    }
   };
+
   const decodeLog = log => {
     log = Object.assign({}, log);
     const { eventABI, topics } = getEventAbi(log.topics);

dist/lib/types.js

@@ -18,7 +18,8 @@ const contractsInterfaces = {
   ERC20: 'ERC20',
   ERC677: 'ERC677',
   ERC165: 'ERC165',
-  ERC721: 'ERC721' };exports.contractsInterfaces = contractsInterfaces;
+  ERC721: 'ERC721',
+  EIP1167: 'EIP1167' };exports.contractsInterfaces = contractsInterfaces;
 
 
 const ci = contractsInterfaces;