From 9b6093c24323e7da13c7ecf3078570851fae594b Mon Sep 17 00:00:00 2001 From: bitbeckers Date: Tue, 28 May 2024 22:54:58 +0200 Subject: [PATCH] chore(deploy): deploy updated 6551s --- .gitignore | 2 ++ README.md | 16 +++++++++------- script/DeployCookieJarModule.s.sol | 5 +++++ script/DeployCookieJarNFT.s.sol | 16 ++++++++-------- test/Zodiac/HatsCookieJar.t.sol | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 469a38c..effe798 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ docs/ # Dotenv file .env + +.idea/ diff --git a/README.md b/README.md index 4f43a3f..f7c3868 100644 --- a/README.md +++ b/README.md @@ -66,15 +66,17 @@ The following table lists the addresses of the deployed contracts: | Contract | Address | | ------------------- | -------------------------------------------- | -| Baal Cookie Jar | `0x7c1Db931F804271E39b04E68221b71Ca94E9AFa5` | -| ERC20 Cookie Jar | `0x85C60D0674e161B7f9d1d40A2A46e4b788E7F057` | -| ERC721 Cookie Jar | `0x15f06a6dB8eC8D79Eaa49659210C1c58975a4056` | -| List Cookie Jar | `0x226E0601aa8b8CC34519c76Be00A7a6a8a4d97d2` | -| Open Cookie Jar | `0x0C7F0fC0ddb95d7099ED97c10A2DE549c03E39F9` | +| Baal Cookie Jar | `0x1540F8eb71264EF41c7B12490f1D4556778a9E4f` | +| ERC20 Cookie Jar | `0x4ab3Ced6b45Ef849e5A69716b35a6F54a3b75e1c` | +| ERC721 Cookie Jar | `0x9036A0D0EB7C4400CDBAb840CD87B717Bb95Dd0E` | +| List Cookie Jar | `0x2f84613209bc5Bb3096c67D9C7C681241EB9d1ee` | +| Open Cookie Jar | `0xCb35984911100BA211602A599Fca94870b0E6b2E` | +| Hats Cookie Jar | `0xC3AA5F5b706B98Bff06316F8dAdd9E64aF1E43F1` | | Cookie Jar Factory | `0xD858ce60102BCEa272a6FA36B2E1770877B8Fa45` | | List Cookie Jar6551 | `0xb8858dF24B89d9D17954D763b08b860AD24cfd2d` | -| Account | `0xbCe05b4eB846A033559387e0fa62F3D13EEAAECE` | -| Cookie Jar NFT | `0xb6F9534F53F3F42a0b25d8ECC290419c98f9f212` | +| Account | `0xB91594c1DBc9Fc2fF75eBF4Dcae8B9099D6e088A` | +| Cookie Jar NFT | `0xa16B24f39d90002C71914D055A65143720C1D5A7` | + ## 6551 Tokenbound Registry diff --git a/script/DeployCookieJarModule.s.sol b/script/DeployCookieJarModule.s.sol index 5850d71..2b963be 100644 --- a/script/DeployCookieJarModule.s.sol +++ b/script/DeployCookieJarModule.s.sol @@ -31,6 +31,7 @@ contract DeployCookieJarModule is Script { address internal erc721CookieJar; address internal listCookieJar; address internal openCookieJar; + address internal hatsCookieJar; address internal cookieJarFactory; // Deterministic deployment @@ -71,6 +72,9 @@ contract DeployCookieJarModule is Script { // Open openCookieJar = address(new ZodiacOpenCookieJar{ salt: salt }()); + // Hats + hatsCookieJar = address(new ZodiacHatsCookieJar{ salt: salt }()); + // solhint-disable quotes console.log(block.chainid); console.log('"ZodiacBaalCookieJar": "%s",', baalCookieJar); @@ -78,6 +82,7 @@ contract DeployCookieJarModule is Script { console.log('"ZodiacErc721CookieJar": "%s",', erc721CookieJar); console.log('"ZodiaclistCookieJar": "%s",', listCookieJar); console.log('"ZodiacOpenCookieJar": "%s",', openCookieJar); + console.log('"ZodiacHatsCookieJar": "%s",', hatsCookieJar); // solhint-enable quotes diff --git a/script/DeployCookieJarNFT.s.sol b/script/DeployCookieJarNFT.s.sol index 1a01beb..2535653 100644 --- a/script/DeployCookieJarNFT.s.sol +++ b/script/DeployCookieJarNFT.s.sol @@ -6,19 +6,13 @@ import { CookieNFT } from "src/ERC6551/nft/CookieNFT.sol"; import { AccountERC6551 } from "src/ERC6551/erc6551/ERC6551Module.sol"; import { AccountRegistry } from "src/ERC6551/erc6551/ERC6551Registry.sol"; -// Zodiac -import { ZodiacBaalCookieJar } from "../src/SafeModule/ZodiacBaalCookieJar.sol"; -import { ZodiacERC20CookieJar } from "../src/SafeModule/ZodiacERC20CookieJar.sol"; -import { ZodiacERC721CookieJar } from "../src/SafeModule/ZodiacERC721CookieJar.sol"; -import { ZodiacListCookieJar } from "../src/SafeModule/ZodiacListCookieJar.sol"; -import { ZodiacOpenCookieJar } from "../src/SafeModule/ZodiacOpenCookieJar.sol"; - // 6551 import { BaalCookieJar6551 } from "../src/ERC6551/BaalCookieJar6551.sol"; import { ERC20CookieJar6551 } from "../src/ERC6551/ERC20CookieJar6551.sol"; import { ERC721CookieJar6551 } from "../src/ERC6551/ERC721CookieJar6551.sol"; import { ListCookieJar6551 } from "../src/ERC6551/ListCookieJar6551.sol"; import { OpenCookieJar6551 } from "../src/ERC6551/OpenCookieJar6551.sol"; +import { HatsCookieJar6551 } from "../src/ERC6551/HatsCookieJar6551.sol"; // Deploys import { CookieJarFactory } from "../src/factory/CookieJarFactory.sol"; @@ -45,6 +39,7 @@ contract DeployCookieJarNFT is Script { address internal erc721CookieJar; address internal listCookieJar; address internal openCookieJar; + address internal hatsCookieJar; // 6551 address internal accountImp; @@ -52,7 +47,7 @@ contract DeployCookieJarNFT is Script { address internal nft; // Deterministic deployment - bytes32 salt = keccak256("v0.4"); + bytes32 salt = keccak256("v0.5"); function setUp() public virtual { string memory mnemonic = vm.envString("MNEMONIC"); @@ -101,6 +96,10 @@ contract DeployCookieJarNFT is Script { // Open openCookieJar = address(new OpenCookieJar6551{ salt: salt }()); + // Hats + console.log("Deploying HatsCookieJar"); + hatsCookieJar = address(new HatsCookieJar6551{ salt: salt }()); + // 6551 accountImp = address(new AccountERC6551()); nft = address( @@ -121,6 +120,7 @@ contract DeployCookieJarNFT is Script { console.log('"erc721CookieJar": "%s",', erc721CookieJar); console.log('"listCookieJar": "%s",', listCookieJar); console.log('"openCookieJar": "%s",', openCookieJar); + console.log('"hatsCookieJar": "%s",', hatsCookieJar); // solhint-enable quotes diff --git a/test/Zodiac/HatsCookieJar.t.sol b/test/Zodiac/HatsCookieJar.t.sol index fa3cce8..bc651c1 100644 --- a/test/Zodiac/HatsCookieJar.t.sol +++ b/test/Zodiac/HatsCookieJar.t.sol @@ -38,7 +38,7 @@ contract HatsCookieJarTest is ZodiacCloneSummoner { // uint256 _periodLength, // uint256 _cookieAmount, // address _cookieToken, - // address _erc20addr, + // address _hatsAddress, // uint256 _threshold, bytes memory initParams = abi.encode(address(testAvatar), 3600, cookieAmount, address(cookieToken), address(mockHats), threshold);