From 9fe20870edec24588623a0a2d33c811e45463923 Mon Sep 17 00:00:00 2001 From: Brian Le Date: Tue, 26 Mar 2024 16:33:16 -0400 Subject: [PATCH 1/3] update deploy constants and verify --- deploy/LibDeployConstants.sol | 6 +++--- utils/verify.ts | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/deploy/LibDeployConstants.sol b/deploy/LibDeployConstants.sol index 6122f2e6..dc265a76 100644 --- a/deploy/LibDeployConstants.sol +++ b/deploy/LibDeployConstants.sol @@ -132,7 +132,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: 0x1CA2007a81F8A7491BB6E11D8e357FD810896454, tokenDistributorV2: 0x49a3caab781f711aD74C9d2F34c3cbD835d6A608, - tokenDistributorV3: 0x0b7b86DCEAa8015CeD8F625d3b7A961b31fB05FE, + tokenDistributorV3: 0x8723b021b008dd370fbec1c791c390a2bc957654, baseExternalURL: "https://party.app/party/" }); @@ -168,7 +168,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: address(0), tokenDistributorV2: 0xf0560F963538017CAA5081D96f839FE5D265acCB, - tokenDistributorV3: 0x65778953D291DD1e3a97c6b4d8BEea188B650077, + tokenDistributorV3: 0x6c7d98079023F05c2B57DFc933fa0903A2C95411, baseExternalURL: "https://base.party.app/party/" }); @@ -203,7 +203,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: address(0), tokenDistributorV2: address(0), - tokenDistributorV3: 0x5B19016a409a888326b05949391EB8797dD5F75B, + tokenDistributorV3: 0x9a85aD6eb642bd1409df73484B331a1925B6c6cd, baseExternalURL: "https://zora.party.app/party/" }); diff --git a/utils/verify.ts b/utils/verify.ts index ac82d704..665b5e7e 100644 --- a/utils/verify.ts +++ b/utils/verify.ts @@ -85,6 +85,10 @@ const generateStandardJson = ( chain, )} --optimizer-runs ${optimizerRuns} --constructor-args '${constructorArgsEncoded}' --compiler-version ${compilerVersion}`; + if (chain === "zora") { + cmd += " --verifier-url 'https://api.routescan.io/v2/network/mainnet/evm/7777777/etherscan'"; + } + if (libraries.length > 0) { cmd += ` --libraries ${libraries.join(" ")}`; } @@ -326,7 +330,10 @@ export const verify = async (chain: string, skip: boolean) => { const contractName = result["contract_name"]; const guid = result["guid"]; - const cmd = `forge verify-check ${guid} --chain-id ${getChainId(chain)}`; + let cmd = `forge verify-check ${guid} --chain-id ${getChainId(chain)}`; + if (apiKey) { + cmd += ` --etherscan-api-key ${apiKey}`; + } console.log(); console.log(`Checking verification result for ${contractName}...`); From d924023fbccf50b504956c86d4bbdd2e81d6aecd Mon Sep 17 00:00:00 2001 From: Brian Le Date: Tue, 26 Mar 2024 16:40:52 -0400 Subject: [PATCH 2/3] fix checksum --- deploy/LibDeployConstants.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/LibDeployConstants.sol b/deploy/LibDeployConstants.sol index dc265a76..d952514a 100644 --- a/deploy/LibDeployConstants.sol +++ b/deploy/LibDeployConstants.sol @@ -132,7 +132,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: 0x1CA2007a81F8A7491BB6E11D8e357FD810896454, tokenDistributorV2: 0x49a3caab781f711aD74C9d2F34c3cbD835d6A608, - tokenDistributorV3: 0x8723b021b008dd370fbec1c791c390a2bc957654, + tokenDistributorV3: 0x8723B021b008dD370FBEc1C791C390A2BC957654, baseExternalURL: "https://party.app/party/" }); From f538cee6a0f79455085b20f688f90d2e78173335 Mon Sep 17 00:00:00 2001 From: Brian Le Date: Wed, 8 May 2024 12:05:32 -0400 Subject: [PATCH 3/3] undo incorrect address changes --- deploy/LibDeployConstants.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/LibDeployConstants.sol b/deploy/LibDeployConstants.sol index d952514a..6122f2e6 100644 --- a/deploy/LibDeployConstants.sol +++ b/deploy/LibDeployConstants.sol @@ -132,7 +132,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: 0x1CA2007a81F8A7491BB6E11D8e357FD810896454, tokenDistributorV2: 0x49a3caab781f711aD74C9d2F34c3cbD835d6A608, - tokenDistributorV3: 0x8723B021b008dD370FBEc1C791C390A2BC957654, + tokenDistributorV3: 0x0b7b86DCEAa8015CeD8F625d3b7A961b31fB05FE, baseExternalURL: "https://party.app/party/" }); @@ -168,7 +168,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: address(0), tokenDistributorV2: 0xf0560F963538017CAA5081D96f839FE5D265acCB, - tokenDistributorV3: 0x6c7d98079023F05c2B57DFc933fa0903A2C95411, + tokenDistributorV3: 0x65778953D291DD1e3a97c6b4d8BEea188B650077, baseExternalURL: "https://base.party.app/party/" }); @@ -203,7 +203,7 @@ library LibDeployConstants { contributionRouterInitialFee: 0.00055 ether, tokenDistributorV1: address(0), tokenDistributorV2: address(0), - tokenDistributorV3: 0x9a85aD6eb642bd1409df73484B331a1925B6c6cd, + tokenDistributorV3: 0x5B19016a409a888326b05949391EB8797dD5F75B, baseExternalURL: "https://zora.party.app/party/" });