Merge pull request #87 from XLabs/fix/anchor-imports

Bump price oracle sdk package version and fix anchor imports
XLabs · Oct 29, 2024 · 07db282 · 07db282
2 parents 316883f + 301c8af
commit 07db282
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 22 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@rollup-rollup-linux-arm64-musl-npm-4.21.2-3d72d04da1-10c0.zip b/.yarn/cache/@rollup-rollup-linux-arm64-musl-npm-4.21.2-3d72d04da1-10c0.zip
diff --git a/.yarn/cache/@rollup-rollup-linux-x64-musl-npm-4.21.2-7b342997ba-10c0.zip b/.yarn/cache/@rollup-rollup-linux-x64-musl-npm-4.21.2-7b342997ba-10c0.zip
diff --git a/...-sdk-npm-0.0.13-916a71e7c8-88b0eebb35.zip → ...-sdk-npm-0.0.14-f27a4b5de0-1e2e4624ed.zip b/...-sdk-npm-0.0.13-916a71e7c8-88b0eebb35.zip → ...-sdk-npm-0.0.14-f27a4b5de0-1e2e4624ed.zip
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -17,3 +17,7 @@ supportedArchitectures:
     - current
     - darwin
     - linux
+  libc:
+    - current
+    - glibc
+    - musl
diff --git a/sdk/solana/package.json b/sdk/solana/package.json
@@ -28,7 +28,7 @@
     "@wormhole-foundation/sdk-definitions": "^0.12.0",
     "@wormhole-foundation/sdk-solana": "^0.12.0",
     "@wormhole-foundation/sdk-solana-tokenbridge": "^0.12.0",
-    "@xlabs/solana-price-oracle-sdk": "0.0.13",
+    "@xlabs/solana-price-oracle-sdk": "0.0.14",
     "borsh": "^2.0.0"
   },
   "devDependencies": {

diff --git a/sdk/solana/tbrv3/bpf-loader-upgradeable.ts b/sdk/solana/tbrv3/bpf-loader-upgradeable.ts
@@ -1,8 +1,8 @@
-import anchor from '@coral-xyz/anchor';
 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';
+import { BN } from "@xlabs/solana-price-oracle-sdk";
 
 export class BpfLoaderUpgradeableProgram {
   static id = new PublicKey('BPFLoaderUpgradeab1e11111111111111111111111');
@@ -32,7 +32,7 @@ export class BpfLoaderUpgradeableProgram {
     const upgradeAuthority = data.upgradeAuthority.isSome ? data.upgradeAuthority.value : undefined;
 
     return {
-      slot: new anchor.BN(data.slot.toString()),
+      slot: new BN(data.slot.toString()),
       upgradeAuthority,
     };
   }

diff --git a/sdk/solana/tbrv3/token-bridge-relayer.ts b/sdk/solana/tbrv3/token-bridge-relayer.ts
@@ -1,4 +1,4 @@
-import anchor from '@coral-xyz/anchor';
+import * as anchor from '@coral-xyz/anchor';
 import { Program } from '@coral-xyz/anchor';
 import {
   PublicKey,
@@ -27,7 +27,7 @@ import {
   getCompleteTransferNativeWithPayloadCpiAccounts,
   getCompleteTransferWrappedWithPayloadCpiAccounts,
 } from '@wormhole-foundation/sdk-solana-tokenbridge';
-import { SolanaPriceOracle } from '@xlabs/solana-price-oracle-sdk';
+import { SolanaPriceOracle, bigintToBn, bnToBigint } from '@xlabs/solana-price-oracle-sdk';
 import { deserializeTbrV3Message, VaaMessage, throwError } from 'common-arbitrary-token-transfer';
 import { BpfLoaderUpgradeableProgram } from './bpf-loader-upgradeable.js';
 
@@ -1045,11 +1045,3 @@ function patchAddress(idl: any, address?: PublicKey) {
 
   return idl;
 }
-
-export function bnToBigint(n: anchor.BN): bigint {
-  return BigInt(`0x${n.toString('hex')}`);
-}
-
-export function bigintToBn(n: bigint): anchor.BN {
-  return new anchor.BN(`${n.toString(16)}`, 'hex');
-}
diff --git a/yarn.lock b/yarn.lock
@@ -1856,24 +1856,24 @@ __metadata:
     "@wormhole-foundation/sdk-definitions": "npm:^0.12.0"
     "@wormhole-foundation/sdk-solana": "npm:^0.12.0"
     "@wormhole-foundation/sdk-solana-tokenbridge": "npm:^0.12.0"
-    "@xlabs/solana-price-oracle-sdk": "npm:0.0.13"
+    "@xlabs/solana-price-oracle-sdk": "npm:0.0.14"
     borsh: "npm:^2.0.0"
     tsup: "npm:^8.3.0"
     tsx: "npm:4.19.1"
     typescript: "npm:5.6.3"
   languageName: unknown
   linkType: soft
 
-"@xlabs/solana-price-oracle-sdk@npm:0.0.13":
-  version: 0.0.13
-  resolution: "@xlabs/solana-price-oracle-sdk@npm:0.0.13::__archiveUrl=https%3A%2F%2Fnpm.pkg.github.com%2Fdownload%2F%40xlabs%2Fsolana-price-oracle-sdk%2F0.0.13%2F5ec1c24cb2ba1d21918cf81da41de9b0fa4293e4"
+"@xlabs/solana-price-oracle-sdk@npm:0.0.14":
+  version: 0.0.14
+  resolution: "@xlabs/solana-price-oracle-sdk@npm:0.0.14::__archiveUrl=https%3A%2F%2Fnpm.pkg.github.com%2Fdownload%2F%40xlabs%2Fsolana-price-oracle-sdk%2F0.0.14%2F30109786217046880003ced1cef34eda8337c43f"
   dependencies:
     "@coral-xyz/anchor": "npm:^0.30.1"
     "@solana/web3.js": "npm:^1.95.2"
     "@wormhole-foundation/sdk-base": "npm:^0.11"
     "@wormhole-foundation/sdk-definitions": "npm:^0.11"
     "@wormhole-foundation/sdk-solana": "npm:^0.11"
-  checksum: 10c0/88b0eebb3568856d92ba7377b9d1c63d5027b30ee1393c965ce710d0d2261a13129ed8042b23fb1517a688c15cecdc5cc4f000e7f8e61781a3117083d6cde28f
+  checksum: 10c0/1e2e4624ed993cba46c1a715d850d8824135e7c66b8f51432a0be757dd9e7146e6851ff652481ad5ea2a4f5302a32259694b10c45460d291ae7cc02ed0a1fc61
   languageName: node
   linkType: hard