Deploy to arb1 (#77)

TrueFiEng · Jun 18, 2024 · 17ccd73 · 17ccd73
1 parent 268791a
commit 17ccd73
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/packages/contracts/deployments.json b/packages/contracts/deployments.json
@@ -1,5 +1,8 @@
 {
+  "42161": {
+    "address": "0x1E7aC276CBdae55689Df1d99108d69Fff444cB88"
+  },
   "421614": {
     "address": "0x2cc7f85730052dA7389e276115975a5dB1e7A668"
   }
-}
+}
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
@@ -67,4 +67,7 @@ module.exports = {
       arbitrumOne: process.env.ARBISCAN_API_KEY,
     },
   },
+  sourcify: {
+    enabled: true,
+  },
 }
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -38,7 +38,8 @@
     "rinkeby:init-bids": "hardhat --network rinkeby init-bids",
     "ethereum:generate-random-numbers": "hardhat --network ethereum generate-random-numbers",
     "arbitrum:withdrawals-stats": "hardhat --network arbitrum withdrawals-stats",
-    "deploy:arb-sepolia": "hardhat run scripts/deploy.ts --network arbSepolia"
+    "deploy:arb-sepolia": "hardhat run --network arbSepolia scripts/deploy.ts",
+    "deploy:arb1": "hardhat --network arbitrum run scripts/deploy.ts"
   },
   "devDependencies": {
     "@ethereum-waffle/chai": "^3.4.3",

diff --git a/packages/contracts/scripts/deployAuctionRaffle.ts b/packages/contracts/scripts/deployAuctionRaffle.ts
@@ -62,6 +62,9 @@ export async function deployAuctionRaffle(opts?: {
       ...vrfConfig,
       ...opts?.vrfConfig,
     },
+    {
+      gasLimit: 10_000_000,
+    },
   ]
 
   const auctionRaffle = await new AuctionRaffle__factory(deployer).deploy(...auctionRaffleArgs)
@@ -86,7 +89,7 @@ export async function deployAuctionRaffle(opts?: {
     })
     await run('verify:verify', {
       address: auctionRaffle.address,
-      constructorArguments: auctionRaffleArgs,
+      constructorArguments: auctionRaffleArgs.slice(0, -1),
     })
   }
 

diff --git a/packages/contracts/scripts/deploymentConfig.ts b/packages/contracts/scripts/deploymentConfig.ts
@@ -10,34 +10,32 @@ interface DeploymentConfig {
   raffleWinnersCount: BigNumberish
   reservePrice: BigNumberish
   minBidIncrement: BigNumberish
-  bidVerifier: string
 }
 
 export const scoreAttestationVerifierConfig = {
   version: '1',
-  initialAttestor: '0x0b657D6E696974a0DDfa6266d512A50339c2a968',
-  initialRequiredScore: 10,
+  initialAttestor: '0x527974D1270283BA158934b64f8a91C0E1F62024',
+  initialRequiredScore: 20,
 }
 
 export const vrfConfig = {
-  // arb sepolia
-  vrfCoordinator: '0x50d47e4142598E3411aA864e08a44284e471AC6f',
-  linkToken: '0xb1D4538B4571d411F07960EF2838Ce337FE1E80E',
+  // arb1, VRF 2.0 (not 2.5!)
+  vrfCoordinator: '0x41034678D6C633D8a95c75e1138A360a28bA15d1',
+  linkToken: '0xf97f4df75117a78c1a5a0dbb814af92458539fb4',
   linkPremium: parseEther('0.005'),
-  gasLaneKeyHash: '0x027f94ff1465b3525f9fc03e9ff7d6d2c0953482246dd6ae07570c45d6631414', // 50 gwei
+  gasLaneKeyHash: '0x68d24f9a037a649944964c2a1ebd0b2918f4a243d2a99701cc22b548cf2daff0', // 150 gwei
   callbackGasLimit: 2_500_000, // maximum
   minConfirmations: 1, // minimum
-  subId: 235,
+  subId: 150,
 }
 
 export const config: DeploymentConfig = {
-  initialOwner: '0x511ECC4c955626DDaD88f20493E39E71be8133B6',
-  biddingStartTime: 1710956968, // 2024-03-20T17:49:28.000Z
-  biddingEndTime: 1711561768, // 2024-03-27T17:49:28.000Z
-  claimingEndTime: 1712166568, // 2024-04-03T17:49:28.000Z
+  initialOwner: '0x8AE57CE9eC11a53Ca655E02B36482C0cB406ACee',
+  biddingStartTime: 1718721000, // 2024-06-18T14:30:00Z
+  biddingEndTime: 1720569540, // 2024-07-09T23:59:00Z
+  claimingEndTime: 1722470340, // 2024-07-31T23:59:00Z
   auctionWinnersCount: 20,
-  raffleWinnersCount: 80,
-  reservePrice: utils.parseEther('0.25'),
-  minBidIncrement: utils.parseEther('0.01'),
-  bidVerifier: '0x0b657D6E696974a0DDfa6266d512A50339c2a968',
+  raffleWinnersCount: 184,
+  reservePrice: utils.parseEther('0.08'),
+  minBidIncrement: utils.parseEther('0.003'),
 }
diff --git a/packages/frontend/src/blockchain/auctionAddresses.ts b/packages/frontend/src/blockchain/auctionAddresses.ts
@@ -3,7 +3,7 @@ import { Hex } from 'viem'
 import { arbitrum, arbitrumSepolia, hardhat } from 'wagmi/chains'
 
 export const AUCTION_ADDRESSES: Record<SupportedChainId, Hex> = {
-  [arbitrum.id]: '0xe2EF0Cb2A3ccf8107D28f01dC721055225D5fedA',
+  [arbitrum.id]: '0x1E7aC276CBdae55689Df1d99108d69Fff444cB88',
   [arbitrumSepolia.id]: '0x2cc7f85730052dA7389e276115975a5dB1e7A668',
   [hardhat.id]: '0xa513e6e4b8f2a923d98304ec87f64353c4d5c853',
 }