feat: Nonce check

lerna.json

@@ -3,7 +3,7 @@
     "packages/*"
   ],
   "npmClient": "yarn",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "stream": "true",
   "command": {
     "version": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "1.5.23",
+  "version": "1.5.24",
   "engines": {
     "node": ">=18.0.0"
   },

packages/api/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -34,10 +34,10 @@
   "dependencies": {
     "@fastify/cors": "9.0.1",
     "@fastify/websocket": "10.0.1",
-    "@skandha/executor": "^1.5.23",
-    "@skandha/monitoring": "^1.5.23",
-    "@skandha/types": "^1.5.23",
-    "@skandha/utils": "^1.5.23",
+    "@skandha/executor": "^1.5.24",
+    "@skandha/monitoring": "^1.5.24",
+    "@skandha/types": "^1.5.24",
+    "@skandha/utils": "^1.5.24",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "ethers": "5.7.2",

packages/cli/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -40,12 +40,12 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "@skandha/api": "^1.5.23",
-    "@skandha/db": "^1.5.23",
-    "@skandha/executor": "^1.5.23",
-    "@skandha/monitoring": "^1.5.23",
-    "@skandha/node": "^1.5.23",
-    "@skandha/types": "^1.5.23",
+    "@skandha/api": "^1.5.24",
+    "@skandha/db": "^1.5.24",
+    "@skandha/executor": "^1.5.24",
+    "@skandha/monitoring": "^1.5.24",
+    "@skandha/node": "^1.5.24",
+    "@skandha/types": "^1.5.24",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",

packages/contracts/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "Smart contracts of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/db/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "@farcaster/rocksdb": "5.5.0",
-    "@skandha/types": "^1.5.23"
+    "@skandha/types": "^1.5.24"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

packages/executor/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,10 +35,10 @@
   },
   "dependencies": {
     "@flashbots/ethers-provider-bundle": "0.6.2",
-    "@skandha/monitoring": "^1.5.23",
-    "@skandha/params": "^1.5.23",
-    "@skandha/types": "^1.5.23",
-    "@skandha/utils": "^1.5.23",
+    "@skandha/monitoring": "^1.5.24",
+    "@skandha/params": "^1.5.24",
+    "@skandha/types": "^1.5.24",
+    "@skandha/utils": "^1.5.24",
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
     "strict-event-emitter-types": "2.0.0",

packages/executor/src/services/BundlingService/relayers/fastlane.ts

@@ -160,17 +160,13 @@ export class FastlaneRelayer extends BaseRelayer {
   async canSubmitBundle(): Promise<boolean> {
     try {
       const provider = new providers.JsonRpcProvider(
-        "https://rpc-mainnet.maticvigil.com"
+        "https://polygon-bor-rpc.publicnode.com"
       );
-      const validators = await provider.send("bor_getCurrentValidators", []);
+      const validator = await provider.send("bor_getCurrentProposer", []);
+      this.logger.debug(`Fastlane: current proposer: ${validator}`);
       for (let fastlane of this.networkConfig.fastlaneValidators) {
         fastlane = fastlane.toLowerCase();
-        if (
-          validators.some(
-            (validator: { signer: string }) =>
-              validator.signer.toLowerCase() == fastlane
-          )
-        ) {
+        if (validator.toLowerCase() == fastlane) {
           return true;
         }
       }

packages/executor/src/services/BundlingService/service.ts

@@ -38,7 +38,7 @@ import {
   EchoRelayer,
   FastlaneRelayer,
 } from "./relayers";
-import { getUserOpGasLimit } from "./utils";
+import { getNonceStorageMapForBundle, getUserOpGasLimit } from "./utils";
 
 export class BundlingService {
   private mutex: Mutex;
@@ -439,6 +439,7 @@ export class BundlingService {
         );
         await this.mempoolService.attemptToBundle(bundle.entries);
 
+        bundle.storageMap = getNonceStorageMapForBundle(bundle);
         if (this.config.testingMode) {
           // need to wait for the tx hash during testing
           await this.relayer.sendBundle(bundle).catch((err) => {

packages/executor/src/services/BundlingService/utils/index.ts

@@ -1,2 +1,3 @@
 export * from "./getUserOpHashes";
 export * from "./estimateBundleGasLimit";
+export * from "./nonceStorageMap";

packages/executor/src/services/BundlingService/utils/nonceStorageMap.ts

@@ -0,0 +1,43 @@
+import { BigNumber, BigNumberish, ethers } from "ethers";
+import { Bundle, StorageMap } from "../../../interfaces";
+import { mergeStorageMap } from "../../../utils/mergeStorageMap";
+
+const EP6_NONCE_SLOT = 1;
+
+export function getNonceStorageMap(
+  account: string,
+  nonce: BigNumberish
+): [string, string] {
+  const abiCoder = new ethers.utils.AbiCoder();
+  const key = BigNumber.from(nonce).shr(64);
+  let seq = BigNumber.from(nonce).shl(192).shr(192)._hex;
+  seq = ethers.utils.hexZeroPad(seq, 32);
+  const keyLevelEncoded = abiCoder.encode(
+    ["address", "uint256"],
+    [account, EP6_NONCE_SLOT]
+  );
+  const nonceLevelEncoded = abiCoder.encode(["uint192"], [key]);
+  const slot = ethers.utils.keccak256(
+    ethers.utils.concat([
+      nonceLevelEncoded,
+      ethers.utils.keccak256(keyLevelEncoded),
+    ])
+  );
+  return [slot, seq];
+}
+
+export function getNonceStorageMapForBundle(bundle: Bundle): StorageMap {
+  if (bundle.entries.length == 0) return bundle.storageMap;
+  const storageMap = { ...bundle.storageMap }; // cloning
+  const entryPoint = bundle.entries[0].entryPoint.toLowerCase();
+  for (const entry of bundle.entries) {
+    const { userOp } = entry;
+    const nonceCheck = getNonceStorageMap(userOp.sender, userOp.nonce);
+    mergeStorageMap(storageMap, {
+      [entryPoint]: {
+        [nonceCheck[0]]: nonceCheck[1].toString(),
+      },
+    });
+  }
+  return storageMap;
+}

packages/monitoring/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The Monitoring module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -32,7 +32,7 @@
     "check-readme": "typescript-docs-verifier"
   },
   "dependencies": {
-    "@skandha/types": "^1.5.23",
+    "@skandha/types": "^1.5.24",
     "prom-client": "^14.2.0"
   }
 }

packages/node/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -56,13 +56,13 @@
     "@libp2p/prometheus-metrics": "1.1.3",
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
-    "@skandha/api": "^1.5.23",
-    "@skandha/db": "^1.5.23",
-    "@skandha/executor": "^1.5.23",
-    "@skandha/monitoring": "^1.5.23",
-    "@skandha/params": "^1.5.23",
-    "@skandha/types": "^1.5.23",
-    "@skandha/utils": "^1.5.23",
+    "@skandha/api": "^1.5.24",
+    "@skandha/db": "^1.5.24",
+    "@skandha/executor": "^1.5.24",
+    "@skandha/monitoring": "^1.5.24",
+    "@skandha/params": "^1.5.24",
+    "@skandha/types": "^1.5.24",
+    "@skandha/utils": "^1.5.24",
     "@types/varint": "6.0.1",
     "abstract-leveldown": "7.2.0",
     "datastore-core": "8.0.1",

packages/params/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -28,8 +28,8 @@
     "@arbitrum/sdk": "3.1.4",
     "@chainsafe/ssz": "0.10.1",
     "@mantleio/sdk": "0.2.1",
-    "@skandha/types": "^1.5.23",
-    "@skandha/utils": "^1.5.23",
+    "@skandha/types": "^1.5.24",
+    "@skandha/utils": "^1.5.24",
     "ethers": "5.7.2"
   },
   "scripts": {

packages/params/src/gas-price-oracles/oracles/matic.ts

@@ -1,12 +1,18 @@
 import { IGetGasFeeResult, IOracle } from "./interfaces";
 import { parseGwei } from "./utils";
 
-export const getMaticGasFee: IOracle = async (): Promise<IGetGasFeeResult> => {
-  const oracle = "https://gasstation.polygon.technology/v2";
+export const getMaticGasFee: IOracle = async (
+  apiKey: string
+): Promise<IGetGasFeeResult> => {
+  let oracle =
+    "https://api.polygonscan.com/api?module=gastracker&action=gasoracle";
+  if (apiKey) {
+    oracle += `&apikey=${apiKey}`;
+  }
   const data = await (await fetch(oracle)).json();
   return {
-    maxPriorityFeePerGas: parseGwei(data.fast.maxPriorityFee),
-    maxFeePerGas: parseGwei(data.fast.maxFee),
-    gasPrice: parseGwei(data.fast.maxFee),
+    maxPriorityFeePerGas: parseGwei(data.result.FastGasPrice),
+    maxFeePerGas: parseGwei(data.result.FastGasPrice),
+    gasPrice: parseGwei(data.result.FastGasPrice),
   };
 };

packages/types/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

packages/utils/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "utils of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@chainsafe/as-sha256": "0.3.1",
-    "@skandha/types": "^1.5.23",
+    "@skandha/types": "^1.5.24",
     "any-signal": "3.0.1",
     "bigint-buffer": "1.1.5",
     "case": "^1.6.3",