Add admin storage public key to local disc prov config (#2849)

AudiusProject · Apr 6, 2022 · 028b5cc · 028b5cc
1 parent 64db154
commit 028b5cc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/discovery-provider/default_config.ini b/discovery-provider/default_config.ini
@@ -42,6 +42,7 @@ rewards_manager_program_address = DDZDcYdQFEMwcu2Mwo75yGFjJ1mUQyyXLWzhZLEVFcei
 rewards_manager_account = 71hWFVYokLaN1PNYzTAWi13EfJ7Xt9VbSWUKsXUT8mxE
 rewards_manager_min_slot = 0
 anchor_data_program_id = 6znDH9AxEi9RSeDR7bt9PVYRUS4XxZLKhni96io9Aykb
+anchor_admin_storage_public_key = 9Urkpt297u2BmLRpNrwsudDjK6jjcWxTaDZtyS2NRuqX
 
 [redis]
 url = redis://localhost:5379/0

diff --git a/libs/initScripts/configureLocalDiscProv.js b/libs/initScripts/configureLocalDiscProv.js
@@ -17,6 +17,7 @@ const SOLANA_REWARDS_MANAGER_ADDRESS = 'audius_solana_rewards_manager_program_ad
 const SOLANA_REWARDS_MANAGER_ACCOUNT = 'audius_solana_rewards_manager_account'
 
 const SOLANA_ANCHOR_PROGRAM_ID = 'audius_solana_anchor_data_program_id'
+const SOLANA_ANCHOR_ADMIN_STORAGE_PUBLIC_KEY = 'audius_solana_anchor_admin_storage_public_key'
 
 // LOCAL DEVELOPMENT ONLY
 // Updates audius_eth_contracts_registry in discovery provider
@@ -30,6 +31,7 @@ const configureLocalDiscProv = async () => {
   const rewardsManagerAddress = solanaConfig.rewardsManagerAddress
   const rewardsManagerAccount = solanaConfig.rewardsManagerAccount
   const anchorProgramId = solanaConfig.anchorProgramId
+  const anchorAdminStoragePublicKey = solanaConfig.anchorAdminStoragePublicKey
   console.log(`waudioAddress: ${waudioMint}, claimableTokenAddress: ${claimableTokenAddress}, waudioMint=${waudioMint}`)
   const envPath = path.join(process.cwd(), '../../', 'discovery-provider/compose/.env')
 
@@ -44,7 +46,8 @@ const configureLocalDiscProv = async () => {
     claimableTokenAddress,
     rewardsManagerAddress,
     rewardsManagerAccount,
-    anchorProgramId
+    anchorProgramId,
+    anchorAdminStoragePublicKey,
   )
 }
 
@@ -60,7 +63,8 @@ const _updateDiscoveryProviderEnvFile = async (
   claimableTokenAddress,
   rewardsManagerAddress,
   rewardsManagerAccount,
-  anchorProgramId
+  anchorProgramId,
+  anchorAdminStoragePublicKey,
 ) => {
   const fileStream = fs.createReadStream(readPath)
   const rl = readline.createInterface({
@@ -77,7 +81,8 @@ const _updateDiscoveryProviderEnvFile = async (
   let claimableTokenAddressFound = false
   let rewardsAddressFound = false
   let rewardsAccountFound = false
-  let anchorProgramIdLineFound = false
+  let anchorProgramIdFound = false
+  let anchorAdminStoragePublicKeyFound = false
 
   const ethRegistryAddressLine = `${ETH_CONTRACTS_REGISTRY}=${ethRegistryAddress}`
   const solanaTrackListenCountAddressLine = `${SOLANA_TRACK_LISTEN_COUNT_ADDRESS}=${solanaTrackListenCountAddress}`
@@ -88,6 +93,7 @@ const _updateDiscoveryProviderEnvFile = async (
   const rewardsManagerAddressLine = `${SOLANA_REWARDS_MANAGER_ADDRESS}=${rewardsManagerAddress}`
   const rewardsManagerAccountLine = `${SOLANA_REWARDS_MANAGER_ACCOUNT}=${rewardsManagerAccount}`
   const anchorProgramIdLine = `${SOLANA_ANCHOR_PROGRAM_ID}=${anchorProgramId}`
+  const anchorAdminStoragePublicKeyLine = `${SOLANA_ANCHOR_ADMIN_STORAGE_PUBLIC_KEY}=${anchorAdminStoragePublicKey}`
 
   for await (const line of rl) {
     if (line.includes(ETH_CONTRACTS_REGISTRY)) {
@@ -116,7 +122,10 @@ const _updateDiscoveryProviderEnvFile = async (
       rewardsAccountFound = true
     } else if (line.includes(SOLANA_ANCHOR_PROGRAM_ID)) {
       output.push(anchorProgramIdLine)
-      anchorProgramIdLineFound = true
+      anchorProgramIdFound = true
+    } else if (line.includes(SOLANA_ANCHOR_ADMIN_STORAGE_PUBLIC_KEY)) {
+      output.push(anchorAdminStoragePublicKeyLine)
+      anchorAdminStoragePublicKeyFound = true
     } else {
       output.push(line)
     }
@@ -145,9 +154,12 @@ const _updateDiscoveryProviderEnvFile = async (
   if (!rewardsAccountFound) {
     output.push(rewardsManagerAccountLine)
   }
-  if (!anchorProgramIdLineFound) {
+  if (!anchorProgramIdFound) {
     output.push(anchorProgramIdLine)
   }
+  if (!anchorAdminStoragePublicKeyFound) {
+    output.push(anchorAdminStoragePublicKeyLine)
+  }
   fs.writeFileSync(writePath, output.join('\n'))
   console.log(`Updated DISCOVERY PROVIDER ${writePath} ${ETH_CONTRACTS_REGISTRY}=${ethRegistryAddress} ${output}`)
 }

diff --git a/solana-programs/start.sh b/solana-programs/start.sh
@@ -152,10 +152,10 @@ cd ../../
 cat <<EOF
 {
     "anchorProgramId": "$anchor_program_id",
-    "anchorAdminKeypairPublicKey": "$admin_keypair_publickey",
-    "anchorAdminKeypairPrivateKey": "$admin_keypair_privatekey",
-    "anchorAdminStorageKeypairPublicKey": "$admin_storage_keypair_publickey",
-    "anchorAdminStorageKeypairPrivateKey": "$admin_storage_keypair_privatekey",
+    "anchorAdminPublicKey": "$admin_keypair_publickey",
+    "anchorAdminPrivateKey": "$admin_keypair_privatekey",
+    "anchorAdminStoragePublicKey": "$admin_storage_keypair_publickey",
+    "anchorAdminStoragePrivateKey": "$admin_storage_keypair_privatekey",
     "trackListenCountAddress": "$track_listen_count_address",
     "audiusEthRegistryAddress": "$audius_eth_registry_address",
     "validSigner": "$valid_signer",