Various cleanup

ethereumjs · Apr 3, 2023 · afc9b65 · afc9b65
1 parent 0f7f191
commit afc9b65
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/packages/client/test/miner/pendingBlock.spec.ts b/packages/client/test/miner/pendingBlock.spec.ts
@@ -11,6 +11,7 @@ import {
   equalsBytes,
   getBlobs,
   hexStringToBytes,
+  initKZG,
   randomBytes,
 } from '@ethereumjs/util'
 import { VM } from '@ethereumjs/vm'

diff --git a/packages/client/test/net/protocol/snapprotocol.spec.ts b/packages/client/test/net/protocol/snapprotocol.spec.ts
@@ -468,13 +468,13 @@ tape('[SnapProtocol]', (t) => {
     })
 
     t.ok(
-      JSON.stringify(payload[0]) === JSON.stringify(bigIntToBuffer(reqId)),
+      JSON.stringify(payload[0]) === JSON.stringify(bigIntToBytes(reqId)),
       'correctly encoded reqId'
     )
     t.ok(JSON.stringify(payload[1]) === JSON.stringify(root), 'correctly encoded root')
     t.ok(JSON.stringify(payload[2]) === JSON.stringify(paths), 'correctly encoded paths')
     t.ok(
-      JSON.stringify(payload[3]) === JSON.stringify(bigIntToBuffer(bytes)),
+      JSON.stringify(payload[3]) === JSON.stringify(bigIntToBytes(bytes)),
       'correctly encoded bytes'
     )
     t.ok(payload)

diff --git a/packages/util/src/blobHelpers.ts b/packages/util/src/blobHelpers.ts
@@ -63,7 +63,7 @@ export const blobsToCommitments = (blobs: Uint8Array[]) => {
   return commitments
 }
 
-export const blobsToProofs = (blobs: Buffer[]) => {
+export const blobsToProofs = (blobs: Uint8Array[]) => {
   const proofs = []
   for (const blob of blobs) {
     proofs.push(Buffer.from(kzg.computeBlobKzgProof(blob)))

diff --git a/packages/util/src/kzg.ts b/packages/util/src/kzg.ts
@@ -39,5 +39,10 @@ export let kzg: Kzg = {
  */
 export function initKZG(kzgLib: Kzg, trustedSetupPath: string) {
   kzg = kzgLib
+  try {
+    // Always try to free trusted setup before loading (in case loaded by different module)
+    kzg.freeTrustedSetup()
+    // eslint-disable-next-line
+  } catch {}
   kzg.loadTrustedSetup(trustedSetupPath)
 }
diff --git a/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts b/packages/vm/test/tester/runners/GeneralStateTestsRunner.ts
@@ -2,7 +2,7 @@ import { Block } from '@ethereumjs/block'
 import { Blockchain } from '@ethereumjs/blockchain'
 import { DefaultStateManager } from '@ethereumjs/statemanager'
 import { Trie } from '@ethereumjs/trie'
-import { bytesToHex, equalsBytes, toBytes } from '@ethereumjs/util'
+import { Address, bytesToHex, equalsBytes, toBytes } from '@ethereumjs/util'
 
 import { EVM } from '../../../../evm/src'
 import { EEI } from '../../../src'