From 286518e2135ea9f82728fe19745208df1f5cb676 Mon Sep 17 00:00:00 2001 From: Ido Date: Sun, 3 Nov 2024 09:55:08 +0200 Subject: [PATCH 1/3] update deploy script --- script/Deploy.s.sol | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 698000a..3c2ede4 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -24,7 +24,7 @@ contract Deploy is Script { _farcasterContracts = FarcasterContracts({ IdGateway: 0x00000000Fc25870C6eD6b6c7E41Fb078b7656f69, idRegistry: 0x00000000Fc6c5F01Fc30151999387Bb99A9f489b, - keyGateway: 0x00000000Fc25870C6eD6b6c7E41Fb078b7656f69, + keyGateway: 0x00000000fC56947c7E7183f8Ca4B62398CaAdf0B, keyRegistry: 0x00000000Fc1237824fb747aBDE0FF18990E59b7e, signedKeyRequestValidator: 0x00000000FC700472606ED4fA22623Acf62c60553 }); @@ -56,8 +56,8 @@ contract Deploy is Script { maxSupply: 0, toggle: address(0), mutable_: false, - details: "top hat details", - imageURI: "top hat image" + details: "ipfs://bafkreigi7amzxywtped6uz5spo73n7zolxtymxeaqnwmizryv3mp46v63e", + imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" }); // autonomous admin @@ -66,8 +66,8 @@ contract Deploy is Script { maxSupply: 1, toggle: modulePlaceholder, mutable_: true, - details: "autonomous admin details", - imageURI: "autonomous admin image" + details: "ipfs://bafkreihe2rxghtnomgaxs5fv2suxog6bdxkgxxifik7z6gtu65mi3oycue", + imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" }); // admin hat @@ -76,8 +76,8 @@ contract Deploy is Script { maxSupply: 5, toggle: modulePlaceholder, mutable_: true, - details: "admin details", - imageURI: "admin image" + details: "ipfs://bafkreiax5tjyhestv5op33cje6yrhsaylnblu7t6tl7w25qmhl4cojpap4", + imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" }); // caster hat @@ -86,8 +86,8 @@ contract Deploy is Script { maxSupply: 1000, toggle: modulePlaceholder, // will be overriden by the first admin mutable_: true, - details: "caster details", - imageURI: "caster image" + details: "ipfs://bafkreig325iyeqwpzigo4anb2qjzux5lu4gww4ewna23pbtluys52pmtcy", + imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" }); } @@ -122,6 +122,8 @@ contract Deploy is Script { treeTemplate[3] = _casterHatTemplate; } + _setFarcasterContracts(); + /** * @dev Deploy the contract to a deterministic address via forge's create2 deployer factory, which is at this * address on all chains: `0x4e59b44847b379578588920cA78FbF26c0B4956C`. From 060cb44a0786306b47b20608a6b4b9ad84ab1b1b Mon Sep 17 00:00:00 2001 From: Ido Date: Mon, 4 Nov 2024 23:26:02 +0200 Subject: [PATCH 2/3] fix key gateway contract address in test --- test/HatsFarcasterBundler.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/HatsFarcasterBundler.t.sol b/test/HatsFarcasterBundler.t.sol index 797c566..3560e6f 100644 --- a/test/HatsFarcasterBundler.t.sol +++ b/test/HatsFarcasterBundler.t.sol @@ -25,7 +25,7 @@ contract HatsFarcasterBundlerTest is Deploy, Test { FarcasterContracts public farcasterContracts = FarcasterContracts({ IdGateway: 0x00000000Fc25870C6eD6b6c7E41Fb078b7656f69, idRegistry: 0x00000000Fc6c5F01Fc30151999387Bb99A9f489b, - keyGateway: 0x00000000Fc25870C6eD6b6c7E41Fb078b7656f69, + keyGateway: 0x00000000fC56947c7E7183f8Ca4B62398CaAdf0B, keyRegistry: 0x00000000Fc1237824fb747aBDE0FF18990E59b7e, signedKeyRequestValidator: 0x00000000FC700472606ED4fA22623Acf62c60553 }); From b56b9a3bca6f8fff27720d5665bcf12eea11e440 Mon Sep 17 00:00:00 2001 From: Ido Date: Mon, 4 Nov 2024 23:27:22 +0200 Subject: [PATCH 3/3] default image for all hats except top hat --- script/Deploy.s.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 3c2ede4..c45fa64 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -67,7 +67,7 @@ contract Deploy is Script { toggle: modulePlaceholder, mutable_: true, details: "ipfs://bafkreihe2rxghtnomgaxs5fv2suxog6bdxkgxxifik7z6gtu65mi3oycue", - imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" + imageURI: "" }); // admin hat @@ -77,7 +77,7 @@ contract Deploy is Script { toggle: modulePlaceholder, mutable_: true, details: "ipfs://bafkreiax5tjyhestv5op33cje6yrhsaylnblu7t6tl7w25qmhl4cojpap4", - imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" + imageURI: "" }); // caster hat @@ -87,7 +87,7 @@ contract Deploy is Script { toggle: modulePlaceholder, // will be overriden by the first admin mutable_: true, details: "ipfs://bafkreig325iyeqwpzigo4anb2qjzux5lu4gww4ewna23pbtluys52pmtcy", - imageURI: "ipfs://bafkreiflezpk3kjz6zsv23pbvowtatnd5hmqfkdro33x5mh2azlhne3ah4" + imageURI: "" }); }