From 200fb568c2c6a594bf804187382803f6a85113db Mon Sep 17 00:00:00 2001 From: Santiago Gonzalez Date: Wed, 3 Jan 2024 15:59:25 -0500 Subject: [PATCH] bump baal-contracts version --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++++------- .../NetworkRegistry.dao.behavior.ts | 4 ++-- .../NetworkRegistryShaman.behavior.ts | 2 +- test/utils/baal.ts | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0edecf6..cd50ea5 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ }, "dependencies": { "@connext/interfaces": "^2.0.5", - "@daohaus/baal-contracts": "^1.2.12", + "@daohaus/baal-contracts": "^1.2.17", "@gnosis.pm/safe-contracts": "^1.3.0", "@openzeppelin/contracts": "^5.0.1", "@openzeppelin/contracts-upgradeable": "^5.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index faee956..d68e7ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,8 +5,8 @@ dependencies: specifier: ^2.0.5 version: 2.0.5 '@daohaus/baal-contracts': - specifier: ^1.2.12 - version: 1.2.12 + specifier: ^1.2.17 + version: 1.2.17 '@gnosis.pm/safe-contracts': specifier: ^1.3.0 version: 1.3.0(ethers@5.7.2) @@ -558,13 +558,14 @@ packages: '@jridgewell/trace-mapping': 0.3.9 dev: true - /@daohaus/baal-contracts@1.2.12: - resolution: {integrity: sha512-RtYHlTbcF7ruGuyMaTYvwRVIsMmCx5/Kvik28+zPnGImVPpkPrhr4KwPLOkwIO+nVDs7nRdgHAV461Pb1Z2GCw==} + /@daohaus/baal-contracts@1.2.17: + resolution: {integrity: sha512-6DR0YNK62Gh+W+eGm8XA1OZiBhnUD870/bfmem/0KUR10NExqTEVTwm6BYSIPtkFBQKlD//w/ZiAWb3lUX1NQw==} dependencies: '@gnosis.pm/zodiac': 3.3.7 '@opengsn/contracts': 2.2.5 '@openzeppelin/contracts': 4.9.3 '@openzeppelin/contracts-upgradeable': 4.9.3 + safe-deployments: 1.26.0 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -5563,7 +5564,6 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 - dev: true /lru-queue@0.1.0: resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} @@ -6911,6 +6911,12 @@ packages: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: true + /safe-deployments@1.26.0: + resolution: {integrity: sha512-JuUfoN86/JPmmGAxxVj73Q0G7Pkon3tZMu7IgWWd4SSPk4bvoSJCaQBOHFKRu10x2+KQUtK+xz0JIua6QB6niA==} + dependencies: + semver: 7.5.1 + dev: false + /safe-regex-test@1.0.0: resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} dependencies: @@ -6986,7 +6992,6 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 - dev: true /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -8508,7 +8513,6 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true /yargs-parser@13.1.2: resolution: {integrity: sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==} diff --git a/test/networkRegistry/NetworkRegistry.dao.behavior.ts b/test/networkRegistry/NetworkRegistry.dao.behavior.ts index 2b5ecde..8b93400 100644 --- a/test/networkRegistry/NetworkRegistry.dao.behavior.ts +++ b/test/networkRegistry/NetworkRegistry.dao.behavior.ts @@ -1,5 +1,5 @@ import { Baal, MultiSend, Shares } from "@daohaus/baal-contracts"; -import { ProposalType, baalSetup, encodeMultiAction } from "@daohaus/baal-contracts"; +import { ProposalType, baalSetup, encodeMultiAction } from "@daohaus/baal-contracts/hardhat"; import { anyValue } from "@nomicfoundation/hardhat-chai-matchers/withArgs"; import { time } from "@nomicfoundation/hardhat-network-helpers"; import { expect } from "chai"; @@ -82,7 +82,7 @@ describe("NetworkRegistry + DAO E2E tests", function () { l2Registry = setup.l2; users = setup.users; - // MUST run after registryFixture due to how chain snaphost works on hardhat + // MUST run after registryFixture due to how chain snapshot works on hardhat const setupBaal = await baalSetup({ daoSettings: defaultDAOSettings, }); diff --git a/test/networkRegistry/NetworkRegistryShaman.behavior.ts b/test/networkRegistry/NetworkRegistryShaman.behavior.ts index 7d8598a..ac7c983 100644 --- a/test/networkRegistry/NetworkRegistryShaman.behavior.ts +++ b/test/networkRegistry/NetworkRegistryShaman.behavior.ts @@ -1,5 +1,5 @@ import { Baal, MultiSend, Shares } from "@daohaus/baal-contracts"; -import { ProposalType, baalSetup, encodeMultiAction } from "@daohaus/baal-contracts"; +import { ProposalType, baalSetup, encodeMultiAction } from "@daohaus/baal-contracts/hardhat"; import { anyValue } from "@nomicfoundation/hardhat-chai-matchers/withArgs"; import { impersonateAccount, diff --git a/test/utils/baal.ts b/test/utils/baal.ts index 67ce5fd..3cd0964 100644 --- a/test/utils/baal.ts +++ b/test/utils/baal.ts @@ -1,4 +1,5 @@ -import { Baal, moveForwardPeriods } from "@daohaus/baal-contracts"; +import { Baal } from "@daohaus/baal-contracts"; +import { moveForwardPeriods } from "@daohaus/baal-contracts/hardhat"; import { BigNumberish } from "ethers"; import { ethers } from "hardhat";