Not working

XLabs · Oct 14, 2024 · 79753f1 · 79753f1
1 parent 97834cc
commit 79753f1
Show file tree

Hide file tree

Showing 25 changed files with 632 additions and 438 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,5 +5,7 @@
   },
   "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
+  "rust-analyzer.cargo.features": ["idl-build"],
+  "rust-analyzer.check.features": ["idl-build"],
   "typescript.enablePromptUseWorkspaceTsdk": true
 }
diff --git a/Anchor.toml b/Anchor.toml
@@ -14,9 +14,9 @@ skip-lint = true
 [test]
 upgradeable = true
 
-[[test.genesis]]
-address = "ATqjh2vkjogyVUUNmXQssQZNSFGgSA7Tm6P1UzEUg85s"
-program = "target/sbf-solana-solana/release/solana_price_oracle.so"
+#[[test.genesis]]
+#address = "CefQJaxQTV28gCf4MMd1PgDHgCcRmuEHZgXZwjJReUY3"
+#program = "../relayer-infra-contracts/src/solana/target/sbf-solana-solana/release/solana_price_oracle.so"
 
 # [[test.genesis]]
 # address = "worm2ZoG2kUd4vFXhvjh93UUH596ayRfgQ2MgjNMTth" # Mainnet in lib.rs

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sdk/solana/package.json b/sdk/solana/package.json
@@ -24,11 +24,11 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
     "@solana/web3.js": "^1.95.3",
-    "@wormhole-foundation/sdk-base": "^0.10.9",
-    "@wormhole-foundation/sdk-definitions": "^0.10.9",
-    "@wormhole-foundation/sdk-solana": "^0.10.9",
-    "@wormhole-foundation/sdk-solana-tokenbridge": "^0.10.9",
-    "@xlabs/solana-price-oracle-sdk": "^0.0.7",
+    "@wormhole-foundation/sdk-base": "^0.11",
+    "@wormhole-foundation/sdk-definitions": "^0.11",
+    "@wormhole-foundation/sdk-solana": "^0.11",
+    "@wormhole-foundation/sdk-solana-tokenbridge": "^0.11",
+    "@xlabs/solana-price-oracle-sdk": "link:./lib/../../relayer-infra-contracts/src/solana/",
     "borsh": "^2.0.0"
   },
   "devDependencies": {

diff --git a/sdk/solana/tbrv3/bpf-loader-upgradeable.ts b/sdk/solana/tbrv3/bpf-loader-upgradeable.ts
@@ -1,11 +1,5 @@
 import anchor from '@coral-xyz/anchor';
-import {
-  Cluster,
-  clusterApiUrl,
-  Connection,
-  PublicKey,
-  TransactionInstruction,
-} from '@solana/web3.js';
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { CustomConversion, Layout, layout, Network } from '@wormhole-foundation/sdk-base';
 //import { programDataLayout } from '@wormhole-foundation/sdk-solana/utils/utils/';
 import { throwError } from 'common-arbitrary-token-transfer';