Fix tests

deps/pyth/Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD.json

@@ -0,0 +1,13 @@
+{
+  "pubkey": "Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD",
+  "account": {
+    "lamports": 23942400,
+    "data": [
+      "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JLsMYazqQb6FzfUFAAAAABoLBAAAAAAAAQAAAAAAAACjNr0NAAAAAIXN9QUAAAAAGgsEAAAAAAABAAAAAAAAALE2vQ0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+      "base64"
+    ],
+    "owner": "FsJ3A3u2vn5cTVofAjvy6y5kwABJAqYWpe4975bi2epH",
+    "executable": false,
+    "rentEpoch": 361
+  }
+}

deps/test-validator-params.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+function print_args {
+  # pyth
+  echo "--account Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD deps/pyth/Gnt27xtC473ZT2Mw5u8wZ68Z3gULkSTb5DuxJy7eJotD.json"
+
+  # programs
+  echo "--bpf-program HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ ./deps/scope/scope.so"
+
+  # scope
+  echo "--account 3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C deps/scope/3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C.json" # oracle prices
+  echo "--account GMprgtqUv2G74GAFHhHhrH21n1cnnNZcPb6TAz5GhqU deps/scope/GMprgtqUv2G74GAFHhHhrH21n1cnnNZcPb6TAz5GhqU.json" # token metadatas
+
+  # options
+  echo "--reset --quiet -u m"
+}
+
+print_args

package.json

@@ -11,7 +11,7 @@
     "watch": "tsc --watch",
     "lint": "yarn prettier --check .; yarn eslint .",
     "lint:fix": "yarn prettier --write .; yarn eslint . --fix",
-    "start-validator": "solana-test-validator --bpf-program HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ ./deps/scope.so --clone 3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C --clone Chpu5ZgfWX5ZzVpUx9Xvv4WPM75Xd7zPJNDPsFnCpLpk --clone AdTiP7QyjUyv6crF4H8z7fxJKU7Z5eCAGvJN1Y55cXxb --quiet --reset -u m",
+    "start-validator": "solana-test-validator $(./deps/test-validator-params.sh)",
     "start-validator-and-test": "yarn start-server-and-test 'yarn start-validator' http://127.0.0.1:8899/health test",
     "codegen": "anchor-client-gen ./src/scope.json ./src/ --program-id HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ && anchor-client-gen ./src/kamino.json ./src/@codegen/kamino --program-id 6LtLpnUFNByNXLyCoK9wA2MykKAmQNZKBdY8s47dehDc"
   },

src/constants/index.ts

@@ -16,16 +16,10 @@ export const SCOPE_MAINNET_CONFIG: ScopeConfig = {
   kliquidityProgramId: new PublicKey('6LtLpnUFNByNXLyCoK9wA2MykKAmQNZKBdY8s47dehDc'),
 };
 export const SCOPE_DEVNET_CONFIG: ScopeConfig = {
-  oracleMappings: new PublicKey('Chpu5ZgfWX5ZzVpUx9Xvv4WPM75Xd7zPJNDPsFnCpLpk'),
-  oraclePrices: new PublicKey('3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C'),
-  programId: new PublicKey('HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ'),
-  configurationAccount: new PublicKey('AdTiP7QyjUyv6crF4H8z7fxJKU7Z5eCAGvJN1Y55cXxb'),
+  ...SCOPE_MAINNET_CONFIG,
   kliquidityProgramId: new PublicKey('E6qbhrt4pFmCotNUSSEh6E5cRQCEJpMcd79Z56EG9KY'),
 };
 export const SCOPE_LOCALNET_CONFIG: ScopeConfig = {
-  oracleMappings: new PublicKey('Chpu5ZgfWX5ZzVpUx9Xvv4WPM75Xd7zPJNDPsFnCpLpk'),
-  oraclePrices: new PublicKey('3NJYftD5sjVfxSnUdZ1wVML8f3aC6mp1CXCL6L7TnU8C'),
-  programId: new PublicKey('HFn8GnPADiny6XqUoWE8uRPPxb29ikn4yTuPa9MF2fWJ'),
-  configurationAccount: new PublicKey('AdTiP7QyjUyv6crF4H8z7fxJKU7Z5eCAGvJN1Y55cXxb'),
+  ...SCOPE_MAINNET_CONFIG,
   kliquidityProgramId: new PublicKey('E6qbhrt4pFmCotNUSSEh6E5cRQCEJpMcd79Z56EG9KY'),
 };