fix contracts addresses

gitcoinco · Oct 25, 2023 · 3799fef · 3799fef
1 parent b8f1839
commit 3799fef
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 42 deletions.
diff --git a/docker/deploy-contracts.sh b/docker/deploy-contracts.sh
@@ -2,31 +2,31 @@ 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
-
-time pnpm run deploy-qf-factory dev
-time pnpm run deploy-qf-implementation dev
-time pnpm run link-qf-implementation dev
-
-time pnpm run deploy-merkle-factory dev
-time pnpm run deploy-merkle-implementation dev
-time pnpm run link-merkle-implementation dev
-
-time pnpm run deploy-direct-factory dev
-time pnpm run deploy-direct-implementation dev
-time pnpm run link-direct-implementation dev
-
-time pnpm run deploy-allo-settings dev
-time pnpm run set-protocol-fee dev
-
-time pnpm run deploy-round-factory dev
-time pnpm run deploy-round-implementation dev
-time pnpm run link-round-implementation dev
+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 && \
+\
+time pnpm run deploy-qf-factory dev && \
+time pnpm run deploy-qf-implementation dev && \
+time pnpm run link-qf-implementation dev && \
+\
+time pnpm run deploy-merkle-factory dev && \
+time pnpm run deploy-merkle-implementation dev && \
+time pnpm run link-merkle-implementation dev && \
+\
+time pnpm run deploy-direct-factory dev && \
+time pnpm run deploy-direct-implementation dev && \
+time pnpm run link-direct-implementation dev && \
+\
+time pnpm run deploy-allo-settings dev && \
+time pnpm run set-protocol-fee dev && \
+\
+time pnpm run deploy-round-factory dev && \
+time pnpm run deploy-round-implementation dev && \
+time pnpm run link-round-implementation dev && \
 time pnpm run link-allo-settings dev
 
 # pnpm run create-program dev

diff --git a/scripts/config/payoutStrategy.config.ts b/scripts/config/payoutStrategy.config.ts
@@ -9,8 +9,8 @@ type DeployParams = Record<string, PayoutParams>;
 
 export const MerklePayoutParams: DeployParams = {
   dev: {
-    factory: "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0",
-    implementation: "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82",
+    factory: "0x0B306BF915C4d645ff596e518fAf3F9669b97016",
+    implementation: "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1",
     contract: "",
   },
   mainnet: {

diff --git a/scripts/config/round.config.ts b/scripts/config/round.config.ts
@@ -11,8 +11,8 @@ type DeployParams = Record<string, RoundParams>;
 
 export const roundParams: DeployParams = {
   dev: {
-    roundFactoryContract: "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44",
-    roundImplementationContract: "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f",
+    roundFactoryContract: "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f",
+    roundImplementationContract: "0x4A679253410272dd5232B3Ff7cF5dbB88f295319",
     roundContract: "",
   },
   mainnet: {

diff --git a/scripts/config/votingStrategy.config.ts b/scripts/config/votingStrategy.config.ts
@@ -9,8 +9,8 @@ type DeployParams = Record<string, QFVotingParams>;
 
 export const QFVotingParams: DeployParams = {
   dev: {
-    factory: "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6",
-    implementation: "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
+    factory: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e",
+    implementation: "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0",
     contract: "",
   },
   mainnet: {

diff --git a/scripts/dev/populate/projects.ts b/scripts/dev/populate/projects.ts
@@ -65,20 +65,25 @@ async function main() {
   );
 
   for (let i = 1; i < 4; i++) {
-    const logo = loadFixture(`projects/${i}/logo.png`);
-    const logoCid = await uploadFileToPinata(logo);
+    let metadataCid = "";
 
-    const banner = loadFixture(`projects/${i}/banner.png`);
-    const bannerCid = await uploadFileToPinata(banner);
+    if (pinataBaseUrl !== undefined) {
+      const logo = loadFixture(`projects/${i}/logo.png`);
+      const logoCid = await uploadFileToPinata(logo);
 
-    const metadata = JSON.parse(
-      loadFixture(`projects/${i}/metadata.json`).toString()
-    );
-    metadata.title = `${metadata.title} (${network.config.chainId})`;
-    metadata.logoImg = logoCid;
-    metadata.bannerImg = bannerCid;
+      const banner = loadFixture(`projects/${i}/banner.png`);
+      const bannerCid = await uploadFileToPinata(banner);
+
+      const metadata = JSON.parse(
+        loadFixture(`projects/${i}/metadata.json`).toString()
+      );
+      metadata.title = `${metadata.title} (${network.config.chainId})`;
+      metadata.logoImg = logoCid;
+      metadata.bannerImg = bannerCid;
+
+      metadataCid = await uploadJSONToPinata(metadata);
+    }
 
-    const metadataCid = await uploadJSONToPinata(metadata);
     await projectRegistry.connect(account1).createProject({
       protocol: 1,
       pointer: metadataCid,