chore(csp): merge csp brach 3 and 4

copernicspace · Oct 10, 2023 · 9e2e4a1 · 9e2e4a1
1 parent 91f6316
commit 9e2e4a1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -46,7 +46,7 @@ const config = {
 			accounts: {
 				mnemonic: secret?.POLYGON_SEED
 			},
-			gasPrice: 100000000000
+			gasPrice: 200000000000
 		},
 		mumbai: {
 			url: `https://polygon-mumbai.g.alchemy.com/v2/${secret?.MUMBAI_ALCHEMY_API}`,

diff --git a/utils/scripts/data/csp-batch-3.csv b/utils/scripts/data/csp-batch-3.csv
@@ -0,0 +1,4 @@
+email,passport,address,hash
+[email protected],Citizen,0x974CCBEA8d50eCE1066b4533D6bCBC465F754161,0xdb16cafa31c78c7ab99d599f6cce46d7254d2d1986686ec64f890190164143eb
+[email protected],Citizen,0xad9cC1a85e74Bd1300c57082ba86Ed21E6AAA5e8,0x1dea3c4ba27e5ea25d565cd34e60ed7af63dd6fc7cf3aa9fd7bb45da3b8ab7aa
+[email protected],Citizen,0x01DFB97cb9f9378A41f722aA0390a2B4063B636E,0x93acdf985784e0c7acf336b57966d96a9bf710d9376890709bdd9f7fa70646c5
diff --git a/utils/scripts/data/csp-batch-4.csv b/utils/scripts/data/csp-batch-4.csv
@@ -0,0 +1,7 @@
+email,passport,address,hash
+[email protected],Ambassador + Citizen,0x9a98340868C0B9a1d43bAb3C5c6Ff0fB5C312529,0x24ff7cd6c3170846bc8f376598346529837ae672f23f86c4869eb30fd5dee4f1
+[email protected],Ambassador,0x86c779b3741e83A36A2a236780d436E4EC673Af4,0xccee1aa4e73f4ab437a08c51be02ccf64b2133da910a96cbed7246fc84e82720
+[email protected],10 Ambassador + 3 Citizen,0xA1bC8E79cA4e0a84471f72aEAF311CC1178209ed,0xc20082c309ece5e551cbad31ebe5f26df3a3db157fa300a1565e03e33a8ac893
+Scott Page,Ambassador,0x2aaefB3AbCBa0BF9B1A906AaC69819eE9DEc670b,0x2906eb9dd2c915e03ba6a732476ffd5e43f92a517498313fcbe2310c83edc80c
+[email protected],Ambassador + Citizen,0x37AC1Da4Fac8EcD5A0c11295d22A06Ee4e022583,0x2c17f85db54a7869e04cbb73ea5db184802ffbb1db5c0a631ce2fc5f61c0ba6e
+[email protected],	Ambassador + 3 Citizen,0x93AE00b25985C4830b626Da81a5A4a5Cbd1443da,0x9397c170df7a8ba3d5676ec94a918abd8a43c804f97609020141e1ddfa191973
diff --git a/utils/scripts/spaceibles/spacepass.distribute.ts b/utils/scripts/spaceibles/spacepass.distribute.ts
@@ -47,11 +47,9 @@ async function main() {
 	const address = hre.network.name === 'mumbai' ? addressMumbai : addressPolygon
 	const contract = await ethers.getContractAt(name, address, deployer)
 
-<<<<<<< Updated upstream
-	const csvIn = 'utils/scripts/data/csp-batch-2.csv'
-=======
+
 	const csvIn = 'utils/scripts/data/csp-batch-5.csv'
->>>>>>> Stashed changes
+
 	const csvData = fs.readFileSync(csvIn, 'utf8')
 
 	const records = Papa.parse(csvData, {