Fix verification and deploy to mainnet blast

deploy/Blast.s.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8;
+
+import "./blast/DeployBlast.s.sol";
+import "./LibDeployConstants.sol";
+
+contract BlastDeploy is DeployScriptBlast {
+    function _run() internal override {
+        console.log("Starting blast deploy script.");
+
+        deploy(LibDeployConstants.blast(this.getDeployer()));
+
+        console.log("Ending blast deploy script.");
+    }
+}

deploy/LibDeployConstants.sol

@@ -100,6 +100,40 @@ library LibDeployConstants {
         return deployConstants;
     }
 
+    function blast() internal pure returns (DeployConstants memory) {
+        address[] memory allowedERC20SwapOperatorTargets = new address[](0);
+
+        DeployConstants memory deployConstants = DeployConstants({
+            seaportExchangeAddress: 0x00000000000000ADc04C56Bf30aC9d3c0aAF14dC,
+            osZoraAuctionDuration: 1 days,
+            osZoraAuctionTimeout: 1 days,
+            osMinOrderDuration: 1 hours,
+            osMaxOrderDuration: 4 weeks,
+            zoraMinAuctionDuration: 1 days,
+            zoraMaxAuctionDuration: 4 weeks,
+            zoraMaxAuctionTimeout: 2 weeks,
+            minCancelDelay: 6 weeks,
+            maxCancelDelay: 12 weeks,
+            distributorEmergencyActionAllowedDuration: 365 days,
+            partyDaoMultisig: // Must fix. Left compile failing here on purpose
+            allowedERC20SwapOperatorTargets: allowedERC20SwapOperatorTargets,
+            osZone: 0x0000000000000000000000000000000000000000,
+            osConduitKey: 0xf984c55ca75735630c1c27d3d06969c1aa6af1df86d22ddc0e3a978ad6138e9f,
+            osConduitController: 0x00000000F9490004C11Cef243f5400493c00Ad63,
+            fractionalVaultFactory: 0x0000000000000000000000000000000000000000,
+            nounsAuctionHouse: 0x0000000000000000000000000000000000000000,
+            zoraReserveAuctionCoreEth: 0x0000000000000000000000000000000000000000,
+            networkName: "blast",
+            deployedNounsMarketWrapper: 0x0000000000000000000000000000000000000000,
+            contributionRouterInitialFee: 0.00055 ether,
+            tokenDistributorV1: address(0),
+            tokenDistributorV2: address(0),
+            baseExternalURL: "https://blast.party.app/party/"
+        });
+
+        return deployConstants;
+    }
+
     function blastSepolia(address multisig) internal pure returns (DeployConstants memory) {
         address[] memory allowedERC20SwapOperatorTargets = new address[](0);
 

deploy/blast/DeployBlast.s.sol

@@ -57,15 +57,15 @@ abstract contract DeployBlast {
     // temporary variables to store deployed contract addresses
     Globals public globals;
     AuctionCrowdfund public auctionCrowdfund;
-    InitialETHCrowdfundBlast public initialETHCrowdfund;
-    CrowdfundFactoryBlast public crowdfundFactory;
-    PartyBlast public party;
+    InitialETHCrowdfundBlast public initialETHCrowdfundBlast;
+    CrowdfundFactoryBlast public crowdfundFactoryBlast;
+    PartyBlast public partyBlast;
     PartyFactory public partyFactory;
     ProposalExecutionEngine public proposalExecutionEngine;
-    TokenDistributorBlast public tokenDistributor;
-    MetadataRegistryBlast public metadataRegistry;
-    BasicMetadataProviderBlast public basicMetadataProvider;
-    SSTORE2MetadataProviderBlast public sstore2MetadataProvider;
+    TokenDistributorBlast public tokenDistributorBlast;
+    MetadataRegistryBlast public metadataRegistryBlast;
+    BasicMetadataProviderBlast public basicMetadataProviderBlast;
+    SSTORE2MetadataProviderBlast public sstore2MetadataProviderBlast;
     RendererStorage public rendererStorage;
     CrowdfundNFTRenderer public crowdfundNFTRenderer;
     PartyNFTRenderer public partyNFTRenderer;
@@ -76,12 +76,12 @@ abstract contract DeployBlast {
     IGateKeeper public tokenGateKeeper;
     NounsMarketWrapper public nounsMarketWrapper;
     PixeldroidConsoleFont public pixeldroidConsoleFont;
-    AtomicManualPartyBlast public atomicManualParty;
-    ContributionRouterBlast public contributionRouter;
+    AtomicManualPartyBlast public atomicManualPartyBlast;
+    ContributionRouterBlast public contributionRouterBlast;
     AddPartyCardsAuthority public addPartyCardsAuthority;
     SellPartyCardsAuthority public sellPartyCardsAuthority;
     OffChainSignatureValidator public offChainSignatureValidator;
-    BondingCurveAuthorityBlast public bondingCurveAuthority;
+    BondingCurveAuthorityBlast public bondingCurveAuthorityBlast;
     address constant BLAST = 0x4300000000000000000000000000000000000002;
 
     function deploy(LibDeployConstants.DeployConstants memory deployConstants) public virtual {
@@ -100,14 +100,14 @@ abstract contract DeployBlast {
         console.log("  Deploying - TokenDistributorBlast");
         _switchDeployer(DeployerRole.TokenDistributor);
         _trackDeployerGasBefore();
-        tokenDistributor = new TokenDistributorBlast(
+        tokenDistributorBlast = new TokenDistributorBlast(
             globals,
             uint40(block.timestamp) + deployConstants.distributorEmergencyActionAllowedDuration,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - TokenDistributorBlast", address(tokenDistributor));
+        console.log("  Deployed - TokenDistributorBlast", address(tokenDistributorBlast));
         _switchDeployer(DeployerRole.Default);
 
         // DEPLOY_PROPOSAL_EXECUTION_ENGINE
@@ -139,9 +139,9 @@ abstract contract DeployBlast {
         console.log("### PartyBlast implementation");
         console.log("  Deploying - PartyBlast implementation");
         _trackDeployerGasBefore();
-        party = new PartyBlast(globals, BLAST);
+        partyBlast = new PartyBlast(globals, BLAST);
         _trackDeployerGasAfter();
-        console.log("  Deployed - PartyBlast implementation", address(party));
+        console.log("  Deployed - PartyBlast implementation", address(partyBlast));
 
         // DEPLOY_PARTY_FACTORY
         console.log("");
@@ -159,11 +159,11 @@ abstract contract DeployBlast {
         console.log("### InitialETHCrowdfundBlast crowdfund implementation");
         console.log("  Deploying - InitialETHCrowdfundBlast crowdfund implementation");
         _trackDeployerGasBefore();
-        initialETHCrowdfund = new InitialETHCrowdfundBlast(globals, BLAST);
+        initialETHCrowdfundBlast = new InitialETHCrowdfundBlast(globals, BLAST);
         _trackDeployerGasAfter();
         console.log(
             "  Deployed - InitialETHCrowdfundBlast crowdfund implementation",
-            address(initialETHCrowdfund)
+            address(initialETHCrowdfundBlast)
         );
 
         // DEPLOY_PARTY_CROWDFUND_FACTORY
@@ -172,9 +172,9 @@ abstract contract DeployBlast {
         console.log("  Deploying - CrowdfundFactoryBlast");
         _switchDeployer(DeployerRole.CrowdfundFactory);
         _trackDeployerGasBefore();
-        crowdfundFactory = new CrowdfundFactoryBlast(BLAST, deployConstants.partyDaoMultisig);
+        crowdfundFactoryBlast = new CrowdfundFactoryBlast(BLAST, deployConstants.partyDaoMultisig);
         _trackDeployerGasAfter();
-        console.log("  Deployed - CrowdfundFactoryBlast", address(crowdfundFactory));
+        console.log("  Deployed - CrowdfundFactoryBlast", address(crowdfundFactoryBlast));
         _switchDeployer(DeployerRole.Default);
 
         // DEPLOY_METADATA_REGISTRY
@@ -186,40 +186,43 @@ abstract contract DeployBlast {
         console.log("### MetadataRegistryBlast");
         console.log("  Deploying - MetadataRegistryBlast");
         _trackDeployerGasBefore();
-        metadataRegistry = new MetadataRegistryBlast(
+        metadataRegistryBlast = new MetadataRegistryBlast(
             globals,
             registrars,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - MetadataRegistryBlast", address(metadataRegistry));
+        console.log("  Deployed - MetadataRegistryBlast", address(metadataRegistryBlast));
 
         // DEPLOY_BASIC_METADATA_PROVIDER
         console.log("");
         console.log("### BasicMetadataProviderBlast");
         console.log("  Deploying - BasicMetadataProviderBlast");
         _trackDeployerGasBefore();
-        basicMetadataProvider = new BasicMetadataProviderBlast(
+        basicMetadataProviderBlast = new BasicMetadataProviderBlast(
             globals,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - BasicMetadataProviderBlast", address(basicMetadataProvider));
+        console.log("  Deployed - BasicMetadataProviderBlast", address(basicMetadataProviderBlast));
 
         // DEPLOY_SSTORE2_METADATA_PROVIDER
         console.log("");
         console.log("### SSTORE2MetadataProviderBlast");
         console.log("  Deploying - SSTORE2MetadataProviderBlast");
         _trackDeployerGasBefore();
-        sstore2MetadataProvider = new SSTORE2MetadataProviderBlast(
+        sstore2MetadataProviderBlast = new SSTORE2MetadataProviderBlast(
             globals,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - SSTORE2MetadataProviderBlast", address(sstore2MetadataProvider));
+        console.log(
+            "  Deployed - SSTORE2MetadataProviderBlast",
+            address(sstore2MetadataProviderBlast)
+        );
 
         // DEPLOY_RENDERER_STORAGE
         console.log("");
@@ -318,7 +321,7 @@ abstract contract DeployBlast {
         console.log("### BondingCurveAuthorityBlast");
         console.log("  Deploying - BondingCurveAuthorityBlast");
         _trackDeployerGasBefore();
-        bondingCurveAuthority = new BondingCurveAuthorityBlast(
+        bondingCurveAuthorityBlast = new BondingCurveAuthorityBlast(
             payable(deployConstants.partyDaoMultisig),
             250,
             1000,
@@ -327,7 +330,7 @@ abstract contract DeployBlast {
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - BondingCurveAuthorityBlast", address(bondingCurveAuthority));
+        console.log("  Deployed - BondingCurveAuthorityBlast", address(bondingCurveAuthorityBlast));
 
         // DEPLOY_BATCH_BUY_OPERATOR
         console.log("");
@@ -366,14 +369,14 @@ abstract contract DeployBlast {
         console.log("### ContributionRouterBlast");
         console.log("  Deploying - ContributionRouterBlast");
         _trackDeployerGasBefore();
-        contributionRouter = new ContributionRouterBlast(
+        contributionRouterBlast = new ContributionRouterBlast(
             deployConstants.partyDaoMultisig,
             deployConstants.contributionRouterInitialFee,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - ContributionRouterBlast", address(contributionRouter));
+        console.log("  Deployed - ContributionRouterBlast", address(contributionRouterBlast));
 
         // Deploy OFF_CHAIN_SIGNATURE_VALIDATOR
         console.log("");
@@ -389,14 +392,14 @@ abstract contract DeployBlast {
         console.log("### GateKeepers");
         console.log("  Deploying - AllowListGateKeeper");
         _trackDeployerGasBefore();
-        allowListGateKeeper = new AllowListGateKeeper(address(contributionRouter));
+        allowListGateKeeper = new AllowListGateKeeper(address(contributionRouterBlast));
         _trackDeployerGasAfter();
         console.log("  Deployed - AllowListGateKeeper", address(allowListGateKeeper));
 
         console.log("");
         console.log("  Deploying - TokenGateKeeper");
         _trackDeployerGasBefore();
-        tokenGateKeeper = new TokenGateKeeper(address(contributionRouter));
+        tokenGateKeeper = new TokenGateKeeper(address(contributionRouterBlast));
         _trackDeployerGasAfter();
         console.log("  Deployed - TokenGateKeeper", address(tokenGateKeeper));
 
@@ -416,13 +419,13 @@ abstract contract DeployBlast {
         console.log("");
         console.log("  Deploying - AtomicManualPartyBlast");
         _trackDeployerGasBefore();
-        atomicManualParty = new AtomicManualPartyBlast(
+        atomicManualPartyBlast = new AtomicManualPartyBlast(
             partyFactory,
             BLAST,
             deployConstants.partyDaoMultisig
         );
         _trackDeployerGasAfter();
-        console.log("  Deployed - AtomicManualPartyBlast", address(atomicManualParty));
+        console.log("  Deployed - AtomicManualPartyBlast", address(atomicManualPartyBlast));
 
         // Set Global values and transfer ownership
         {
@@ -443,7 +446,7 @@ abstract contract DeployBlast {
             );
             multicallData[n++] = abi.encodeCall(
                 globals.setAddress,
-                (LibGlobals.GLOBAL_TOKEN_DISTRIBUTOR, address(tokenDistributor))
+                (LibGlobals.GLOBAL_TOKEN_DISTRIBUTOR, address(tokenDistributorBlast))
             );
             multicallData[n++] = abi.encodeCall(
                 globals.setUint256,
@@ -560,7 +563,7 @@ abstract contract DeployBlast {
             );
             multicallData[n++] = abi.encodeCall(
                 globals.setAddress,
-                (LibGlobals.GLOBAL_METADATA_REGISTRY, address(metadataRegistry))
+                (LibGlobals.GLOBAL_METADATA_REGISTRY, address(metadataRegistryBlast))
             );
             multicallData[n++] = abi.encodeCall(
                 globals.setAddress,
@@ -675,28 +678,37 @@ contract DeployScriptBlast is Script, DeployBlast {
 
         AddressMapping[] memory addressMapping = new AddressMapping[](25);
         addressMapping[0] = AddressMapping("Globals", address(globals));
-        addressMapping[1] = AddressMapping("TokenDistributor", address(tokenDistributor));
+        addressMapping[1] = AddressMapping("TokenDistributorBlast", address(tokenDistributorBlast));
         addressMapping[2] = AddressMapping(
             "ProposalExecutionEngine",
             address(proposalExecutionEngine)
         );
-        addressMapping[3] = AddressMapping("Party", address(party));
+        addressMapping[3] = AddressMapping("PartyBlast", address(partyBlast));
         addressMapping[4] = AddressMapping("PartyFactory", address(partyFactory));
-        addressMapping[10] = AddressMapping("InitialETHCrowdfund", address(initialETHCrowdfund));
+        addressMapping[10] = AddressMapping(
+            "InitialETHCrowdfundBlast",
+            address(initialETHCrowdfundBlast)
+        );
         addressMapping[11] = AddressMapping(
             "CollectionBatchBuyOperator",
             address(collectionBatchBuyOperator)
         );
         addressMapping[12] = AddressMapping("ERC20SwapOperator", address(swapOperator));
-        addressMapping[13] = AddressMapping("CrowdfundFactory", address(crowdfundFactory));
-        addressMapping[14] = AddressMapping("MetadataRegistry", address(metadataRegistry));
+        addressMapping[13] = AddressMapping(
+            "CrowdfundFactoryBlast",
+            address(crowdfundFactoryBlast)
+        );
+        addressMapping[14] = AddressMapping(
+            "MetadataRegistryBlast",
+            address(metadataRegistryBlast)
+        );
         addressMapping[15] = AddressMapping(
-            "BasicMetadataProvider",
-            address(basicMetadataProvider)
+            "BasicMetadataProviderBlast",
+            address(basicMetadataProviderBlast)
         );
         addressMapping[16] = AddressMapping(
-            "SSTORE2MetadataProvider",
-            address(sstore2MetadataProvider)
+            "SSTORE2MetadataProviderBlast",
+            address(sstore2MetadataProviderBlast)
         );
         addressMapping[17] = AddressMapping("CrowdfundNFTRenderer", address(crowdfundNFTRenderer));
         addressMapping[18] = AddressMapping("PartyNFTRenderer", address(partyNFTRenderer));
@@ -708,13 +720,22 @@ contract DeployScriptBlast is Script, DeployBlast {
             "PixeldroidConsoleFont",
             address(pixeldroidConsoleFont)
         );
-        addressMapping[24] = AddressMapping("AtomicManualParty", address(atomicManualParty));
-        addressMapping[9] = AddressMapping("ContributionRouter", address(contributionRouter));
+        addressMapping[24] = AddressMapping(
+            "AtomicManualPartyBlast",
+            address(atomicManualPartyBlast)
+        );
+        addressMapping[9] = AddressMapping(
+            "ContributionRouterBlast",
+            address(contributionRouterBlast)
+        );
         addressMapping[8] = AddressMapping(
             "AddPartyCardsAuthority",
             address(addPartyCardsAuthority)
         );
-        addressMapping[7] = AddressMapping("BondingCurveAuthority", address(bondingCurveAuthority));
+        addressMapping[7] = AddressMapping(
+            "BondingCurveAuthorityBlast",
+            address(bondingCurveAuthorityBlast)
+        );
         addressMapping[6] = AddressMapping(
             "SellPartyCardsAuthority",
             address(sellPartyCardsAuthority)

package.json

@@ -29,6 +29,8 @@
     "deploy:zora": "DRY_RUN=0 forge script ./deploy/Zora.s.sol -vvv --rpc-url $ZORA_RPC_URL --broadcast --via-ir --skip test --optimize --optimizer-runs 50 --ffi --slow  --priority-gas-price 1",
     "deploy:blast-sepolia": "DRY_RUN=0 forge script ./deploy/BlastSepolia.s.sol -vvv --rpc-url $BLAST_SEPOLIA_RPC_URL --via-ir --broadcast --etherscan-api-key $ETHERSCAN_API_KEY --skip test --optimize --optimizer-runs 50 --ffi --slow",
     "deploy:blast-sepolia:dry": "DRY_RUN=1 forge script ./deploy/BlastSepolia.s.sol -vvv --rpc-url $BLAST_SEPOLIA_RPC_URL --via-ir --skip test --optimize --optimizer-runs 50 --ffi",
+    "deploy:blast": "DRY_RUN=0 forge script ./deploy/Blast.s.sol -vvv --rpc-url $BLAST_RPC_URL --via-ir --broadcast --etherscan-api-key $ETHERSCAN_API_KEY --skip test --optimize --optimizer-runs 50 --ffi --slow",
+    "deploy:blast:dry": "DRY_RUN=1 forge script ./deploy/Blast.s.sol -vvv --rpc-url $BLAST_RPC_URL --via-ir --skip test --optimize --optimizer-runs 50 --ffi",
     "decode-revert": "node js/decode-revert.js",
     "layout": "node js/gen-storage-layout.js",
     "coverage": "COVERAGE=true forge coverage --report lcov"

utils/deploy.ts

@@ -368,6 +368,7 @@ async function main() {
     "sepolia",
     "base-sepolia",
     "blast-sepolia",
+    "blast",
   ];
 
   if (!chain) {

utils/output-abis.ts

@@ -33,6 +33,16 @@ const RELEVANT_ABIS = [
   "OffChainSignatureValidator",
   "BondingCurveAuthority",
   "EZPartyBuilder",
+  "TokenDistributorBlast",
+  "PartyBlast",
+  "InitialETHCrowdfundBlast",
+  "CrowdfundFactoryBlast",
+  "MetadataRegistryBlast",
+  "BasicMetadataProviderBlast",
+  "SSTORE2MetadataProviderBlast",
+  "AtomicManualPartyBlast",
+  "ContributionRouterBlast",
+  "BondingCurveAuthorityBlast",
 ];
 
 // AFileName -> a_file_name