Merge branch 'staging' into production

OpenQDev · Feb 21, 2023 · 87256f4 · 87256f4
2 parents 5e3f92d + 6c55f4b
commit 87256f4
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 19 deletions.
diff --git a/.env.contracts b/.env.contracts
@@ -7,10 +7,14 @@ DEPOSIT_MANAGER_IMPLEMENTATION_ADDRESS=0x610178dA211FEF7D417bC0e6FeD39F05609AD78
 OPENQ_BOUNTY_FACTORY_ADDRESS=0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
 ATOMIC_BOUNTY_BEACON_ADDRESS=0x3Aa5ebB10DC797CAC828524e59A333d0A371443c
 ONGOING_BOUNTY_BEACON_ADDRESS=0xc6e7DF5E7b4f2A278906862b61205850344D4e7d
-TIERED_BOUNTY_BEACON_ADDRESS=0x59b670e9fA9D0A427751Af201D676719a970857b
+TIERED_PERCENTAGE_BOUNTY_BEACON_ADDRESS=0x59b670e9fA9D0A427751Af201D676719a970857b
 TIERED_FIXED_BOUNTY_BEACON_ADDRESS=0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1
 OPENQ_TOKEN_WHITELIST_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
 OPENQ_DEPLOY_BLOCK_NUMBER=1
+ATOMIC_BOUNTY_IMPLEMENTATION=0x0B306BF915C4d645ff596e518fAf3F9669b97016
+ONGOING_BOUNTY_IMPLEMENTATION=0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1
+TIERED_PERCENTAGE_BOUNTY_IMPLEMENTATION=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
+TIERED_FIXED_BOUNTY_IMPLEMENTATION=0x68B1D87F95878fE05B998F19b66F4baba5De1aed
 MOCK_LINK_TOKEN_ADDRESS=0x5FbDB2315678afecb367f032d93F642f64180aa3
 MOCK_DAI_TOKEN_ADDRESS=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
 MOCK_NFT_TOKEN_ADDRESS=0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512

