Merge pull request #136 from AztecProtocol/chore/import-cleanup

Chore/dependency cleanup

Author: benesjan

package.json

@@ -26,8 +26,8 @@
     "solhint:check": "solhint --config ./.solhint.json \"src/**/*.sol\""
   },
   "dependencies": {
-    "@aztec/barretenberg": "2.1.0-testnet.29",
-    "@ethersproject/providers": "^5.6.5"
+    "@aztec/barretenberg": "2.1.26",
+    "@ethersproject/providers": "^5.6.8"
   },
   "jest": {
     "transform": {
@@ -42,24 +42,21 @@
   "repository": "[email protected]:AztecProtocol/aztec-connect-bridges.git",
   "license": "MIT",
   "devDependencies": {
-    "@ethersproject/constants": "^5.5.0",
     "@openzeppelin/contracts": "^4.6.0",
     "@typechain/ethers-v5": "^9.0.0",
     "@typechain/hardhat": "^4.0.0",
-    "@types/jest": "^27.4.0",
-    "@types/node-fetch": "^2.6.1",
-    "ethers": "^5.5.4",
+    "@types/jest": "^28.1.3",
+    "ethers": "^5.6.9",
     "hardhat": "^2.9.9",
-    "jest": "^27.5.0",
-    "node-fetch": "2.6.7",
-    "prettier": "^2.6.2",
+    "jest": "^28.1.1",
+    "prettier": "^2.7.1",
     "prettier-plugin-solidity": "^1.0.0-beta.19",
     "solhint": "https://github.com/LHerskind/solhint",
     "solhint-plugin-prettier": "^0.0.5",
-    "ts-jest": "^27.1.3",
-    "ts-node": "^10.4.0",
+    "ts-jest": "^28.0.5",
+    "ts-node": "^10.8.1",
     "typechain": "^7.0.1",
-    "typescript": "^4.4.4"
+    "typescript": "^4.7.4"
   },
   "files": [
     "./client-dest"

src/client/aave/aave-bridge-data.test.ts

@@ -80,7 +80,7 @@ describe("aave lending bridge data", () => {
     const zkAsset = {
       id: 3n,
       assetType: AztecAssetType.ERC20,
-      erc20Address: EthAddress.randomAddress().toString(),
+      erc20Address: EthAddress.random().toString(),
     };
 
     aaveLendingBridgeContract = {
@@ -110,7 +110,7 @@ describe("aave lending bridge data", () => {
     const zkAsset = {
       id: 3n,
       assetType: AztecAssetType.ERC20,
-      erc20Address: EthAddress.randomAddress().toString(),
+      erc20Address: EthAddress.random().toString(),
     };
 
     aaveLendingBridgeContract = {
@@ -136,7 +136,7 @@ describe("aave lending bridge data", () => {
     const zkAsset = {
       id: 3n,
       assetType: AztecAssetType.ERC20,
-      erc20Address: EthAddress.randomAddress().toString(),
+      erc20Address: EthAddress.random().toString(),
     };
 
     const rate = 3n * 10n ** 25n;
@@ -149,10 +149,10 @@ describe("aave lending bridge data", () => {
       currentVariableBorrowRate: 0,
       currentStableBorrowRate: 0,
       lastUpdateTimestamp: 0,
-      aTokenAddress: EthAddress.randomAddress().toString(),
-      stableDebtTokenAddress: EthAddress.randomAddress().toString(),
-      variableDebtTokenAddress: EthAddress.randomAddress().toString(),
-      interestRateStrategyAddress: EthAddress.randomAddress().toString(),
+      aTokenAddress: EthAddress.random().toString(),
+      stableDebtTokenAddress: EthAddress.random().toString(),
+      variableDebtTokenAddress: EthAddress.random().toString(),
+      interestRateStrategyAddress: EthAddress.random().toString(),
       id: 0,
     };
 
@@ -178,7 +178,7 @@ describe("aave lending bridge data", () => {
     const zkAsset = {
       id: 3n,
       assetType: AztecAssetType.ERC20,
-      erc20Address: EthAddress.randomAddress().toString(),
+      erc20Address: EthAddress.random().toString(),
     };
 
     const rate = 3n * 10n ** 25n;
@@ -190,10 +190,10 @@ describe("aave lending bridge data", () => {
       currentVariableBorrowRate: 0,
       currentStableBorrowRate: 0,
       lastUpdateTimestamp: 0,
-      aTokenAddress: EthAddress.randomAddress().toString(),
-      stableDebtTokenAddress: EthAddress.randomAddress().toString(),
-      variableDebtTokenAddress: EthAddress.randomAddress().toString(),
-      interestRateStrategyAddress: EthAddress.randomAddress().toString(),
+      aTokenAddress: EthAddress.random().toString(),
+      stableDebtTokenAddress: EthAddress.random().toString(),
+      variableDebtTokenAddress: EthAddress.random().toString(),
+      interestRateStrategyAddress: EthAddress.random().toString(),
       id: 0,
     };
 
@@ -218,7 +218,7 @@ describe("aave lending bridge data", () => {
     const zkAsset = {
       id: 3n,
       assetType: AztecAssetType.ERC20,
-      erc20Address: EthAddress.randomAddress().toString(),
+      erc20Address: EthAddress.random().toString(),
     };
 
     aaveLendingBridgeContract = {

src/client/element/element-bridge-data.test.ts

@@ -11,7 +11,6 @@ import {
 } from '../../../typechain-types';
 import { BridgeId } from '@aztec/barretenberg/bridge_id';
 import { AztecAssetType } from '../bridge-data';
-import { AddressZero } from '@ethersproject/constants';
 import { EthAddress } from '@aztec/barretenberg/address';
 
 jest.mock('../aztec/provider', () => ({
@@ -263,7 +262,7 @@ describe('element bridge data', () => {
       },
       {
         assetType: AztecAssetType.NOT_USED,
-        erc20Address: AddressZero,
+        erc20Address: EthAddress.ZERO.toString(),
         id: 0n,
       },
       {
@@ -273,7 +272,7 @@ describe('element bridge data', () => {
       },
       {
         assetType: AztecAssetType.NOT_USED,
-        erc20Address: AddressZero,
+        erc20Address: EthAddress.ZERO.toString(),
         id: 0n,
       },
       expiry,
@@ -322,7 +321,7 @@ describe('element bridge data', () => {
       },
       {
         assetType: AztecAssetType.NOT_USED,
-        erc20Address: AddressZero,
+        erc20Address: EthAddress.ZERO.toString(),
         id: 0n,
       },
       {
@@ -332,7 +331,7 @@ describe('element bridge data', () => {
       },
       {
         assetType: AztecAssetType.NOT_USED,
-        erc20Address: AddressZero,
+        erc20Address: EthAddress.ZERO.toString(),
         id: 0n,
       },
       expiry,

src/client/element/element-bridge-data.ts

@@ -1,4 +1,3 @@
-import { AddressZero } from '@ethersproject/constants';
 import { AssetValue, BridgeDataFieldGetters, AuxDataConfig, AztecAsset, SolidityType } from '../bridge-data';
 import {
   ElementBridge,
@@ -287,8 +286,8 @@ export class ElementBridgeData implements BridgeDataFieldGetters {
     const trancheAddress = pool.trancheAddress;
 
     const funds: FundManagement = {
-      sender: AddressZero,
-      recipient: AddressZero,
+      sender: EthAddress.ZERO.toString(),
+      recipient: EthAddress.ZERO.toString(),
       fromInternalBalance: false,
       toInternalBalance: false,
     };