fix: merge conflicts

mrgnlabs · Jul 24, 2024 · dcdd6d8 · dcdd6d8
1 parent 3794e08
commit dcdd6d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...i-v2-trading/src/components/common/Pool/CreatePoolDialog/components/CreatePoolLoading.tsx b/...i-v2-trading/src/components/common/Pool/CreatePoolDialog/components/CreatePoolLoading.tsx
@@ -58,7 +58,7 @@ const DEFAULT_USDC_BANK_CONFIG: BankConfigOpt = {
   operationalState: OperationalState.Operational,
 
   oracle: {
-    setup: OracleSetup.PythEma,
+    setup: OracleSetup.PythLegacy,
     keys: [new PublicKey("Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD")],
   },
   oracleMaxAge: 300,
@@ -92,7 +92,7 @@ const DEFAULT_TOKEN_BANK_CONFIG: BankConfigOpt = {
   operationalState: OperationalState.Operational,
 
   oracle: {
-    setup: OracleSetup.PythEma,
+    setup: OracleSetup.PythLegacy,
     keys: [],
   },
   oracleMaxAge: null,
@@ -285,7 +285,7 @@ export const CreatePoolLoading = ({ poolCreatedData, setIsOpen, setIsCompleted }
       tokenBankConfig.borrowLimit = new BigNumber(100); // todo: update this according to price
       tokenBankConfig.depositLimit = new BigNumber(10000); // todo: update this according to price
       tokenBankConfig.oracle = {
-        setup: OracleSetup.PythEma,
+        setup: OracleSetup.PythLegacy,
         keys: [new PublicKey(poolCreatedData.oracle)],
       };
 

diff --git a/...i-v2-trading/src/components/common/Pool/CreatePoolScript/components/CreatePoolLoading.tsx b/...i-v2-trading/src/components/common/Pool/CreatePoolScript/components/CreatePoolLoading.tsx
@@ -48,7 +48,7 @@ const DEFAULT_USDC_BANK_CONFIG: BankConfigOpt = {
   operationalState: OperationalState.Operational,
 
   oracle: {
-    setup: OracleSetup.PythEma,
+    setup: OracleSetup.PythLegacy,
     keys: [new PublicKey("Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD")],
   },
   oracleMaxAge: 300,
@@ -82,7 +82,7 @@ const DEFAULT_TOKEN_BANK_CONFIG: BankConfigOpt = {
   operationalState: OperationalState.Operational,
 
   oracle: {
-    setup: OracleSetup.PythEma,
+    setup: OracleSetup.PythLegacy,
     keys: [],
   },
   oracleMaxAge: 300,

diff --git a/turbo.json b/turbo.json
@@ -88,6 +88,7 @@
     "GCP_PRIVATE_KEY",
     "NEXT_PUBLIC_WALLET_KEY",
     "NEXT_PUBLIC_ENABLE_BANK_SCRIPT",
-    "RESEND_API_KEY"
+    "RESEND_API_KEY",
+    "NEXT_PUBLIC_STAGE_TOKENS"
   ]
 }