New deployment to baseGoerli

passportxyz · Dec 13, 2023 · 25fa1b2 · 25fa1b2
1 parent f53f182
commit 25fa1b2
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 11 deletions.
diff --git a/.openzeppelin/unknown-84531.json b/.openzeppelin/unknown-84531.json
@@ -20,6 +20,26 @@
       "address": "0xC18cd1D2ED2C76655a10d869BAbb1f599f5ff403",
       "txHash": "0xaf3ca9a8b4e36d8f9d2af80133649d080fe9092f504c0f382ac3c8d9afbae5dc",
       "kind": "uups"
+    },
+    {
+      "address": "0x2716d65e8f41C4114182B165Bb0247EEf5F7B1D5",
+      "txHash": "0xc0b1ab45332efcc518107cc0096fac7cce8d74e510d16828bbad9c0f0117263a",
+      "kind": "uups"
+    },
+    {
+      "address": "0x6025449584bd403fdcaC241d854FAB8e07Ed55BE",
+      "txHash": "0xce4d58a2ca1983ea4100a0d8ca04a37eaf4f92c708c19fbd014cdd4d376aba82",
+      "kind": "uups"
+    },
+    {
+      "address": "0xCB9d40015Feade7f06E7F63e79b19a5dc661C254",
+      "txHash": "0xbe4d17a1c769241e6f25d19c38c7ecfca63f1d33b474ef3ae2fb562ea9e33b00",
+      "kind": "uups"
+    },
+    {
+      "address": "0x88265f8860F78b7A448739bD79594bdC82329b69",
+      "txHash": "0xe17a287dd557206f8add88ea258936bd0cd70bc1f2f4d677b0650ff636b1bd83",
+      "kind": "uups"
     }
   ],
   "impls": {

diff --git a/contracts/GitcoinAttester.sol b/contracts/GitcoinAttester.sol
@@ -17,6 +17,7 @@ contract GitcoinAttester is UUPSUpgradeable, OwnableUpgradeable, PausableUpgrade
   mapping(address => bool) public verifiers;
 
   // The instance of the EAS contract.
+  // TODO: make this public
   IEAS eas;
 
   // Emitted when a verifier is added to the allow-list.
@@ -65,6 +66,7 @@ contract GitcoinAttester is UUPSUpgradeable, OwnableUpgradeable, PausableUpgrade
    * @param _easContractAddress The address of the EAS contract.
    */
   function setEASAddress(address _easContractAddress) public onlyOwner {
+    // TODO: emit event
     eas = IEAS(_easContractAddress);
   }
 

diff --git a/deployments/onchainInfo.json b/deployments/onchainInfo.json
@@ -10,24 +10,24 @@
       "address": "0x4200000000000000000000000000000000000020"
     },
     "GitcoinResolver": {
-      "address": "0xA07c1A85B51dA271128A0D8D518d3c8cce8fa040"
+      "address": "0xCB9d40015Feade7f06E7F63e79b19a5dc661C254"
     },
     "GitcoinVerifier": {
-      "address": "0xDDF163c916Af6d65893299AD4DAF5F00200078dC"
+      "address": "0x6025449584bd403fdcaC241d854FAB8e07Ed55BE"
     },
     "GitcoinAttester": {
-      "address": "0x848e645776315bB3880CDb47Aa6007124fb9F134"
+      "address": "0x2716d65e8f41C4114182B165Bb0247EEf5F7B1D5"
     },
     "easSchemas": {
       "passport": {
-        "uid": "0x4c753bbc4c61802c2fb59a729938e7b3a25f61fbd1ce38495d8bc4399cf30759"
+        "uid": "0x463f7e91cd5a44fe22d4df4b9d6595f0d432c8f6a473eed28b0b8c6bafe4f5a0"
       },
       "score": {
-        "uid": "0xa88619d54906d6b78e7b237e17c0f14505ca25f2ca3a2dbcfb97887c18bcf3a4"
+        "uid": "0x9937aea3a59cd2cc008aeaa9ec9dd1d15739d0532809428f755d4d72b94ed916"
       }
     },
     "GitcoinPassportDecoder": {
-      "address": "0xC18cd1D2ED2C76655a10d869BAbb1f599f5ff403"
+      "address": "0x88265f8860F78b7A448739bD79594bdC82329b69"
     }
   },
   "0xa": {

diff --git a/scripts/deploySchemas.ts b/scripts/deploySchemas.ts
@@ -32,11 +32,12 @@ export async function main() {
     contract: "GitcoinVerifier",
     network: hre.network.name,
     chainId: hre.network.config.chainId,
+    registryAddress: schemaRegistryContractAddress,
     resolverAddress: resolverAddress,
     scoreSchema: scoreSchema,
     passportSchema: passportSchema,
     revocable: revocable,
-    address: await (await hre.ethers.provider.getSigner()).getAddress()
+    deplyerAddress: await (await hre.ethers.provider.getSigner()).getAddress()
   });
 
   const txScoreSchema = await schemaRegistry.register(

diff --git a/scripts/deployVerifierAndAttester.ts b/scripts/deployVerifierAndAttester.ts
@@ -4,6 +4,7 @@ import hre from "hardhat";
 import {
   assertEnvironment,
   confirmContinue,
+  getEASAddress,
   getIssuerAddress,
 } from "./lib/utils";
 import { deployAttester } from "./lib/attester";
@@ -13,11 +14,13 @@ assertEnvironment();
 
 export async function main() {
   const issuerAddress = getIssuerAddress();
+  const easAddress = getEASAddress();
   await confirmContinue({
     contract: "GitcoinAttester and GitcoinVerifier",
     network: hre.network.name,
     chainId: hre.network.config.chainId,
-    issuerAddress: issuerAddress
+    issuerAddress: issuerAddress,
+    easAddress: easAddress
   });
 
 

diff --git a/scripts/setupDecoder.ts b/scripts/setupDecoder.ts
@@ -39,13 +39,18 @@ export async function main() {
     `✅ Set GitcoinResolver address ${getResolverAddress()} on GitcoinPassportDecoder.`
   );
 
-  await passportDecoder.setSchemaUID(chainInfo.easSchemas.passport.uid);
+  await passportDecoder.setPassportSchemaUID(chainInfo.easSchemas.passport.uid);
   console.log(
     `✅ Set Passport SchemaUID to ${chainInfo.easSchemas.passport.uid} on GitcoinPassportDecoder.`
   );
 
-  const providers = newBitMap.map((bit) => bit.name);
-  await passportDecoder.addProviders(providers);
+  await passportDecoder.setScoreSchemaUID(chainInfo.easSchemas.score.uid);
+  console.log(
+    `✅ Set Passport SchemaUID to ${chainInfo.easSchemas.score.uid} on GitcoinPassportDecoder.`
+  );
+
+  // const providers = newBitMap.map((bit) => bit.name);
+  // await passportDecoder.addProviders(providers);
 
   console.log(`✅ Added providers to GitcoinPassportDecoder.`);
 }