From f105e41b734d347ca7d877e63ff8b6ce3c048669 Mon Sep 17 00:00:00 2001 From: Andrea Franz Date: Sun, 11 Feb 2024 22:57:16 +0100 Subject: [PATCH] remove populate action from deploy script and update contracts addresses --- docker/deploy-contracts.sh | 2 -- scripts/config/allo.config.ts | 2 +- scripts/config/payoutStrategy.config.ts | 4 ++-- scripts/config/votingStrategy.config.ts | 4 ++-- scripts/dev/populate/projects.ts | 6 +++--- .../direct/deployDirectPayoutStrategyFactory.ts | 7 +++---- .../merkle/deployMerklePayoutStrategyFactory.ts | 7 +++---- scripts/program/deployProgramFactory.ts | 5 +++-- scripts/round/deployRoundFactory.ts | 5 +++-- .../quadraticFunding/deployQFVotingStrategyFactory.ts | 5 +++-- 10 files changed, 23 insertions(+), 24 deletions(-) diff --git a/docker/deploy-contracts.sh b/docker/deploy-contracts.sh index 312f1f47..619493f6 100755 --- a/docker/deploy-contracts.sh +++ b/docker/deploy-contracts.sh @@ -3,8 +3,6 @@ export SKIP_CONFIRMATIONS=true TIMEFORMAT='(🟢 %3R seconds)'; time pnpm run deploy-project-registry dev && \ -time pnpm hardhat run scripts/dev/populate/projects.ts --network dev && \ -\ time pnpm run deploy-program-factory dev && \ time pnpm run deploy-program-implementation dev && \ time pnpm run link-program-implementation dev && \ diff --git a/scripts/config/allo.config.ts b/scripts/config/allo.config.ts index fceca6a3..15190636 100644 --- a/scripts/config/allo.config.ts +++ b/scripts/config/allo.config.ts @@ -9,7 +9,7 @@ type DeployParams = Record; export const AlloSettingsParams: DeployParams = { dev: { - alloSettingsContract: "0x59b670e9fA9D0A427751Af201D676719a970857b", + alloSettingsContract: "0x3Aa5ebB10DC797CAC828524e59A333d0A371443c", newProtocolFeePercentage: 0, newProtocolTreasury: "", }, diff --git a/scripts/config/payoutStrategy.config.ts b/scripts/config/payoutStrategy.config.ts index 5b0a901d..c1b9e878 100644 --- a/scripts/config/payoutStrategy.config.ts +++ b/scripts/config/payoutStrategy.config.ts @@ -9,8 +9,8 @@ type DeployParams = Record; export const MerklePayoutParams: DeployParams = { dev: { - factory: "0x0B306BF915C4d645ff596e518fAf3F9669b97016", - implementation: "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1", + factory: "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0", + implementation: "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82", contract: "", }, mainnet: { diff --git a/scripts/config/votingStrategy.config.ts b/scripts/config/votingStrategy.config.ts index b4b7ce86..46bf11bf 100644 --- a/scripts/config/votingStrategy.config.ts +++ b/scripts/config/votingStrategy.config.ts @@ -9,8 +9,8 @@ type DeployParams = Record; export const QFVotingParams: DeployParams = { dev: { - factory: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e", - implementation: "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0", + factory: "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6", + implementation: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318", contract: "", }, mainnet: { diff --git a/scripts/dev/populate/projects.ts b/scripts/dev/populate/projects.ts index 4c62b7cc..53eec354 100644 --- a/scripts/dev/populate/projects.ts +++ b/scripts/dev/populate/projects.ts @@ -51,8 +51,6 @@ async function main() { console.log(`🟡 Creating projects (pinataBaseUrl ${pinataBaseUrl})`); const network = hre.network; - const [account1] = await ethers.getSigners(); - if (hre.network.name !== "dev") { console.error("This script can only be use in local dev environments"); process.exit(1); @@ -82,9 +80,11 @@ async function main() { metadata.logoImg = logoCid; metadata.bannerImg = bannerCid; metadataCid = await uploadJSONToPinata(metadata); + console.log("Created project", metadata.title); } - await projectRegistry.connect(account1).createProject({ + console.log(`Creating project ${i}...`); + await projectRegistry.createProject({ protocol: 1, pointer: metadataCid, }); diff --git a/scripts/payoutStrategy/direct/deployDirectPayoutStrategyFactory.ts b/scripts/payoutStrategy/direct/deployDirectPayoutStrategyFactory.ts index 2d67b3e9..7caeb5dd 100644 --- a/scripts/payoutStrategy/direct/deployDirectPayoutStrategyFactory.ts +++ b/scripts/payoutStrategy/direct/deployDirectPayoutStrategyFactory.ts @@ -17,17 +17,16 @@ export async function main() { "DirectPayoutStrategyFactory" ); const contract = await upgrades.deployProxy(contractFactory); + const address = await contract.getAddress(); - console.log( - `Deploying Upgradable DirectPayoutStrategyFactory to ${contract.address}` - ); + console.log(`Deploying Upgradable DirectPayoutStrategyFactory to ${address}`); const resp = contract.deploymentTransaction(); await resp.wait(getBlocksToWait(hre.network.name)); console.log("✅ Deployed."); - return await contract.getAddress(); + return await address; } main().catch((error) => { diff --git a/scripts/payoutStrategy/merkle/deployMerklePayoutStrategyFactory.ts b/scripts/payoutStrategy/merkle/deployMerklePayoutStrategyFactory.ts index ef5285b4..e8e25bde 100644 --- a/scripts/payoutStrategy/merkle/deployMerklePayoutStrategyFactory.ts +++ b/scripts/payoutStrategy/merkle/deployMerklePayoutStrategyFactory.ts @@ -17,17 +17,16 @@ export async function main() { "MerklePayoutStrategyFactory" ); const contract = await upgrades.deployProxy(contractFactory); + const address = await contract.getAddress(); - console.log( - `Deploying Upgradable MerklePayoutStrategyFactory to ${contract.address}` - ); + console.log(`Deploying Upgradable MerklePayoutStrategyFactory to ${address}`); const resp = contract.deploymentTransaction(); await resp.wait(getBlocksToWait(hre.network.name)); console.log("✅ Deployed."); - return await contract.getAddress(); + return address; } main().catch((error) => { diff --git a/scripts/program/deployProgramFactory.ts b/scripts/program/deployProgramFactory.ts index 81a11e1f..973b2f1b 100644 --- a/scripts/program/deployProgramFactory.ts +++ b/scripts/program/deployProgramFactory.ts @@ -15,15 +15,16 @@ export async function main() { // Deploy ProgramFactory const contractFactory = await ethers.getContractFactory("ProgramFactory"); const contract = await upgrades.deployProxy(contractFactory, []); + const address = await contract.getAddress(); - console.log(`Deploying Upgradable ProgramFactory to ${contract.address}`); + console.log(`Deploying Upgradable ProgramFactory to ${address}`); const resp = contract.deploymentTransaction(); await resp.wait(getBlocksToWait(hre.network.name)); console.log("✅ Deployed."); - return await contract.getAddress(); + return address; } main().catch((error) => { diff --git a/scripts/round/deployRoundFactory.ts b/scripts/round/deployRoundFactory.ts index ae5520e4..5fb86914 100644 --- a/scripts/round/deployRoundFactory.ts +++ b/scripts/round/deployRoundFactory.ts @@ -16,15 +16,16 @@ export async function main() { // Deploy RoundImplementation const contractFactory = await ethers.getContractFactory("RoundFactory"); const contract = await upgrades.deployProxy(contractFactory); + const address = await contract.getAddress(); - console.log(`Deploying Upgradable RoundFactory to ${contract.address}`); + console.log(`Deploying Upgradable RoundFactory to ${address}`); const resp = contract.deploymentTransaction(); await resp.wait(getBlocksToWait(hre.network.name)); console.log("✅ Deployed."); - return await contract.getAddress(); + return address; } main().catch((error) => { diff --git a/scripts/votingStrategy/quadraticFunding/deployQFVotingStrategyFactory.ts b/scripts/votingStrategy/quadraticFunding/deployQFVotingStrategyFactory.ts index 8dd04eea..6afd4370 100644 --- a/scripts/votingStrategy/quadraticFunding/deployQFVotingStrategyFactory.ts +++ b/scripts/votingStrategy/quadraticFunding/deployQFVotingStrategyFactory.ts @@ -18,16 +18,17 @@ export async function main() { "QuadraticFundingVotingStrategyFactory" ); const contract = await upgrades.deployProxy(contractFactory); + const address = await contract.getAddress(); console.log( - `Deploying Upgradable QuadraticFundingVotingStrategyFactory to ${contract.address}` + `Deploying Upgradable QuadraticFundingVotingStrategyFactory to ${address}` ); const resp = contract.deploymentTransaction(); await resp.wait(getBlocksToWait(hre.network.name)); console.log("✅ Deployed."); - return await contract.getAddress(); + return address; } main().catch((error) => {