Skip to content

Commit

Permalink
chore: Update MerkleTree import (#205)
Browse files Browse the repository at this point in the history
* chore: Update MerkleTree import

Should import from @uma/common instead of no longer maintained @uma/merkle-distributor

* Update package.json
  • Loading branch information
nicholaspai authored Nov 23, 2022
1 parent 352770a commit e911cf5
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1,143 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@across-protocol/contracts-v2",
"version": "2.0.0",
"version": "2.0.1",
"author": "UMA Team",
"license": "AGPL-3.0",
"repository": {
Expand Down Expand Up @@ -35,10 +35,9 @@
"@defi-wonderland/smock": "^2.0.7",
"@eth-optimism/contracts": "^0.5.11",
"@openzeppelin/contracts": "^4.7.3",
"@uma/common": "^2.28.0",
"@uma/common": "^2.28.4",
"@uma/contracts-node": "^0.3.18",
"@uma/core": "^2.41.0",
"@uma/merkle-distributor": "^1.3.38",
"arb-bridge-eth": "^0.7.4",
"arb-bridge-peripherals": "^1.0.5"
},
Expand Down
3 changes: 1 addition & 2 deletions test/merkle-distributor/MerkleDistributor.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/* eslint-disable no-unused-expressions */

import { ethers, getContractFactory, SignerWithAddress, Contract, toWei, toBN, expect } from "../utils";
import { MerkleTree } from "@uma/merkle-distributor";
import { deployErc20 } from "../gas-analytics/utils";
import { MAX_UINT_VAL } from "@uma/common";
import { MAX_UINT_VAL, MerkleTree } from "@uma/common";

type Recipient = {
account: string;
Expand Down
Loading

0 comments on commit e911cf5

Please sign in to comment.