diff --git a/deploy/deploy_contracts.js b/deploy/deploy_contracts.js
@@ -46,7 +46,7 @@ async function deployContracts() {
 	console.log('DEPLOYING OPENQ MAIN CONTRACT');
 	console.log('------------------------------------------');
 
-	console.log('Deploying OpenQV2 (Implementation)...');
+	console.log('Deploying OpenQV1 (Implementation)...');
 	const OpenQImplementationV2 = await ethers.getContractFactory('OpenQV1');
 	const openQImplementationV2 = await OpenQImplementationV2.deploy();
 	await openQImplementationV2.deployed();
@@ -258,10 +258,14 @@ DEPOSIT_MANAGER_IMPLEMENTATION_ADDRESS=${depositManager.address}
 OPENQ_BOUNTY_FACTORY_ADDRESS=${bountyFactory.address}
 ATOMIC_BOUNTY_BEACON_ADDRESS=${atomicBountyBeacon.address}
 ONGOING_BOUNTY_BEACON_ADDRESS=${ongoingBountyBeacon.address}
-TIERED_BOUNTY_BEACON_ADDRESS=${tieredBountyBeacon.address}
+TIERED_PERCENTAGE_BOUNTY_BEACON_ADDRESS=${tieredBountyBeacon.address}
 TIERED_FIXED_BOUNTY_BEACON_ADDRESS=${tieredFixedBountyBeacon.address}
 OPENQ_TOKEN_WHITELIST_ADDRESS=${openQTokenWhitelist.address}
 OPENQ_DEPLOY_BLOCK_NUMBER=${deployBlockNumber}
+ATOMIC_BOUNTY_IMPLEMENTATION=${atomicBountyV1.address}
+ONGOING_BOUNTY_IMPLEMENTATION=${ongoingBountyV1.address}
+TIERED_PERCENTAGE_BOUNTY_IMPLEMENTATION=${tieredPercentageBountyV1.address}
+TIERED_FIXED_BOUNTY_IMPLEMENTATION=${tieredFixedBountyV1.address}
 MOCK_LINK_TOKEN_ADDRESS=${mockLink.address}
 MOCK_DAI_TOKEN_ADDRESS=${mockDai.address}
 MOCK_NFT_TOKEN_ADDRESS=${mockNFT.address}
@@ -275,8 +279,16 @@ CLAIM_MANAGER_IMPLEMENTATION_ADDRESS=${claimManagerV1.address}
 DEPOSIT_MANAGER_PROXY_ADDRESS=${depositManagerProxy.address}
 DEPOSIT_MANAGER_IMPLEMENTATION_ADDRESS=${depositManager.address}
 OPENQ_BOUNTY_FACTORY_ADDRESS=${bountyFactory.address}
+ATOMIC_BOUNTY_BEACON_ADDRESS=${atomicBountyBeacon.address}
+ONGOING_BOUNTY_BEACON_ADDRESS=${ongoingBountyBeacon.address}
+TIERED_PERCENTAGE_BOUNTY_BEACON_ADDRESS=${tieredBountyBeacon.address}
+TIERED_FIXED_BOUNTY_BEACON_ADDRESS=${tieredFixedBountyBeacon.address}
 OPENQ_TOKEN_WHITELIST_ADDRESS=${openQTokenWhitelist.address}
 OPENQ_DEPLOY_BLOCK_NUMBER=${deployBlockNumber}
+ATOMIC_BOUNTY_IMPLEMENTATION=${atomicBountyV1.address}
+ONGOING_BOUNTY_IMPLEMENTATION=${ongoingBountyV1.address}
+TIERED_PERCENTAGE_BOUNTY_IMPLEMENTATION=${tieredPercentageBountyV1.address}
+TIERED_FIXED_BOUNTY_IMPLEMENTATION=${tieredFixedBountyV1.address}
 MOCK_LINK_TOKEN_ADDRESS=0x326C977E6efc84E512bB9C30f76E30c160eD06FB
 MOCK_DAI_TOKEN_ADDRESS=0xfe4F5145f6e09952a5ba9e956ED0C25e3Fa4c7F1
 MOCK_NFT_TOKEN_ADDRESS=0xfe4F5145f6e09952a5ba9e956ED0C25e3Fa4c7F1

diff --git a/deploy/verify_contracts.js b/deploy/verify_contracts.js
@@ -32,9 +32,9 @@ async function verifyContracts() {
 	}
 
 	try {
-		console.log('\nVerifying BountyV1');
+		console.log('\nVerifying ClaimManager');
 		await hre.run('verify:verify', {
-			address: process.env.OPENQ_BOUNTY_IMPLEMENTATION_ADDRESS,
+			address: process.env.CLAIM_MANAGER_IMPLEMENTATION_ADDRESS,
 		});
 	} catch (error) {
 		console.log(error);
@@ -50,20 +50,86 @@ async function verifyContracts() {
 	}
 
 	try {
-		console.log('\nVerifying ClaimManager');
+		console.log('\nVerifying AtomicBountyV1');
 		await hre.run('verify:verify', {
-			address: process.env.CLAIM_MANAGER_IMPLEMENTATION_ADDRESS,
+			address: process.env.ATOMIC_BOUNTY_IMPLEMENTATION,
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying OngoingBountyV1');
+		await hre.run('verify:verify', {
+			address: process.env.ONGOING_BOUNTY_IMPLEMENTATION,
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying TieredPercentageBountyV1');
+		await hre.run('verify:verify', {
+			address: process.env.TIERED_FIXED_BOUNTY_IMPLEMENTATION,
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying TieredFixedBountyV1');
+		await hre.run('verify:verify', {
+			address: process.env.TIERED_FIXED_BOUNTY_IMPLEMENTATION,
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying AtomicBountyBeacon');
+		await hre.run('verify:verify', {
+			address: process.env.ATOMIC_BOUNTY_BEACON_ADDRESS,
+			constructorArguments: [
+				process.env.ATOMIC_BOUNTY_IMPLEMENTATION
+			],
+			contract: 'contracts/Bounty/Proxy/BountyBeacon.sol:BountyBeacon'
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying OngoingBountyBeacon');
+		await hre.run('verify:verify', {
+			address: process.env.ONGOING_BOUNTY_BEACON_ADDRESS,
+			constructorArguments: [
+				process.env.ONGOING_BOUNTY_IMPLEMENTATION
+			],
+			contract: 'contracts/Bounty/Proxy/BountyBeacon.sol:BountyBeacon'
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	try {
+		console.log('\nVerifying TieredPercentageBountyBeacon');
+		await hre.run('verify:verify', {
+			address: process.env.TIERED_PERCENTAGE_BOUNTY_BEACON_ADDRESS,
+			constructorArguments: [
+				process.env.TIERED_PERCENTAGE_BOUNTY_IMPLEMENTATION
+			],
+			contract: 'contracts/Bounty/Proxy/BountyBeacon.sol:BountyBeacon'
 		});
 	} catch (error) {
 		console.log(error);
 	}
 
 	try {
-		console.log('\nVerifying BountyBeacon');
+		console.log('\nVerifying TieredFixedBountyBeacon');
 		await hre.run('verify:verify', {
-			address: process.env.BOUNTY_BEACON_ADDRESS,
+			address: process.env.TIERED_FIXED_BOUNTY_BEACON_ADDRESS,
 			constructorArguments: [
-				process.env.OPENQ_BOUNTY_IMPLEMENTATION_ADDRESS
+				process.env.TIERED_FIXED_BOUNTY_IMPLEMENTATION
 			],
 			contract: 'contracts/Bounty/Proxy/BountyBeacon.sol:BountyBeacon'
 		});
@@ -77,14 +143,10 @@ async function verifyContracts() {
 			address: process.env.OPENQ_BOUNTY_FACTORY_ADDRESS,
 			constructorArguments: [
 				process.env.OPENQ_PROXY_ADDRESS,
-				address: process.env.OPENQ_BOUNTY_FACTORY_ADDRESS,
-				constructorArguments: [
-					process.env.OPENQ_PROXY_ADDRESS,
-					process.env.ATOMIC_BOUNTY_BEACON_ADDRESS,
-					process.env.ONGOING_BOUNTY_BEACON_ADDRESS,
-					process.env.TIERED_BOUNTY_BEACON_ADDRESS,
-					process.env.TIERED_FIXED_BOUNTY_BEACON_ADDRESS
-				]
+				process.env.ATOMIC_BOUNTY_BEACON_ADDRESS,
+				process.env.ONGOING_BOUNTY_BEACON_ADDRESS,
+				process.env.TIERED_PERCENTAGE_BOUNTY_BEACON_ADDRESS,
+				process.env.TIERED_FIXED_BOUNTY_BEACON_ADDRESS
 			]
 		});
 	} catch (error) {
@@ -96,7 +158,7 @@ async function verifyContracts() {
 		await hre.run('verify:verify', {
 			address: process.env.OPENQ_TOKEN_WHITELIST_ADDRESS,
 			constructorArguments: [
-				20
+				5
 			]
 		});
 	} catch (error) {