client: update c-kzg and use the offical trusted setup (#3107)

* client: update c-kzg and use the offical trusted setup * update sims
ethereumjs · Oct 20, 2023 · a8ac9bb · a8ac9bb
1 parent 7b4c229
commit a8ac9bb
Show file tree

Hide file tree

Showing 11 changed files with 4,181 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block/package.json b/packages/block/package.json
@@ -53,7 +53,7 @@
     "ethereum-cryptography": "^2.1.2"
   },
   "devDependencies": {
-    "c-kzg": "^2.1.0"
+    "c-kzg": "^2.1.2"
   },
   "engines": {
     "node": ">=18"

diff --git a/packages/client/bin/cli.ts b/packages/client/bin/cli.ts
@@ -741,7 +741,7 @@ async function run() {
 
   // TODO sharding: Just initialize kzg library now, in future it can be optimized to be
   // loaded and initialized on the sharding hardfork activation
-  initKZG(kzg, args.trustedSetup ?? __dirname + '/../src/trustedSetups/devnet6.txt')
+  initKZG(kzg, args.trustedSetup ?? __dirname + '/../src/trustedSetups/official.txt')
   // Give network id precedence over network name
   const chain = args.networkId ?? args.network ?? Chain.Mainnet
 

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -71,7 +71,7 @@
     "@ethereumjs/vm": "7.0.0",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.2",
-    "c-kzg": "^2.1.0",
+    "c-kzg": "^2.1.2",
     "chalk": "^4.1.2",
     "connect": "^3.7.0",
     "cors": "^2.8.5",

diff --git a/packages/client/src/trustedSetups/official.txt b/packages/client/src/trustedSetups/official.txt
diff --git a/packages/client/test/sim/simutils.ts b/packages/client/test/sim/simutils.ts
@@ -50,7 +50,7 @@ export function stringifyQuery(query: unknown): string {
 }
 
 // Initialize the kzg object with the kzg library
-initKZG(kzg, __dirname + '/../../src/trustedSetups/devnet6.txt')
+initKZG(kzg, __dirname + '/../../src/trustedSetups/official.txt')
 
 export async function waitForELOnline(client: Client): Promise<string> {
   for (let i = 0; i < 15; i++) {

diff --git a/packages/client/test/sim/txGenerator.ts b/packages/client/test/sim/txGenerator.ts
@@ -23,7 +23,7 @@ const MAX_BLOBS_PER_TX = 2
 const MAX_USEFUL_BYTES_PER_TX = USEFUL_BYTES_PER_BLOB * MAX_BLOBS_PER_TX - 1
 const BLOB_SIZE = BYTES_PER_FIELD_ELEMENT * FIELD_ELEMENTS_PER_BLOB
 
-initKZG(kzg, __dirname + '/../../src/trustedSetup/devnet4.txt')
+initKZG(kzg, __dirname + '/../../src/trustedSetups/official.txt')
 const pkey = hexToBytes('0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8')
 const sender = Address.fromPrivateKey(pkey)
 

diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -68,7 +68,7 @@
     "@types/minimist": "^1.2.2",
     "@types/node-dir": "^0.0.34",
     "benchmark": "^2.1.4",
-    "c-kzg": "^2.1.0",
+    "c-kzg": "^2.1.2",
     "level": "^8.0.0",
     "memory-level": "^1.0.0",
     "minimist": "^1.2.5",

diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -62,7 +62,7 @@
     "ethereum-cryptography": "^2.1.2"
   },
   "peerDependencies": {
-    "c-kzg": "^2.1.0"
+    "c-kzg": "^2.1.2"
   },
   "peerDependenciesMeta": {
     "c-kzg": {

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -95,7 +95,7 @@
   },
   "devDependencies": {},
   "peerDependencies": {
-    "c-kzg": "^2.1.0"
+    "c-kzg": "^2.1.2"
   },
   "peerDependenciesMeta": {
     "c-kzg": {

diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -81,7 +81,7 @@
     "@types/minimist": "^1.2.2",
     "@types/node-dir": "^0.0.34",
     "benchmark": "^2.1.4",
-    "c-kzg": "^2.1.0",
+    "c-kzg": "^2.1.2",
     "minimist": "^1.2.5",
     "node-dir": "^0.1.17",
     "nyc": "^15.1.0",