Bump @chainsafe/ssz to 0.11.0 (#2622)

* Bump chainsafe/ssz to 0.11.0 * Try fixing karma * Add karma aliases * Add `common` configuration --------- Co-authored-by: acolytec3 <17355484+acolytec3@users.noreply.github.com>
ethereumjs · Apr 8, 2023 · e8cf85b · e8cf85b
1 parent c83f11b
commit e8cf85b
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block/karma.conf.js b/packages/block/karma.conf.js
@@ -13,6 +13,14 @@ module.exports = function (config) {
         acornOptions: {
           ecmaVersion: 12,
         },
+        resolve: {
+          alias: {
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
+          },
+        },
       },
     },
     concurrency: 1,

diff --git a/packages/blockchain/karma.conf.js b/packages/blockchain/karma.conf.js
@@ -16,6 +16,10 @@ module.exports = function (config) {
         resolve: {
           alias: {
             'bigint-crypto-utils': '../../node_modules/bigint-crypto-utils/dist/bundles/umd.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
         },
       },

diff --git a/packages/client/karma.conf.js b/packages/client/karma.conf.js
@@ -26,8 +26,13 @@ module.exports = function (config) {
               '../../node_modules/multiformats/cjs/src/hashes/identity.js',
             'multiformats/hashes/sha2':
               '../../node_modules/multiformats/cjs/src/hashes/sha2-browser.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
         },
+
         transforms: [
           require('karma-typescript-es6-transform')({
             presets: [['@babel/preset-env', { targets: { chrome: '74' } }]],

diff --git a/packages/common/karma.conf.js b/packages/common/karma.conf.js
@@ -13,6 +13,14 @@ module.exports = function (config) {
         acornOptions: {
           ecmaVersion: 12,
         },
+        resolve: {
+          alias: {
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
+          },
+        },
       },
     },
     concurrency: 1,

diff --git a/packages/evm/karma.conf.js b/packages/evm/karma.conf.js
@@ -29,6 +29,10 @@ module.exports = function (config) {
         resolve: {
           alias: {
             'bigint-crypto-utils': '../../node_modules/bigint-crypto-utils/dist/bundles/umd.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
         },
       },

diff --git a/packages/statemanager/karma.conf.js b/packages/statemanager/karma.conf.js
@@ -24,6 +24,10 @@ module.exports = function (config) {
         resolve: {
           alias: {
             'bigint-crypto-utils': '../../node_modules/bigint-crypto-utils/dist/bundles/umd.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
         },
       },

diff --git a/packages/trie/karma.conf.js b/packages/trie/karma.conf.js
@@ -13,6 +13,15 @@ module.exports = function (config) {
         acornOptions: {
           ecmaVersion: 12,
         },
+        resolve: {
+          alias: {
+            'bigint-crypto-utils': '../../node_modules/bigint-crypto-utils/dist/bundles/umd.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
+          },
+        },
       },
     },
     colors: true,

diff --git a/packages/tx/karma.conf.js b/packages/tx/karma.conf.js
@@ -15,6 +15,14 @@ module.exports = function (config) {
         acornOptions: {
           ecmaVersion: 12,
         },
+        resolve: {
+          alias: {
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
+          },
+        },
       },
     },
     browsers: ['FirefoxHeadless', 'ChromeHeadless'],

diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -51,7 +51,7 @@
     "tsc": "../../config/cli/ts-compile.sh"
   },
   "dependencies": {
-    "@chainsafe/ssz": "^0.10.2",
+    "@chainsafe/ssz": "^0.11.0",
     "@ethereumjs/common": "^3.1.1",
     "@ethereumjs/rlp": "^4.0.1",
     "@ethereumjs/util": "^8.0.5",

diff --git a/packages/util/karma.conf.js b/packages/util/karma.conf.js
@@ -11,6 +11,14 @@ module.exports = function (config) {
         acornOptions: {
           ecmaVersion: 12,
         },
+        resolve: {
+          alias: {
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
+          },
+        },
       },
       tsconfig: './tsconfig.json',
     },

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -83,7 +83,7 @@
     "tsc": "../../config/cli/ts-compile.sh"
   },
   "dependencies": {
-    "@chainsafe/ssz": "^0.10.2",
+    "@chainsafe/ssz": "^0.11.0",
     "@ethereumjs/rlp": "^4.0.1",
     "ethereum-cryptography": "^1.1.2"
   },

diff --git a/packages/vm/karma.conf.js b/packages/vm/karma.conf.js
@@ -29,6 +29,10 @@ module.exports = function (config) {
         resolve: {
           alias: {
             'bigint-crypto-utils': '../../node_modules/bigint-crypto-utils/dist/bundles/umd.js',
+            '@chainsafe/persistent-merkle-tree/hasher':
+              '../../node_modules/@chainsafe/persistent-merkle-tree/lib/hasher/noble.js',
+            '@chainsafe/as-sha256/hashObject':
+              '../../node_modules/@chainsafe/as-sha256/lib/hashObject.js',
           },
         },
       },