Upgrade Web3 to v4

.circleci/config.yml

@@ -148,7 +148,6 @@ jobs:
       # - restore_dependency_cache
       - run: | # TODO figure out how to make this only run on a cache miss in restore_dependency_cache
           nvm use default
-          cd packages/crypto-rpc
           npm install
       - persist_to_workspace:
           root: ~/bitcore/packages/crypto-rpc # only persist crypto-rpc package
@@ -220,16 +219,21 @@ jobs:
       - run_test:
           package: bitcore-tss
   crypto-rpc:
-    executor: crypto-rpc
+    executor: main
     steps:
-      - run_crypto_rpc
+      - run_test:
+          package: crypto-rpc
+  # crypto-rpc:
+  #   executor: crypto-rpc
+  #   steps:
+  #     - run_crypto_rpc
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - build
-      - build-crypto-rpc
+      # - build-crypto-rpc
       - bitcore-node:
           requires:
             - build
@@ -271,4 +275,4 @@ workflows:
             - build
       - crypto-rpc:
           requires:
-            - build-crypto-rpc
+            - build

docker-compose.test.base.yml

@@ -36,25 +36,24 @@ services:
       --ws
 
   geth:
-    image: 0labs/geth:v1.11.5
+    image: ethereum/client-go:v1.16.7
     volumes:
       - ./.docker/geth-keystore:/keystore
     command:
-      geth
       --dev
-      --datadir=/home/kjoseph/nodes/dev/geth
-      --keystore=/keystore
+      --datadir /home/kjoseph/nodes/dev/geth
+      --keystore /keystore
       --http
-      --http.api=web3,eth,debug,personal,net
-      --http.corsdomain='*'
-      --http.vhosts='*'
-      --http.addr=0.0.0.0
-      --http.port=8545
+      --http.api web3,eth,debug,net
+      --http.corsdomain '*'
+      --http.vhosts '*'
+      --http.addr 0.0.0.0
+      --http.port 8545
       --ws
-      --ws.origins='*'
-      --ws.api=web3,eth,debug,personal,net
-      --ws.addr=0.0.0.0
-      --ws.port=8546
+      --ws.origins '*'
+      --ws.api web3,eth,debug,net
+      --ws.addr 0.0.0.0
+      --ws.port 8546
 
   rippled:
     build:

package.json

@@ -57,6 +57,8 @@
     "ci:bitcore-tss": "./ci.sh 'npm run test:bitcore-tss'",
     "test:bitcore-cli": "cd ./packages/bitcore-cli && npm run test",
     "ci:bitcore-cli": "./ci.sh 'npm run test:bitcore-cli'",
+    "test:crypto-rpc": "cd ./packages/crypto-rpc && npm run test",
+    "ci:crypto-rpc": "./ci.sh 'npm run test:crypto-rpc'",
     "lerna:ci:all": "npx lerna run test:ci --concurrency 1 --stream",
     "lerna:ci:unit": "npx run test:ci:unit --concurrency 1 --stream",
     "lerna:ci:integration": "npx run test:ci:integration --concurrency 1 --stream",

packages/bitcore-cli/src/wallet.ts

@@ -230,6 +230,7 @@ export class Wallet implements IWallet {
       if ((obj as TssKeyType).metadata) {
         return new TssKey.TssKey(obj as TssKeyType);
       } else {
+        obj.version = obj.version ?? 1;
         return new Key({ seedType: 'object', seedData: obj });
       }
     };
@@ -422,8 +423,8 @@ export class Wallet implements IWallet {
     const network = this.network === 'livenet' ? 'mainnet' : this.network;
     const web3 = new Web3(Constants.PUBLIC_API[chain][network]);
     const contract = new web3.eth.Contract(ERC20Abi as any, address);
-    const token = await contract.methods.symbol().call();
-    const decimals = Number(await contract.methods.decimals().call());
+    const token = await contract.methods.symbol().call<string>();
+    const decimals = Number(await contract.methods.decimals().call<bigint>());
     return {
       code: token,
       displayCode: token,