feat(#559): Use pyth oracle for mobile onboarding (#566)

* Use pyth oracle for mobile onboarding * Fix tests * Fix dev workflow
helium · Feb 5, 2024 · 1b751e9 · 1b751e9
1 parent 474a4ce
commit 1b751e9
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 565 deletions.
diff --git a/Anchor.toml b/Anchor.toml
@@ -77,7 +77,7 @@ address = "propFYxqmVcufMhk5esNMrexq2ogHbbC2kP9PU1qxKs" # Proposal
 address = "66t3XARU6Ja3zj91gDZ2KoNLJHEMTYPSKqJWYb6PJJBA" # Proposal IDL
 
 [[test.validator.clone]]
-address = "moraMdsjyPFz8Lp1RJGoW4bQriSF5mHE7Evxt7hytSF" # Mobile price oracle
+address = "JBaTytFv1CmGNkyNiLu16jFMXNZ49BGfy4bYAYZdkxg5" # Mobile price oracle
 
 # Pyth price oracle
 [[test.validator.clone]]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/helium-admin-cli/src/create-dao.ts b/packages/helium-admin-cli/src/create-dao.ts
@@ -500,7 +500,6 @@ export async function run(args: any = process.argv) {
     await sendInstructionsOrSquads({
       provider,
       instructions: [
-        ComputeBudgetProgram.setComputeUnitLimit({ units: 400000 }),
         await hemProgram.methods
           .initializeDataOnlyV0({
             authority,

diff --git a/packages/helium-admin-cli/src/create-subdao.ts b/packages/helium-admin-cli/src/create-subdao.ts
@@ -33,7 +33,6 @@ import {
 } from '@solana/spl-governance';
 import { getAssociatedTokenAddress } from '@solana/spl-token';
 import {
-  ComputeBudgetProgram,
   LAMPORTS_PER_SOL,
   PublicKey,
   SystemProgram,
@@ -331,9 +330,6 @@ export async function run(args: any = process.argv) {
         .initializeRegistrarV0({
           positionUpdateAuthority: null,
         })
-        .preInstructions([
-          ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }),
-        ])
         .accounts({
           realm,
           realmGoverningTokenMint: subdaoKeypair.publicKey,
@@ -459,7 +455,6 @@ export async function run(args: any = process.argv) {
     await sendInstructionsOrSquads({
       provider,
       instructions: [
-        ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }),
         await initSubdaoMethod.instruction(),
       ],
       executeTransaction: true,

diff --git a/packages/helium-entity-manager-sdk/src/resolvers.ts b/packages/helium-entity-manager-sdk/src/resolvers.ts
@@ -33,9 +33,12 @@ export const heliumEntityManagerResolvers = combineResolvers(
     mint: "dntMint",
     owner: "maker",
   }),
-  resolveIndividual(async ({ path }) => {
+  resolveIndividual(async ({ path, provider }) => {
     if (path[path.length - 1] == "dntPrice") {
-      return new PublicKey("moraMdsjyPFz8Lp1RJGoW4bQriSF5mHE7Evxt7hytSF");
+      if (provider.connection.rpcEndpoint.includes("devnet") || provider.connection.rpcEndpoint.includes("test")) {
+        return new PublicKey("BmUdxoioVgoRTontomX8nBjWbnLevtxeuBYaLipP8GTQ");
+      }
+      return new PublicKey("JBaTytFv1CmGNkyNiLu16jFMXNZ49BGfy4bYAYZdkxg5");
     }
   }),
   resolveIndividual(async ({ path, args, accounts, provider }) => {

diff --git a/packages/monitor-service/package.json b/packages/monitor-service/package.json
@@ -6,7 +6,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "Apache-2.0",
-  "version": "0.6.27",
+  "version": "0.6.26",
   "description": "Prometheus monitoring of important accounts on Solana",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
-    "@helium/account-fetch-cache": "^0.6.27",
-    "@helium/circuit-breaker-sdk": "^0.6.27",
-    "@helium/data-credits-sdk": "^0.6.27",
-    "@helium/helium-entity-manager-sdk": "^0.6.27",
-    "@helium/helium-sub-daos-sdk": "^0.6.27",
-    "@helium/idls": "^0.6.27",
-    "@helium/lazy-distributor-sdk": "^0.6.27",
-    "@helium/lazy-transactions-sdk": "^0.6.27",
-    "@helium/price-oracle-sdk": "^0.6.27",
-    "@helium/spl-utils": "^0.6.27",
-    "@metaplex-foundation/mpl-bubblegum": "^3.0.0",
+    "@helium/account-fetch-cache": "^0.6.26",
+    "@helium/circuit-breaker-sdk": "^0.6.26",
+    "@helium/data-credits-sdk": "^0.6.26",
+    "@helium/helium-entity-manager-sdk": "^0.6.26",
+    "@helium/helium-sub-daos-sdk": "^0.6.26",
+    "@helium/idls": "^0.6.26",
+    "@helium/lazy-distributor-sdk": "^0.6.26",
+    "@helium/lazy-transactions-sdk": "^0.6.26",
+    "@helium/price-oracle-sdk": "^0.6.26",
+    "@helium/spl-utils": "^0.6.26",
+    "@metaplex-foundation/mpl-bubblegum": "^0.7.0",
     "@metaplex-foundation/mpl-token-metadata": "^2.10.0",
     "@solana/spl-account-compression": "^0.1.7",
     "@solana/spl-token": "^0.3.8",