Merge pull request #2701 from ethereumjs/develop-v7-merge-master

Merge develop-v7 into master (v2?) (V7 releases)

.github/workflows/vm-pr.yml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        fork: ['London', 'Berlin', 'Merge', 'MuirGlacier', 'Istanbul', 'Shanghai']
+        fork: ['London', 'Berlin', 'Paris', 'MuirGlacier', 'Istanbul', 'Shanghai']
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
         fork:
           [
             'Shanghai',
-            'Merge',
+            'Paris',
             'London',
             'Berlin',
             'MuirGlacier',
@@ -113,8 +113,8 @@ jobs:
             '--fork=London --excludeDir=stTimeConsuming',
             '--fork=Istanbul --dir=GeneralStateTests/stTimeConsuming --expected-test-amount=15561',
             '--fork=Istanbul --excludeDir=stTimeConsuming --expected-test-amount=19817',
-            '--fork=Merge --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=Merge --excludeDir=stTimeConsuming',
+            '--fork=Paris --dir=GeneralStateTests/stTimeConsuming',
+            '--fork=Paris --excludeDir=stTimeConsuming',
             '--fork=ArrowGlacierToMergeAtDiffC0000',
             '--fork=Shanghai --dir=GeneralStateTests/stTimeConsuming',
             '--fork=Shanghai --excludeDir=stTimeConsuming',
@@ -154,7 +154,7 @@ jobs:
             '--fork=MuirGlacier --verify-test-amount-alltests',
             '--fork=Berlin --verify-test-amount-alltests',
             '--fork=London --verify-test-amount-alltests',
-            '--fork=Merge --verify-test-amount-alltests',
+            '--fork=Paris --verify-test-amount-alltests',
             '--fork=Shanghai --verify-test-amount-alltests',
             '--fork=ByzantiumToConstantinopleFixAt5 --verify-test-amount-alltests',
             '--fork=EIP158ToByzantiumAt5 --verify-test-amount-alltests',

config/eslint.js

@@ -7,6 +7,7 @@ module.exports = {
     'import',
     'prettier',
     'simple-import-sort',
+    'ethereumjs',
   ],
   env: {
     es2020: true,
@@ -105,6 +106,7 @@ module.exports = {
     'prettier/prettier': 'error',
     'simple-import-sort/exports': 'error',
     'sort-imports': ['error', { ignoreDeclarationSort: true }],
+    'ethereumjs/noBuffer': 'error',
   },
   parserOptions: {
     extraFileExtensions: ['.json'],

eslint/index.js

@@ -0,0 +1,12 @@
+const fs = require('fs')
+const path = require('path')
+
+const ruleFiles = fs
+  .readdirSync(__dirname)
+  .filter((file) => file !== 'index.js' && !file.endsWith('test.js'))
+
+const rules = Object.fromEntries(
+  ruleFiles.map((file) => [path.basename(file, '.js'), require('./' + file)])
+)
+
+module.exports = { rules }

eslint/noBuffer.js

@@ -0,0 +1,16 @@
+// @ts-no-check
+/** @type {import('eslint').Rule.RuleModule} */
+module.exports = {
+  create(context) {
+    return {
+      Identifier: function (node) {
+        if (node.name === 'Buffer') {
+          context.report({
+            node: node.parent,
+            message: 'No Buffers - use Uint8Array instead',
+          })
+        }
+      },
+    }
+  },
+}