Merge pull request #56 from GridPlus/dl/0123

GridPlus · Sep 26, 2022 · ce7e628 · ce7e628
2 parents 58f8f01 + 166ae5a
commit ce7e628
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 561 deletions.
diff --git a/cache.js b/cache.js
diff --git a/index.js b/index.js
@@ -5,12 +5,6 @@ const SDK = require('gridplus-sdk');
 const EthTx = require('@ethereumjs/tx');
 const { addHexPrefix } = require("@ethereumjs/util");
 const rlp = require('rlp');
-const {
-  serializeCache,
-  deserializeCache,
-  getCachedDef,
-  saveDefToCache,
-} = require("./cache");
 const keyringType = 'Lattice Hardware';
 const HARDENED_OFFSET = 0x80000000;
 const PER_PAGE = 5;
@@ -22,7 +16,6 @@ const CONNECT_TIMEOUT = 20000;
 class LatticeKeyring extends EventEmitter {
   constructor (opts={}) {
     super()
-    this.requestCache = new Map();
     this.type = keyringType;
     this._resetDefaults();
     this.deserialize(opts);
@@ -52,8 +45,6 @@ class LatticeKeyring extends EventEmitter {
       this.network = opts.network;
     if (opts.page)
       this.page = opts.page;
-    if (opts.requestCache) 
-      this.requestCache = deserializeCache(opts.requestCache)
     return;
   }
 
@@ -73,7 +64,6 @@ class LatticeKeyring extends EventEmitter {
       network: this.network,
       page: this.page,
       hdPath: this.hdPath,
-      requestCache: serializeCache(this.requestCache),
     };
   }
 
@@ -187,18 +177,9 @@ class LatticeKeyring extends EventEmitter {
         encodingType: SDK.Constants.SIGNING.ENCODINGS.EVM,
         signerPath,
       };
-      let def;
-      const cachedDef = getCachedDef(tx, this.requestCache)
-
-      if (cachedDef) {
-        def = cachedDef
-      } else {
-        const supportsDecoderRecursion = fwVersion.major > 0 || fwVersion.minor >=16;
-        // Check if we can decode the calldata
-        const { def: fetchedDef } = await SDK.Utils.fetchCalldataDecoder(tx.data, tx.to, chainId, supportsDecoderRecursion);
-        saveDefToCache(tx, this.requestCache, fetchedDef);
-        def = fetchedDef
-      }
+      const supportsDecoderRecursion = fwVersion.major > 0 || fwVersion.minor >=16;
+      // Check if we can decode the calldata
+      const { def } = await SDK.Utils.fetchCalldataDecoder(tx.data, tx.to, chainId, supportsDecoderRecursion);
       if (def) {
         data.decoder = def;
       }
@@ -448,7 +429,6 @@ class LatticeKeyring extends EventEmitter {
     this.unlockedAccount = 0;
     this.network = null;
     this.hdPath = STANDARD_HD_PATH;
-    this.requestCache = new Map()
   }
 
   async _openConnectorTab(url) {
@@ -731,7 +711,6 @@ class LatticeKeyring extends EventEmitter {
     }
     return activeWallet.uid.toString('hex');
   }
-
 }
 
 // -----