From fe5528abfabd7fc9fb79221fa13d52b93f9dc0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Crist=C3=B3v=C3=A3o=20Honorato?= Date: Mon, 29 Jul 2024 14:29:30 +0200 Subject: [PATCH] Remove zodiac dependency --- contracts/Delay.sol | 2 +- contracts/test/TestFactory.sol | 2 +- package.json | 1 - yarn.lock | 20 ++------------------ 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/contracts/Delay.sol b/contracts/Delay.sol index e86d0f4..2a4d4e3 100644 --- a/contracts/Delay.sol +++ b/contracts/Delay.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: LGPL-3.0-only pragma solidity >=0.8.0; -import {Enum, Modifier} from "@gnosis.pm/zodiac/contracts/core/Modifier.sol"; +import {Enum, Modifier} from "zodiac-core/contracts/core/Modifier.sol"; contract Delay is Modifier { event DelaySetup( diff --git a/contracts/test/TestFactory.sol b/contracts/test/TestFactory.sol index ed6abb1..98079f8 100644 --- a/contracts/test/TestFactory.sol +++ b/contracts/test/TestFactory.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: LGPL-3.0-only pragma solidity >=0.8.0; -import {ModuleProxyFactory} from "@gnosis.pm/zodiac/contracts/factory/ModuleProxyFactory.sol"; +import {ModuleProxyFactory} from "zodiac-core/contracts/factory/ModuleProxyFactory.sol"; contract TestFactory is ModuleProxyFactory {} diff --git a/package.json b/package.json index cf97e0a..e92ffac 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "license": "MIT", "devDependencies": { "@gnosis.pm/safe-contracts": "1.3.0", - "@gnosis.pm/zodiac": "3.4.1", "@nomicfoundation/hardhat-chai-matchers": "2.0.2", "@nomicfoundation/hardhat-ethers": "^3.0.4", "@nomicfoundation/hardhat-network-helpers": "^1.0.7", diff --git a/yarn.lock b/yarn.lock index ad24cc6..5527dac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -475,27 +475,11 @@ resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8" integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ== -"@gnosis.pm/mock-contract@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/mock-contract/-/mock-contract-4.0.0.tgz#eaf500fddcab81b5f6c22280a7b22ff891dd6f87" - integrity sha512-SkRq2KwPx6vo0LAjSc8JhgQstrQFXRyn2yqquIfub7r2WHi5nUbF8beeSSXsd36hvBcQxQfmOIYNYRpj9JOhrQ== - "@gnosis.pm/safe-contracts@1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-contracts/-/safe-contracts-1.3.0.tgz#316741a7690d8751a1f701538cfc9ec80866eedc" integrity sha512-1p+1HwGvxGUVzVkFjNzglwHrLNA67U/axP0Ct85FzzH8yhGJb4t9jDjPYocVMzLorDoWAfKicGy1akPY9jXRVw== -"@gnosis.pm/zodiac@3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@gnosis.pm/zodiac/-/zodiac-3.4.1.tgz#9bf090f93d2eae69b11c0587aee4114064d18f28" - integrity sha512-Cr89b+Mxu3JETJSmQyzgknJrxyIxd0rZvuJKiIxv87TNJBqnsoiJ88esV+6ap3YN6ttAOAVjaGv4Qm0gKdRgQQ== - dependencies: - "@gnosis.pm/mock-contract" "^4.0.0" - "@gnosis.pm/safe-contracts" "1.3.0" - "@openzeppelin/contracts" "^5.0.0" - "@openzeppelin/contracts-upgradeable" "^5.0.0" - ethers "^5.7.1" - "@humanwhocodes/config-array@^0.11.13": version "0.11.13" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" @@ -856,12 +840,12 @@ "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1" "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1" -"@openzeppelin/contracts-upgradeable@5.0.2", "@openzeppelin/contracts-upgradeable@^5.0.0": +"@openzeppelin/contracts-upgradeable@5.0.2": version "5.0.2" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz#3e5321a2ecdd0b206064356798c21225b6ec7105" integrity sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ== -"@openzeppelin/contracts@5.0.2", "@openzeppelin/contracts@^5.0.0": +"@openzeppelin/contracts@5.0.2": version "5.0.2" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210" integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==