Update to [email protected], [email protected], [email protected] & volta-cli/action@v4 (#577)

* Pin [email protected]

* Update to volta-cli/actions@v4

* Add @ethersproject/bytes to contracts-core

* Add postinstall script in contracts-core

* Add --sequential flag to lerna run prepare

* Add --stream flag to lerna run prepare

* Add --concurrency 1 flag to lerna run prepare

* Update typechain

* Replace typechain-hardhat package

* Update Umbra.ts and add hardhat --verbose flag

* Upgrade hardhat & use new typechain naming for import

* Remove bytes library and --verbose flag

* Remove extra alias

* Remove --concurrency 1 flag

Co-authored-by: wildmolasses <[email protected]>

* Use pinned version of [email protected] in umbra-js

* Use typechain factories instead of type casting

---------

Co-authored-by: wildmolasses <[email protected]>

Author: garyghayrat

Diff for: .github/workflows/ci.yaml

@@ -30,7 +30,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: volta-cli/action@v1
+      - uses: volta-cli/action@v4
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
@@ -47,7 +47,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: volta-cli/action@v1
+      - uses: volta-cli/action@v4
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
@@ -66,7 +66,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: volta-cli/action@v1
+      - uses: volta-cli/action@v4
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
@@ -121,7 +121,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: volta-cli/action@v1
+      - uses: volta-cli/action@v4
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1

Diff for: contracts-core/hardhat.config.ts

@@ -12,7 +12,7 @@ import '@nomiclabs/hardhat-web3';
 import '@nomiclabs/hardhat-truffle5';
 import '@nomiclabs/hardhat-ethers';
 import '@nomiclabs/hardhat-etherscan';
-import 'hardhat-typechain';
+import '@typechain/hardhat';
 import 'solidity-coverage';
 import 'hardhat-gas-reporter';
 

Diff for: contracts-core/package.json

@@ -18,10 +18,11 @@
     "@openzeppelin/test-helpers": "^0.5.10",
     "@truffle/debug-utils": "^4.1.1",
     "@typechain/ethers-v5": "^10.2.0",
+    "@typechain/hardhat": "^8.0.3",
     "@types/chai": "^4.2.13",
     "@types/fs-extra": "^9.0.1",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^14.11.8",
+    "@types/node": "^18.17.0",
     "chai": "^4.2.0",
     "commitizen": "^4.2.1",
     "concurrently": "^5.3.0",
@@ -32,9 +33,8 @@
     "ethereum-waffle": "^3.2.0",
     "ethers": "5.7.2",
     "fs-extra": "^9.0.1",
-    "hardhat": "^2.6.8",
+    "hardhat": "^2.17.1",
     "hardhat-gas-reporter": "^1.0.4",
-    "hardhat-typechain": "^0.3.3",
     "husky": "^4.3.0",
     "mocha": "^8.1.3",
     "prettier": "^2.1.2",
@@ -46,7 +46,7 @@
     "solidity-coverage": "^0.7.12",
     "ts-generator": "^0.1.1",
     "ts-node": "^8.10.2",
-    "typechain": "^8.1.1",
+    "typechain": "^8.3.1",
     "typescript": "^3.9.7"
   },
   "files": [

Diff for: package.json

@@ -46,7 +46,7 @@
     }
   },
   "volta": {
-    "node": "16.15.0",
+    "node": "18.17.0",
     "yarn": "1.22.18"
   }
 }

Diff for: umbra-js/package.json

@@ -40,7 +40,7 @@
     "eslint-config-prettier": "^8.2.0",
     "eslint-plugin-chai-friendly": "^0.6.0",
     "eslint-plugin-import": "^2.20.2",
-    "hardhat": "^2.12.4",
+    "hardhat": "2.17.1",
     "mocha": "^8.3.2",
     "nyc": "^15.1.0",
     "ts-node": "^9.0.0",

Diff for: umbra-js/src/classes/Umbra.ts

@@ -33,8 +33,8 @@ import {
   assertSupportedAddress,
   getBlockNumberUserRegistered,
 } from '../utils/utils';
-import { Umbra as UmbraContract, Erc20 as ERC20 } from '@umbra/contracts-core/typechain';
-import { ERC20_ABI, ETH_ADDRESS, UMBRA_ABI, UMBRA_BATCH_SEND_ABI } from '../utils/constants';
+import { Umbra as UmbraContract, Umbra__factory, ERC20__factory } from '@umbra/contracts-core/typechain';
+import { ETH_ADDRESS, UMBRA_BATCH_SEND_ABI } from '../utils/constants';
 import type { Announcement, ChainConfig, EthersProvider, GraphFilterOverride, ScanOverrides, SendOverrides, SubgraphAnnouncement, UserAnnouncement, AnnouncementDetail, SendBatch, SendData} from '../types'; // prettier-ignore
 
 // Mapping from chainId to contract information
@@ -149,7 +149,7 @@ export class Umbra {
    */
   constructor(readonly provider: EthersProvider, chainConfig: ChainConfig | number) {
     this.chainConfig = parseChainConfig(chainConfig);
-    this.umbraContract = new Contract(this.chainConfig.umbraAddress, UMBRA_ABI, provider) as UmbraContract;
+    this.umbraContract = Umbra__factory.connect(this.chainConfig.umbraAddress, provider);
     if (this.chainConfig.batchSendAddress) {
       this.batchSendContract = new Contract(this.chainConfig.batchSendAddress, UMBRA_BATCH_SEND_ABI, provider);
     }
@@ -819,7 +819,7 @@ export async function assertSufficientBalance(signer: JsonRpcSigner | Wallet, to
   // If applicable, check that sender has sufficient token balance. ETH balance is checked on send. The isEth
   // method also serves to validate the token input
   if (!isEth(token)) {
-    const tokenContract = new Contract(token, ERC20_ABI, signer) as ERC20;
+    const tokenContract = ERC20__factory.connect(token, signer);
     const tokenBalance = await tokenContract.balanceOf(await signer.getAddress());
     if (tokenBalance.lt(tokenAmount)) {
       const providedAmount = tokenAmount.toString();

Diff for: umbra-js/test/Umbra.test.ts

@@ -11,8 +11,8 @@ import type { ChainConfig, SendBatch, UserAnnouncement } from '../src/types';
 import {
   TestToken as ERC20,
   Umbra as UmbraContract,
-  TestTokenFactory as ERC20__factory,
-  UmbraFactory as Umbra__factory,
+  TestToken__factory as ERC20__factory,
+  Umbra__factory,
 } from '@umbra/contracts-core/typechain';
 import { parseOverrides, assertSufficientBalance, assertValidStealthAddress } from '../src/classes/Umbra';
 import { UMBRA_BATCH_SEND_ABI } from '../src/utils/constants';