Fix: reqrep prefix corrected (#101)

* Removed erc4337 prefix * updated version * fix typo in protocolIds & update goerli mempool info --------- Co-authored-by: marie-fourier <[email protected]>
etherspot · Oct 11, 2023 · 0472004 · 0472004
1 parent 698b505
commit 0472004
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 34 deletions.
diff --git a/lerna.json b/lerna.json
@@ -4,7 +4,7 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "stream": "true",
   "command": {
     "version": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "root",
   "private": true,
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "engines": {
     "node": ">=18.0.0"
   },

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "The API module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -35,12 +35,12 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
     "ethers": "5.7.2",
-    "executor": "1.0.6-alpha",
+    "executor": "^1.0.7-alpha",
     "fastify": "4.14.1",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
     "reflect-metadata": "0.1.13",
-    "types": "1.0.6-alpha"
+    "types": "^1.0.7-alpha"
   },
   "devDependencies": {
     "@types/connect": "3.4.35"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cli",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "> TODO: description",
   "author": "zincoshine <[email protected]>",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -38,14 +38,14 @@
     "@libp2p/peer-id-factory": "2.0.1",
     "@libp2p/prometheus-metrics": "1.1.3",
     "@multiformats/multiaddr": "12.1.3",
-    "api": "1.0.6-alpha",
-    "db": "1.0.6-alpha",
-    "executor": "1.0.6-alpha",
+    "api": "^1.0.7-alpha",
+    "db": "^1.0.7-alpha",
+    "executor": "^1.0.7-alpha",
     "find-up": "5.0.0",
     "got": "12.5.3",
     "js-yaml": "4.1.0",
-    "node": "1.0.6-alpha",
-    "types": "1.0.6-alpha",
+    "node": "^1.0.7-alpha",
+    "types": "^1.0.7-alpha",
     "yargs": "17.6.2"
   },
   "devDependencies": {

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "db",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "The DB module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/etherspot-bundler#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@chainsafe/ssz": "0.10.1",
     "@farcaster/rocksdb": "5.5.0",
-    "types": "1.0.6-alpha"
+    "types": "^1.0.7-alpha"
   },
   "devDependencies": {
     "@types/rocksdb": "3.0.1",

diff --git a/packages/executor/package.json b/packages/executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "The Relayer module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -33,7 +33,7 @@
   "dependencies": {
     "async-mutex": "0.4.0",
     "ethers": "5.7.2",
-    "params": "1.0.6-alpha",
-    "types": "1.0.6-alpha"
+    "params": "^1.0.7-alpha",
+    "types": "^1.0.7-alpha"
   }
 }
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "The bundler node module of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -56,24 +56,24 @@
     "@libp2p/tcp": "6.1.0",
     "@multiformats/multiaddr": "11.4.0",
     "abstract-leveldown": "7.2.0",
-    "api": "1.0.6-alpha",
+    "api": "^1.0.7-alpha",
     "datastore-core": "8.0.1",
-    "db": "1.0.6-alpha",
+    "db": "^1.0.7-alpha",
     "ethers": "5.7.2",
-    "executor": "1.0.6-alpha",
+    "executor": "^1.0.7-alpha",
     "it-filter": "1.0.2",
     "it-map": "1.0.5",
     "it-sort": "1.0.0",
     "it-take": "1.0.1",
     "libp2p": "0.42.2",
-    "params": "1.0.6-alpha",
+    "params": "^1.0.7-alpha",
     "prettier": "2.8.4",
     "snappy": "7.2.2",
     "snappyjs": "0.7.0",
     "stream-to-it": "0.2.4",
     "strict-event-emitter-types": "2.0.0",
-    "types": "1.0.6-alpha",
-    "utils": "1.0.6-alpha",
+    "types": "^1.0.7-alpha",
+    "utils": "^1.0.7-alpha",
     "varint": "6.0.0",
     "xxhash-wasm": "1.0.2"
   },

diff --git a/packages/node/src/network/gossip/interface.ts b/packages/node/src/network/gossip/interface.ts
@@ -7,7 +7,7 @@ import { ts } from "types/lib";
 import { NetworkEvent } from "../events";
 
 export enum GossipType {
-  user_operations_with_entrypoint = "user_operations_with_entrypoint",
+  user_operations_with_entrypoint = "user_ops_with_entry_point",
 }
 
 export enum GossipEncoding {

diff --git a/packages/node/src/network/reqresp/types.ts b/packages/node/src/network/reqresp/types.ts
@@ -5,7 +5,7 @@ export enum ReqRespMethod {
   Goodbye = "goodbye",
   Ping = "ping",
   Metadata = "metadata",
-  PooledUserOpHashes = "pooled_user_op_hashes",
+  PooledUserOpHashes = "pooled_user_ops_hashes",
   PooledUserOpsByHash = "pooled_user_ops_by_hash",
 }
 

diff --git a/packages/node/src/reqresp/ReqResp.ts b/packages/node/src/reqresp/ReqResp.ts
@@ -17,7 +17,7 @@ import { formatProtocolID } from "./utils";
 
 type ProtocolID = string;
 
-export const DEFAULT_PROTOCOL_PREFIX = "/erc4337/req";
+export const DEFAULT_PROTOCOL_PREFIX = "account_abstraction/req";
 
 export interface ReqRespProtocolModules {
   libp2p: Libp2p;

diff --git a/packages/params/package.json b/packages/params/package.json
@@ -1,6 +1,6 @@
 {
   "name": "params",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "Various bundler parameters",
   "author": "Etherspot",
   "homepage": "https://github.com/etherspot/skandha#readme",
@@ -26,8 +26,8 @@
     "@eth-optimism/sdk": "3.0.0",
     "@mantleio/sdk": "0.2.1",
     "ethers": "5.7.2",
-    "types": "1.0.6-alpha",
-    "utils": "1.0.6-alpha"
+    "types": "^1.0.7-alpha",
+    "utils": "^1.0.7-alpha"
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",

diff --git a/packages/params/src/networks/goerli.ts b/packages/params/src/networks/goerli.ts
@@ -1,9 +1,12 @@
 import { fromHexString as b } from "@chainsafe/ssz";
 import { INetworkParams } from "../types";
+import { serializeMempoolId } from "../utils";
 
 export const goerliNetworkConfig: INetworkParams = {
   CONFIG_NAME: "goerli",
   CHAIN_ID: 5,
-  ENTRY_POINT_CONTRACT: [b("0x0576a174D229E3cFA37253523E645A78A0C91B57")],
-  MEMPOOL_IDS: [b("")],
+  ENTRY_POINT_CONTRACT: [b("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789")],
+  MEMPOOL_IDS: [
+    serializeMempoolId("QmTmj4cizhWpEFCCqk5dP67yws7R2PPgCtb2bd2RgVPCbF"),
+  ],
 };
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "types",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "The types of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "utils",
-  "version": "1.0.6-alpha",
+  "version": "1.0.7-alpha",
   "description": "utils of Etherspot bundler client",
   "author": "Etherspot",
   "homepage": "https://https://github.com/etherspot/skandha#readme",
@@ -37,6 +37,6 @@
     "case": "^1.6.3",
     "pino": "8.11.0",
     "pino-pretty": "10.0.0",
-    "types": "1.0.6-alpha"
+    "types": "^1.0.7-alpha"
   }
 }