update lib imports

a16z · Feb 1, 2023 · 9d08d38 · 9d08d38
1 parent 5d7176a
commit 9d08d38
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/zkdrops-contracts/.gitignore b/zkdrops-contracts/.gitignore
@@ -2,4 +2,5 @@ node_modules
 typechain
 artifacts
 cache
-local
+local
+typechain-types
diff --git a/zkdrops-contracts/package.json b/zkdrops-contracts/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "ts-mocha"
+    "test": "npx hardhat test"
   },
   "author": "sragss",
   "license": "ISC",

diff --git a/zkdrops-contracts/scripts/deploy.ts b/zkdrops-contracts/scripts/deploy.ts
@@ -1,9 +1,9 @@
 import { ethers, waffle } from "hardhat";
 import { abi as ERC20_ABI, bytecode as ERC20_BYTECODE } from "@openzeppelin/contracts/build/contracts/ERC20PresetFixedSupply.json";
 import { BigNumber } from "@ethersproject/bignumber";
-import { PrivateAirdrop } from "../typechain";
+import { PrivateAirdrop } from "../typechain-types";
 import { readMerkleTreeAndSourceFromFile } from "../utils/TestUtils";
-import { toHex } from "zkp-merkle-airdrop-lib";
+import { toHex } from "zkdrops-lib";
 
 
 /**

diff --git a/zkdrops-contracts/test/MerkleTreeTest.spec.ts b/zkdrops-contracts/test/MerkleTreeTest.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai"
-import { MerkleTree } from "zkp-merkle-airdrop-lib";
+import { MerkleTree } from "zkdrops-lib";
 import { generateMerkleTreeAndKeys } from "../utils/TestUtils";
 
 describe("MerkleTree", () => {

diff --git a/zkdrops-contracts/test/PrivateAirdropIntegration.spec.ts b/zkdrops-contracts/test/PrivateAirdropIntegration.spec.ts
@@ -1,12 +1,12 @@
 import { expect } from "chai";
 import { ethers, waffle } from "hardhat";
-import { PlonkVerifier, PrivateAirdrop } from "../typechain"
+import { PlonkVerifier, PlonkVerifier__factory, PrivateAirdrop, PrivateAirdrop__factory } from "../typechain-types"
 import { abi as ERC20_ABI, bytecode as ERC20_BYTECODE } from "@openzeppelin/contracts/build/contracts/ERC20PresetFixedSupply.json";
 import { Contract } from "@ethersproject/contracts";
 import { Signer } from "@ethersproject/abstract-signer";
 import { BigNumber } from "@ethersproject/bignumber";
 import { readFileSync } from "fs";
-import { MerkleTree, generateProofCallData, pedersenHashConcat, pedersenHash, toHex } from "zkp-merkle-airdrop-lib";
+import { MerkleTree, generateProofCallData, pedersenHashConcat, pedersenHash, toHex } from "zkdrops-lib";
 import { randomBigInt, readMerkleTreeAndSourceFromFile } from "../utils/TestUtils";
 
 // Test constants
@@ -204,10 +204,10 @@ async function deployContracts(
                 BigNumber.from(ERC20_SUPPLY),
                 erc20SupplyHolder
             ])
-        let plonkFactory = await ethers.getContractFactory("PlonkVerifier", ownerSigner)
+        let plonkFactory = new PlonkVerifier__factory(ownerSigner)
         let verifier = await plonkFactory.deploy()
 
-        let airdropFactory = await ethers.getContractFactory("PrivateAirdrop", ownerSigner)
+        let airdropFactory = new PrivateAirdrop__factory(ownerSigner)
         let airdrop: PrivateAirdrop = (
             await airdropFactory.deploy(
                 erc20.address,

diff --git a/zkdrops-contracts/utils/TestUtils.ts b/zkdrops-contracts/utils/TestUtils.ts
@@ -1,7 +1,7 @@
 import * as crypto from "crypto";
 import { readFileSync, writeFileSync } from 'fs';
 
-import { MerkleTree, pedersenHashConcat, toHex } from 'zkp-merkle-airdrop-lib';
+import { MerkleTree, pedersenHashConcat, toHex } from 'zkdrops-lib';
 
 /** MerkleTree and inputs used to derive. */
 export interface MerkleTreeAndSource {