Skip to content

Commit e911cf5

Browse files
authored
chore: Update MerkleTree import (#205)
* chore: Update MerkleTree import Should import from @uma/common instead of no longer maintained @uma/merkle-distributor * Update package.json
1 parent 352770a commit e911cf5

File tree

3 files changed

+59
-1143
lines changed

3 files changed

+59
-1143
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@across-protocol/contracts-v2",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"author": "UMA Team",
55
"license": "AGPL-3.0",
66
"repository": {
@@ -35,10 +35,9 @@
3535
"@defi-wonderland/smock": "^2.0.7",
3636
"@eth-optimism/contracts": "^0.5.11",
3737
"@openzeppelin/contracts": "^4.7.3",
38-
"@uma/common": "^2.28.0",
38+
"@uma/common": "^2.28.4",
3939
"@uma/contracts-node": "^0.3.18",
4040
"@uma/core": "^2.41.0",
41-
"@uma/merkle-distributor": "^1.3.38",
4241
"arb-bridge-eth": "^0.7.4",
4342
"arb-bridge-peripherals": "^1.0.5"
4443
},

test/merkle-distributor/MerkleDistributor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/* eslint-disable no-unused-expressions */
22

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

87
type Recipient = {
98
account: string;

0 commit comments

Comments
 (0)