Fix tests and update contracts README and (#8)

* Update README with latest Foundry installation steps * Update to latest addresses after solmate upgrade * Update to new verbosity flag syntax * chore: upgrade OZ and solmate * fix alice address in frontend and generator
Anish-Agnihotri · Jan 19, 2022 · 4c86569 · 4c86569
1 parent 9da2383
commit 4c86569
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/contracts/README.md b/contracts/README.md
@@ -6,11 +6,7 @@ ERC20 token claimable by members of a [Merkle tree](https://en.wikipedia.org/wik
 
 Tests use [Foundry: Forge](https://github.com/gakonst/foundry).
 
-### Install Forge
-
-```bash
-cargo install --git https://github.com/gakonst/foundry --bin forge --locked
-```
+Install Foundry using the installation steps in the README of the linked repo.
 
 ### Run tests
 
@@ -22,7 +18,9 @@ cd contracts/
 forge update
 
 # Run tests
-forge test --root . --verbosity 4
+forge test --root .
+# Run tests with stack traces
+forge test --root . -vvvv
 ```
 
 ## Deploy

diff --git a/contracts/lib/openzeppelin-contracts b/contracts/lib/openzeppelin-contracts
diff --git a/contracts/lib/solmate b/contracts/lib/solmate
diff --git a/contracts/src/test/utils/MerkleClaimERC20Test.sol b/contracts/src/test/utils/MerkleClaimERC20Test.sol
@@ -30,11 +30,11 @@ contract MerkleClaimERC20Test is DSTest {
       "MT", 
       18, 
       // Merkle root containing ALICE with 100e18 tokens but no BOB
-      0x6a0b89fc219e9e72ad683e00d9c152532ec8e5c559600e04160d310936400a00
+      0xd0aa6a4e5b4e13462921d7518eebdb7b297a7877d6cfe078b0c318827392fb55
     );
 
     // Setup airdrop users
-    ALICE = new MerkleClaimERC20User(TOKEN); // 0x109f93893af4c4b0afc7a9e97b59991260f98313
-    BOB = new MerkleClaimERC20User(TOKEN); // 0x689856e2a6eb68fc33099eb2ccba0a5a4e8be52f
+    ALICE = new MerkleClaimERC20User(TOKEN); // 0x185a4dc360ce69bdccee33b3784b0282f7961aea
+    BOB = new MerkleClaimERC20User(TOKEN); // 0xefc56627233b02ea95bae7e19f648d7dcd5bb132
   }
-}
+}
diff --git a/frontend/config.ts b/frontend/config.ts
@@ -9,7 +9,7 @@ const config: IConfig = {
   decimals: 18,
   airdrop: {
     "0x016C8780e5ccB32E5CAA342a926794cE64d9C364": 10,
-    "0x109f93893af4c4b0afc7a9e97b59991260f98313": 100,
+    "0x185a4dc360ce69bdccee33b3784b0282f7961aea": 100,
   },
 };
 

diff --git a/generator/config.json b/generator/config.json
@@ -2,6 +2,6 @@
   "decimals": 18,
   "airdrop": {
     "0x016C8780e5ccB32E5CAA342a926794cE64d9C364": 10,
-    "0x109f93893af4c4b0afc7a9e97b59991260f98313": 100
+    "0x185a4dc360ce69bdccee33b3784b0282f7961aea": 100
   }
 }