fix(lazer): update solana contract setup script

pyth-network · Nov 18, 2024 · a275ba8 · a275ba8
1 parent 629f011
commit a275ba8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lazer/contracts/solana/package.json b/lazer/contracts/solana/package.json
@@ -4,19 +4,23 @@
     "fix:format": "prettier --write **/*.*",
     "test:format": "prettier --check **/*.*",
     "test:anchor": "CARGO_TARGET_DIR=\"$PWD/target\" anchor test",
-    "test": "pnpm run test:format && pnpm run test:anchor"
+    "test": "pnpm run test:format && pnpm run test:anchor",
+    "setup": "anchor build && pnpm ts-node scripts/setup.ts"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.3",
-    "ts-mocha": "^10.0.0",
     "@types/bn.js": "^5.1.0",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.0.0",
+    "@types/yargs": "^17.0.33",
+    "chai": "^4.3.4",
+    "mocha": "^9.0.3",
+    "prettier": "^2.6.2",
+    "ts-mocha": "^10.0.0",
+    "ts-node": "^10.9.2",
     "typescript": "^4.3.5",
-    "prettier": "^2.6.2"
+    "yargs": "^17.7.2"
   }
 }
diff --git a/lazer/contracts/solana/programs/pyth-lazer-solana-contract/src/lib.rs b/lazer/contracts/solana/programs/pyth-lazer-solana-contract/src/lib.rs
@@ -6,9 +6,9 @@ use {
 declare_id!("pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt");
 
 pub mod storage {
-    use anchor_lang::declare_id;
+    use anchor_lang::prelude::{pubkey, Pubkey};
 
-    declare_id!("3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL");
+    pub const ID: Pubkey = pubkey!("3rdJbqfnagQ4yx9HXJViD4zc4xpiSqmFsKpPuSCQVyQL");
 
     #[test]
     fn test_storage_id() {

diff --git a/lazer/contracts/solana/tsconfig.json b/lazer/contracts/solana/tsconfig.json
@@ -5,6 +5,7 @@
     "lib": ["es2015"],
     "module": "commonjs",
     "target": "es6",
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "resolveJsonModule": true
   }
 }