WIP: Updates to the tech stack

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs: # a collection of steps
   build: # runs not using Workflows must have a `build` job as entry point
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
 
     steps: # a collection of executable commands
       - checkout # special step to check out source code to working directory
@@ -43,7 +43,7 @@ jobs: # a collection of steps
   build_paymasters:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -57,7 +57,7 @@ jobs: # a collection of steps
   test_dev:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -70,7 +70,7 @@ jobs: # a collection of steps
   test_paymasters:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -83,7 +83,7 @@ jobs: # a collection of steps
   gas_calculations:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -95,7 +95,7 @@ jobs: # a collection of steps
 #  test_paymasters:
 #    working_directory: ~/gls # directory where steps will run
 #    docker: # run the steps with Docker
-#      - image: cimg/node:16.20.1
+#      - image: cimg/node:21.7.1
 #    steps: # a collection of executable commands
 #      - attach_workspace:
 #          at: .
@@ -107,7 +107,7 @@ jobs: # a collection of steps
   lint:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -117,7 +117,7 @@ jobs: # a collection of steps
   lint_paymasters:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -127,7 +127,7 @@ jobs: # a collection of steps
   depcheck:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -138,7 +138,7 @@ jobs: # a collection of steps
   test_webpack:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .
@@ -151,7 +151,7 @@ jobs: # a collection of steps
   test_fork:
     working_directory: ~/gls # directory where steps will run
     docker: # run the steps with Docker
-      - image: cimg/node:16.20.1
+      - image: cimg/node:21.7.1
     steps: # a collection of executable commands
       - attach_workspace:
           at: .

.eslintrc.js

@@ -24,7 +24,6 @@ module.exports = {
     project: ['./tsconfig.json', './tsconfig.packages.json']
   },
   ignorePatterns: [
-    '**/types/truffle-contracts',
     '**/types/ethers-contracts',
     'dist/'
   ],

.gitignore

@@ -33,7 +33,6 @@ yarn-error.log
 /packages/contracts/build/
 /packages/contracts/json-input.json
 /packages/contracts/types/ethers-contracts/
-/packages/contracts/types/truffle-contracts/
 /verdaccio/db/
 /.yarnrc
 /build/gsn
@@ -43,11 +42,12 @@ yarn-error.log
 /packages/paymasters/dist/
 /packages/paymasters/json-input.json
 hardhat.log
-/packages/contracts/solpp/
 /packages/contracts/docs/
 /packages/deployer/contracts-link
 /packages/deployer/all-networks.json
 /packages/deployer/deployments/
 /Project.xml
-/packages/dev/types/truffle-contracts/
 
+/packages/contracts/typechain-types/
+/packages/dev/types/
+/packages/dev/typechain-types

hardhat.config.ts

@@ -3,7 +3,7 @@
  */
 const chainId = process.env.CHAINID == null ? 1337 : parseInt(process.env.CHAINID)
 module.exports = {
-  solidity: '0.8.7',
+  solidity: '0.8.23',
   networks: {
     hardhat: { chainId },
     npmtest: { // used from "npm test". see package.json

package.json

@@ -6,6 +6,8 @@
     ],
     "nohoist": [
       "@nomicfoundation/hardhat-ethers",
+      "**nomic**",
+      "**ethers**",
       "**/ethers",
       "**/ethers/**",
       "**eslint**",
@@ -35,14 +37,10 @@
     "test": "yarn preprocess && yarn lerna-run-test-with-hardhat",
     "hardhat-fork-mainnet":  "CHAINID=1 hardhat node --port 8544 --fork https://mainnet.infura.io/v3/f40be2b1a3914db682491dc62a19ad43 --fork-block-number 16814541",
     "hardhat-fork-goerli":  "CHAINID=5 hardhat node --port 8544 --fork https://goerli.infura.io/v3/f40be2b1a3914db682491dc62a19ad43 --fork-block-number 8806897",
-    "preprocess": "yarn lerna-rm-dist && yarn lerna-typechain-generate && yarn extract_abi && yarn lerna-tsc && yarn lerna-chmod-commands",
-    "preprocess-paymasters": "yarn lerna-rm-dist --scope @opengsn/paymasters && yarn lerna-typechain-generate-paymasters && yarn extract_abi_paymasters && yarn lerna-tsc-paymasters",
-    "extract_abi": "./scripts/extract_abi.js",
-    "extract_abi_paymasters": "./scripts/extract_abi.js paymasters",
-    "solpp": "./scripts/solpp.js",
+    "preprocess": "yarn lerna-rm-dist && yarn lerna-hardhat-compile && yarn lerna-tsc && yarn lerna-chmod-commands",
+    "preprocess-paymasters": "yarn lerna-rm-dist --scope @opengsn/paymasters && yarn lerna-tsc-paymasters",
     "tsc": "yarn lerna-tsc",
-    "lerna-typechain-generate": "lerna run typechain-generate --stream --ignore @opengsn/paymasters && lerna run typechain-generate-truffle --stream --ignore @opengsn/paymasters",
-    "lerna-typechain-generate-paymasters": "lerna run typechain-generate --stream --scope @opengsn/paymasters",
+    "lerna-hardhat-compile": "lerna run hardhat-compile --stream --ignore @opengsn/paymasters",
     "lerna-publish": "lerna publish --pre-dist-tag next",
     "lerna-publish-force-no-git": "lerna publish --no-push --no-git-tag-version --force-publish",
     "lerna-chmod-commands": "lerna run chmod-commands",
@@ -75,7 +73,6 @@
     "@metamask/eth-sig-util": "^5.1.0",
     "@openzeppelin/test-helpers": "^0.5.15",
     "@truffle/hdwallet-provider": "^2.0.10",
-    "@typechain/ethers-v5": "^11.1.1",
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^8.2.0",
@@ -94,16 +91,12 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
     "ethereumjs-abi": "^0.6.8",
-    "ethers": "^6.6.5",
-    "ethers-v6": "npm:ethers@^6.6.5",
+    "ethers": "^6.11.1",
     "lerna": "^5.1.8",
     "run-with-hardhat-node": "^0.4.3",
-    "solpp": "^0.11.5",
-    "truffle": "5.1.26",
     "ts-node": "8.6.2",
     "ts-loader": "^9.4.4",
-    "typechain": "^8.3.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.3",
     "verdaccio": "^5.13.3",
     "web3": "^1.7.3",
     "web3-core": "^1.7.3",

packages/cli/package.json

@@ -27,7 +27,6 @@
     "@ethereumjs/tx": "^3.2.0",
     "@ethersproject/bignumber": "^5.7.0",
     "@ethersproject/contracts": "^5.7.0",
-    "@ethersproject/providers": "^5.7.2",
     "@opengsn/common": "^3.0.0-beta.10",
     "@opengsn/contracts": "^3.0.0-beta.10",
     "@opengsn/logger": "^3.0.0-beta.10",