@skalenetwork/upgrade-tools 3.0.0-update-deploy-lib.2 → 3.0.0-update-deploy-lib.3

package/dist/src/migration/clients/clientStrategyFactory.d.ts

@@ -1,6 +1,8 @@
+import { ErigonClientStrategy } from "./erigonClientStrategy";
 import { GethClientStrategy } from "./gethClientStrategy";
 import { JsonRpcProvider } from "ethers";
 export declare enum Client {
-    GETH = "geth"
+    GETH = "geth",
+    ERIGON = "erigon"
 }
-export declare const clientStrategyFactory: (clientType: Client, provider: JsonRpcProvider) => GethClientStrategy;
+export declare const clientStrategyFactory: (clientType: Client, provider: JsonRpcProvider) => ErigonClientStrategy | GethClientStrategy;

package/dist/src/migration/clients/clientStrategyFactory.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientStrategyFactory = exports.Client = void 0;
+const erigonClientStrategy_1 = require("./erigonClientStrategy");
 const gethClientStrategy_1 = require("./gethClientStrategy");
 var Client;
 (function (Client) {
     Client["GETH"] = "geth";
+    Client["ERIGON"] = "erigon";
 })(Client || (exports.Client = Client = {}));
 const clientStrategyFactory = (clientType, provider) => {
     switch (clientType) {
         case Client.GETH:
             return new gethClientStrategy_1.GethClientStrategy(provider);
+        case Client.ERIGON:
+            return new erigonClientStrategy_1.ErigonClientStrategy(provider);
         default:
             throw Error(`Unable to create Client ${clientType}`);
     }

package/dist/src/migration/clients/clientStrategyFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientStrategyFactory.js","sourceRoot":"","sources":["../../../../src/migration/clients/clientStrategyFactory.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AAGxD,IAAY,MAEX;AAFD,WAAY,MAAM;IACd,uBAAa,CAAA;AACjB,CAAC,EAFW,MAAM,sBAAN,MAAM,QAEjB;AAEM,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,QAAyB,EAAE,EAAE;IACnF,QAAQ,UAAU,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,IAAI;YACZ,OAAO,IAAI,uCAAkB,CAAC,QAAQ,CAAC,CAAC;QAE5C;YACI,MAAM,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC"}
+{"version":3,"file":"clientStrategyFactory.js","sourceRoot":"","sources":["../../../../src/migration/clients/clientStrategyFactory.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,6DAAwD;AAGxD,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,uBAAa,CAAA;IACb,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;AAEM,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,QAAyB,EAAE,EAAE;IACnF,QAAQ,UAAU,EAAE,CAAC;QACjB,KAAK,MAAM,CAAC,IAAI;YACZ,OAAO,IAAI,uCAAkB,CAAC,QAAQ,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,MAAM;YACd,OAAO,IAAI,2CAAoB,CAAC,QAAQ,CAAC,CAAC;QAE9C;YACI,MAAM,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;AACL,CAAC,CAAA;AAVY,QAAA,qBAAqB,yBAUjC"}

package/dist/src/migration/clients/erigonClientStrategy.d.ts

@@ -0,0 +1,7 @@
+import { IClientStrategy, Slot } from "./iClientStrategy";
+import { JsonRpcProvider } from "ethers";
+export declare class ErigonClientStrategy implements IClientStrategy {
+    private provider;
+    constructor(provider: JsonRpcProvider);
+    dumpStorageForContract(contractAddress: string, blockHash: string): Promise<Slot[]>;
+}

package/dist/src/migration/clients/erigonClientStrategy.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErigonClientStrategy = void 0;
+const iClientStrategy_1 = require("./iClientStrategy");
+const DEFAULT_TX_INDEX = 0;
+/*
+ * Changing might produce unwanted behaviour for erigon
+ * NextKey in erigon is the original (preimage) key, and not the hashed in.
+ * However, when requesting multiple slots, they do not appear to be ordered by original slot key
+ * For predictable behaviour, maintain at 1
+ */
+const DEFAULT_N_SLOTS_TO_FETCH = 1;
+class ErigonClientStrategy {
+    constructor(provider) {
+        this.provider = provider;
+    }
+    async dumpStorageForContract(contractAddress, blockHash) {
+        let startSlot = iClientStrategy_1.ZERO_KEY;
+        const slots = [];
+        // eslint-disable-next-line no-constant-condition
+        while (startSlot) {
+            // eslint-disable-next-line no-await-in-loop
+            const { storage, nextKey } = await this.provider.send('debug_storageRangeAt', [
+                blockHash,
+                DEFAULT_TX_INDEX,
+                contractAddress,
+                startSlot,
+                DEFAULT_N_SLOTS_TO_FETCH
+            ]);
+            Object.entries(storage).forEach((entry) => {
+                // eslint-disable-next-line no-magic-numbers
+                const slot = entry[1];
+                if (slot.key !== null) {
+                    slots.push(slot);
+                }
+            });
+            // eslint-disable-next-line no-magic-numbers
+            const slot = Object.entries(storage)[0][1];
+            if (slot.key !== null) {
+                slots.push(slot);
+            }
+            startSlot = nextKey;
+        }
+        return slots;
+    }
+}
+exports.ErigonClientStrategy = ErigonClientStrategy;
+//# sourceMappingURL=erigonClientStrategy.js.map

package/dist/src/migration/clients/erigonClientStrategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"erigonClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/erigonClientStrategy.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAElE,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B;;;;;GAKG;AACH,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAa,oBAAoB;IAG7B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,eAAuB,EACvB,SAAiB;QAEjB,IAAI,SAAS,GAAG,0BAAQ,CAAC;QACzB,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,iDAAiD;QACjD,OAAO,SAAS,EAAE,CAAC;YACf,4CAA4C;YAC5C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC/C,sBAAsB,EACtB;gBACI,SAAS;gBACT,gBAAgB;gBAChB,eAAe;gBACf,SAAS;gBACT,wBAAwB;aAC3B,CACJ,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,4CAA4C;gBAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAS,CAAC;gBAC9B,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YACH,4CAA4C;YAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAS,CAAC;YACnD,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;YACD,SAAS,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA1CD,oDA0CC"}

package/dist/src/migration/clients/gethClientStrategy.js

@@ -21,11 +21,13 @@ class GethClientStrategy {
                 hashedKey,
                 DEFAULT_N_SLOTS_TO_FETCH
             ]);
-            // eslint-disable-next-line no-magic-numbers
-            const slot = Object.entries(storage)[0][1];
-            if (slot.key !== null) {
-                slots.push(slot);
-            }
+            Object.entries(storage).forEach((entry) => {
+                // eslint-disable-next-line no-magic-numbers
+                const slot = entry[1];
+                if (slot.key !== null) {
+                    slots.push(slot);
+                }
+            });
             hashedKey = nextKey;
         }
         return slots;

package/dist/src/migration/clients/gethClientStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"gethClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/gethClientStrategy.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAElE,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAa,kBAAkB;IAG3B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,eAAuB,EACvB,SAAiB;QAEjB,IAAI,SAAS,GAAG,0BAAQ,CAAC;QACzB,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,iDAAiD;QACjD,OAAO,SAAS,EAAE,CAAC;YACf,4CAA4C;YAC5C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC/C,sBAAsB,EACtB;gBACI,SAAS;gBACT,gBAAgB;gBAChB,eAAe;gBACf,SAAS;gBACT,wBAAwB;aAC3B,CACJ,CAAC;YAEF,4CAA4C;YAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAS,CAAC;YACnD,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;gBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,CAAC;YACD,SAAS,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AApCD,gDAoCC"}
+{"version":3,"file":"gethClientStrategy.js","sourceRoot":"","sources":["../../../../src/migration/clients/gethClientStrategy.ts"],"names":[],"mappings":";;;AAAA,uDAAkE;AAElE,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAEnC,MAAa,kBAAkB;IAG3B,YAAY,QAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,eAAuB,EACvB,SAAiB;QAEjB,IAAI,SAAS,GAAG,0BAAQ,CAAC;QACzB,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,iDAAiD;QACjD,OAAO,SAAS,EAAE,CAAC;YACf,4CAA4C;YAC5C,MAAM,EAAC,OAAO,EAAE,OAAO,EAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC/C,sBAAsB,EACtB;gBACI,SAAS;gBACT,gBAAgB;gBAChB,eAAe;gBACf,SAAS;gBACT,wBAAwB;aAC3B,CACJ,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,4CAA4C;gBAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAS,CAAC;gBAC9B,IAAK,IAAI,CAAC,GAAG,KAAK,IAAI,EAAG,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC,CAAC,CAAC;YACH,SAAS,GAAG,OAAO,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AArCD,gDAqCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "3.0.0-update-deploy-lib.2",
+  "version": "3.0.0-update-deploy-lib.3",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"