diff --git a/javascript/solana.js/generate-client.js b/javascript/solana.js/generate-client.js
index 4e8a318..aa9d32a 100755
--- a/javascript/solana.js/generate-client.js
+++ b/javascript/solana.js/generate-client.js
@@ -98,6 +98,10 @@ async function main() {
     );
 
     console.log(file);
+    // replace BN import
+    execSync(
+      `sed -i '' 's/import BN from \\"bn.js\\"/import { BN } from \\"@switchboard-xyz\\/common\\"/g' ${file}`
+    );
     // remove PROGRAM_ID import, we will use SwitchboardProgram instead
     execSync(
       `sed -i '' 's/import { PROGRAM_ID } from "..\\/programId"/ /g' ${file}`
diff --git a/javascript/solana.js/package-lock.json b/javascript/solana.js/package-lock.json
index d8bc361..e2347ba 100644
--- a/javascript/solana.js/package-lock.json
+++ b/javascript/solana.js/package-lock.json
@@ -13,15 +13,11 @@
         "@project-serum/borsh": "^0.2.5",
         "@solana/spl-token": "^0.3.6",
         "@solana/web3.js": "^1.73.0",
-        "@switchboard-xyz/common": "^2.1.12",
-        "big.js": "^6.2.1",
-        "bn.js": "^5.2.1",
+        "@switchboard-xyz/common": "^2.1.13",
         "dotenv": "^16.0.3",
         "lodash": "^4.17.21"
       },
       "devDependencies": {
-        "@types/big.js": "^6.1.6",
-        "@types/bn.js": "^5.1.1",
         "@types/chai": "^4.3.4",
         "@types/expect": "^24.3.0",
         "@types/lodash": "^4.14.191",
@@ -589,9 +585,9 @@
       }
     },
     "node_modules/@switchboard-xyz/common": {
-      "version": "2.1.12",
-      "resolved": "https://registry.npmjs.org/@switchboard-xyz/common/-/common-2.1.12.tgz",
-      "integrity": "sha512-eQ3JSybbmNG0AqHsSUXS1hKZvE21JZ9HV6s9wRNXtQhMVw9sy92NyIze5RDfyxs9mbPsrFhkqaJh+nl6TnU3rQ==",
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/@switchboard-xyz/common/-/common-2.1.13.tgz",
+      "integrity": "sha512-1lsYd9E+oHw4ADuAbjhTYSulvTB/PhHCmf1MH4l2Is4X318IHzxdzjeS/u1tze6Wgg9LssCWjfPMxC0FUQ4H3Q==",
       "dependencies": {
         "@solana/web3.js": "^1.66.2",
         "big.js": "^6.2.1",
@@ -660,21 +656,6 @@
       "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "dev": true
     },
-    "node_modules/@types/big.js": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@types/big.js/-/big.js-6.1.6.tgz",
-      "integrity": "sha1-PUF+dYSD1VNFoDoIf34MhxN8pEQ= sha512-0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA==",
-      "dev": true
-    },
-    "node_modules/@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/chai": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz",
@@ -5702,9 +5683,9 @@
       }
     },
     "@switchboard-xyz/common": {
-      "version": "2.1.12",
-      "resolved": "https://registry.npmjs.org/@switchboard-xyz/common/-/common-2.1.12.tgz",
-      "integrity": "sha512-eQ3JSybbmNG0AqHsSUXS1hKZvE21JZ9HV6s9wRNXtQhMVw9sy92NyIze5RDfyxs9mbPsrFhkqaJh+nl6TnU3rQ==",
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/@switchboard-xyz/common/-/common-2.1.13.tgz",
+      "integrity": "sha512-1lsYd9E+oHw4ADuAbjhTYSulvTB/PhHCmf1MH4l2Is4X318IHzxdzjeS/u1tze6Wgg9LssCWjfPMxC0FUQ4H3Q==",
       "requires": {
         "@solana/web3.js": "^1.66.2",
         "big.js": "^6.2.1",
@@ -5766,21 +5747,6 @@
       "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "dev": true
     },
-    "@types/big.js": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@types/big.js/-/big.js-6.1.6.tgz",
-      "integrity": "sha1-PUF+dYSD1VNFoDoIf34MhxN8pEQ= sha512-0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA==",
-      "dev": true
-    },
-    "@types/bn.js": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.1.tgz",
-      "integrity": "sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/chai": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz",
diff --git a/javascript/solana.js/package.json b/javascript/solana.js/package.json
index 7a68b5a..187fc95 100644
--- a/javascript/solana.js/package.json
+++ b/javascript/solana.js/package.json
@@ -51,15 +51,11 @@
     "@project-serum/borsh": "^0.2.5",
     "@solana/spl-token": "^0.3.6",
     "@solana/web3.js": "^1.73.0",
-    "@switchboard-xyz/common": "^2.1.12",
-    "big.js": "^6.2.1",
-    "bn.js": "^5.2.1",
+    "@switchboard-xyz/common": "^2.1.13",
     "dotenv": "^16.0.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/big.js": "^6.1.6",
-    "@types/bn.js": "^5.1.1",
     "@types/chai": "^4.3.4",
     "@types/expect": "^24.3.0",
     "@types/lodash": "^4.14.191",
diff --git a/javascript/solana.js/src/accounts/aggregatorAccount.ts b/javascript/solana.js/src/accounts/aggregatorAccount.ts
index 47b17b5..431b469 100644
--- a/javascript/solana.js/src/accounts/aggregatorAccount.ts
+++ b/javascript/solana.js/src/accounts/aggregatorAccount.ts
@@ -2,7 +2,7 @@ import * as types from '../generated';
 import * as anchor from '@project-serum/anchor';
 import { Account, OnAccountChangeCallback } from './account';
 import * as errors from '../errors';
-import Big from 'big.js';
+import { Big } from '@switchboard-xyz/common';
 import { SwitchboardProgram } from '../SwitchboardProgram';
 import {
   AccountInfo,
diff --git a/javascript/solana.js/src/accounts/aggregatorHistoryBuffer.ts b/javascript/solana.js/src/accounts/aggregatorHistoryBuffer.ts
index 4454cf1..0123c07 100644
--- a/javascript/solana.js/src/accounts/aggregatorHistoryBuffer.ts
+++ b/javascript/solana.js/src/accounts/aggregatorHistoryBuffer.ts
@@ -19,8 +19,8 @@ import {
 import { TransactionObject } from '../TransactionObject';
 import { AggregatorAccount } from './aggregatorAccount';
 import { SwitchboardDecimal } from '../generated';
-import Big from 'big.js';
-import BN from 'bn.js';
+import { Big } from '@switchboard-xyz/common';
+import { BN } from '@switchboard-xyz/common';
 
 export interface AggregatorHistoryInit {
   /** Aggregator account to add a history buffer for. */
diff --git a/javascript/solana.js/src/accounts/leaseAccount.ts b/javascript/solana.js/src/accounts/leaseAccount.ts
index 61f0a7b..5dfe177 100644
--- a/javascript/solana.js/src/accounts/leaseAccount.ts
+++ b/javascript/solana.js/src/accounts/leaseAccount.ts
@@ -16,7 +16,7 @@ import {
 import { AggregatorAccount } from './aggregatorAccount';
 import { QueueAccount } from './queueAccount';
 import { TransactionObject } from '../TransactionObject';
-import BN from 'bn.js';
+import { BN } from '@switchboard-xyz/common';
 import { JobAccount } from './jobAccount';
 import { OracleJob } from '@switchboard-xyz/common';
 
diff --git a/javascript/solana.js/src/accounts/oracleAccount.ts b/javascript/solana.js/src/accounts/oracleAccount.ts
index d8fcfbc..68c8f85 100644
--- a/javascript/solana.js/src/accounts/oracleAccount.ts
+++ b/javascript/solana.js/src/accounts/oracleAccount.ts
@@ -16,7 +16,7 @@ import { PermissionAccount } from './permissionAccount';
 import { QueueAccount } from './queueAccount';
 import * as spl from '@solana/spl-token';
 import { TransactionObject } from '../TransactionObject';
-import BN from 'bn.js';
+import { BN } from '@switchboard-xyz/common';
 
 /**
  * Account type holding an oracle's configuration including the authority and the reward/slashing wallet along with a set of metrics tracking its reliability.
diff --git a/javascript/solana.js/src/accounts/queueAccount.ts b/javascript/solana.js/src/accounts/queueAccount.ts
index bce68e4..1909233 100644
--- a/javascript/solana.js/src/accounts/queueAccount.ts
+++ b/javascript/solana.js/src/accounts/queueAccount.ts
@@ -10,7 +10,7 @@ import {
   TransactionSignature,
 } from '@solana/web3.js';
 import { SwitchboardDecimal, toUtf8 } from '@switchboard-xyz/common';
-import Big from 'big.js';
+import { Big } from '@switchboard-xyz/common';
 import { BN } from 'bn.js';
 import * as errors from '../errors';
 import * as types from '../generated';
diff --git a/javascript/solana.js/src/accounts/vrfLiteAccount.ts b/javascript/solana.js/src/accounts/vrfLiteAccount.ts
index ddb9c4f..0501cce 100644
--- a/javascript/solana.js/src/accounts/vrfLiteAccount.ts
+++ b/javascript/solana.js/src/accounts/vrfLiteAccount.ts
@@ -19,7 +19,7 @@ import { SwitchboardProgram } from '../SwitchboardProgram';
 import { Account } from './account';
 import * as types from '../generated';
 import * as errors from '../errors';
-import BN from 'bn.js';
+import { BN } from '@switchboard-xyz/common';
 import { vrfLiteInit } from '../generated';
 import { Callback } from './vrfAccount';
 import { QueueAccount } from './queueAccount';
diff --git a/javascript/solana.js/src/generated/accounts/AggregatorAccountData.ts b/javascript/solana.js/src/generated/accounts/AggregatorAccountData.ts
index 034c9b1..2660b51 100644
--- a/javascript/solana.js/src/generated/accounts/AggregatorAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/AggregatorAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/BufferRelayerAccountData.ts b/javascript/solana.js/src/generated/accounts/BufferRelayerAccountData.ts
index c85f6ed..cf23a1d 100644
--- a/javascript/solana.js/src/generated/accounts/BufferRelayerAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/BufferRelayerAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/CrankAccountData.ts b/javascript/solana.js/src/generated/accounts/CrankAccountData.ts
index 280556c..91050b3 100644
--- a/javascript/solana.js/src/generated/accounts/CrankAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/CrankAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/JobAccountData.ts b/javascript/solana.js/src/generated/accounts/JobAccountData.ts
index 67bad16..51a72b6 100644
--- a/javascript/solana.js/src/generated/accounts/JobAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/JobAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/LeaseAccountData.ts b/javascript/solana.js/src/generated/accounts/LeaseAccountData.ts
index b1421e6..1ad9530 100644
--- a/javascript/solana.js/src/generated/accounts/LeaseAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/LeaseAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/OracleAccountData.ts b/javascript/solana.js/src/generated/accounts/OracleAccountData.ts
index b1c67e2..1838b38 100644
--- a/javascript/solana.js/src/generated/accounts/OracleAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/OracleAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/OracleQueueAccountData.ts b/javascript/solana.js/src/generated/accounts/OracleQueueAccountData.ts
index 5e4135d..c5926dc 100644
--- a/javascript/solana.js/src/generated/accounts/OracleQueueAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/OracleQueueAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/PermissionAccountData.ts b/javascript/solana.js/src/generated/accounts/PermissionAccountData.ts
index 4e7badb..cbf9c1e 100644
--- a/javascript/solana.js/src/generated/accounts/PermissionAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/PermissionAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/RealmSpawnRecordAccountData.ts b/javascript/solana.js/src/generated/accounts/RealmSpawnRecordAccountData.ts
index fba18f6..304c564 100644
--- a/javascript/solana.js/src/generated/accounts/RealmSpawnRecordAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/RealmSpawnRecordAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/SbState.ts b/javascript/solana.js/src/generated/accounts/SbState.ts
index ad2ebeb..0c907b1 100644
--- a/javascript/solana.js/src/generated/accounts/SbState.ts
+++ b/javascript/solana.js/src/generated/accounts/SbState.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/SlidingResultAccountData.ts b/javascript/solana.js/src/generated/accounts/SlidingResultAccountData.ts
index b754ae8..adb0952 100644
--- a/javascript/solana.js/src/generated/accounts/SlidingResultAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/SlidingResultAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/TaskSpecRecord.ts b/javascript/solana.js/src/generated/accounts/TaskSpecRecord.ts
index 6f293ff..3b15192 100644
--- a/javascript/solana.js/src/generated/accounts/TaskSpecRecord.ts
+++ b/javascript/solana.js/src/generated/accounts/TaskSpecRecord.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/VrfAccountData.ts b/javascript/solana.js/src/generated/accounts/VrfAccountData.ts
index 6b1738f..4be2e51 100644
--- a/javascript/solana.js/src/generated/accounts/VrfAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/VrfAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/VrfLiteAccountData.ts b/javascript/solana.js/src/generated/accounts/VrfLiteAccountData.ts
index b26a089..0285692 100644
--- a/javascript/solana.js/src/generated/accounts/VrfLiteAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/VrfLiteAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/accounts/VrfPoolAccountData.ts b/javascript/solana.js/src/generated/accounts/VrfPoolAccountData.ts
index 28741e0..b2d2d0a 100644
--- a/javascript/solana.js/src/generated/accounts/VrfPoolAccountData.ts
+++ b/javascript/solana.js/src/generated/accounts/VrfPoolAccountData.ts
@@ -1,6 +1,6 @@
 import { SwitchboardProgram } from '../../SwitchboardProgram';
 import { PublicKey, Connection } from '@solana/web3.js';
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorAddJob.ts b/javascript/solana.js/src/generated/instructions/aggregatorAddJob.ts
index c2d72e3..fb3768d 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorAddJob.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorAddJob.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorInit.ts b/javascript/solana.js/src/generated/instructions/aggregatorInit.ts
index 6a2c153..457c47b 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorInit.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorLock.ts b/javascript/solana.js/src/generated/instructions/aggregatorLock.ts
index 4358bb0..0563b9d 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorLock.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorLock.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorOpenRound.ts b/javascript/solana.js/src/generated/instructions/aggregatorOpenRound.ts
index a164a2d..463051f 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorOpenRound.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorOpenRound.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorRemoveJob.ts b/javascript/solana.js/src/generated/instructions/aggregatorRemoveJob.ts
index 48e0384..57c86d3 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorRemoveJob.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorRemoveJob.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSaveResult.ts b/javascript/solana.js/src/generated/instructions/aggregatorSaveResult.ts
index 0b0b4ca..9ad7601 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSaveResult.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSaveResult.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSaveResultV2.ts b/javascript/solana.js/src/generated/instructions/aggregatorSaveResultV2.ts
index af777e2..e3a062b 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSaveResultV2.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSaveResultV2.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSetAuthority.ts b/javascript/solana.js/src/generated/instructions/aggregatorSetAuthority.ts
index 919cdac..138eb1a 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSetAuthority.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSetAuthority.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSetConfig.ts b/javascript/solana.js/src/generated/instructions/aggregatorSetConfig.ts
index 410d0a6..a7e14a4 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSetConfig.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSetConfig.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSetHistoryBuffer.ts b/javascript/solana.js/src/generated/instructions/aggregatorSetHistoryBuffer.ts
index baafdf0..a07ee17 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSetHistoryBuffer.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSetHistoryBuffer.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSetQueue.ts b/javascript/solana.js/src/generated/instructions/aggregatorSetQueue.ts
index 3bc7328..4618da5 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSetQueue.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSetQueue.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/aggregatorSetResolutionMode.ts b/javascript/solana.js/src/generated/instructions/aggregatorSetResolutionMode.ts
index 9645c5c..dbdf034 100644
--- a/javascript/solana.js/src/generated/instructions/aggregatorSetResolutionMode.ts
+++ b/javascript/solana.js/src/generated/instructions/aggregatorSetResolutionMode.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/bufferRelayerInit.ts b/javascript/solana.js/src/generated/instructions/bufferRelayerInit.ts
index c37ee2a..faf6ec3 100644
--- a/javascript/solana.js/src/generated/instructions/bufferRelayerInit.ts
+++ b/javascript/solana.js/src/generated/instructions/bufferRelayerInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/bufferRelayerOpenRound.ts b/javascript/solana.js/src/generated/instructions/bufferRelayerOpenRound.ts
index 76bfaf2..d5ee6a0 100644
--- a/javascript/solana.js/src/generated/instructions/bufferRelayerOpenRound.ts
+++ b/javascript/solana.js/src/generated/instructions/bufferRelayerOpenRound.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/bufferRelayerSaveResult.ts b/javascript/solana.js/src/generated/instructions/bufferRelayerSaveResult.ts
index 6c78852..73ac675 100644
--- a/javascript/solana.js/src/generated/instructions/bufferRelayerSaveResult.ts
+++ b/javascript/solana.js/src/generated/instructions/bufferRelayerSaveResult.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/crankInit.ts b/javascript/solana.js/src/generated/instructions/crankInit.ts
index 6bfabd0..f07d554 100644
--- a/javascript/solana.js/src/generated/instructions/crankInit.ts
+++ b/javascript/solana.js/src/generated/instructions/crankInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/crankPop.ts b/javascript/solana.js/src/generated/instructions/crankPop.ts
index 162c49a..6800e60 100644
--- a/javascript/solana.js/src/generated/instructions/crankPop.ts
+++ b/javascript/solana.js/src/generated/instructions/crankPop.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/crankPopV2.ts b/javascript/solana.js/src/generated/instructions/crankPopV2.ts
index 1a4ce1a..70e7e6e 100644
--- a/javascript/solana.js/src/generated/instructions/crankPopV2.ts
+++ b/javascript/solana.js/src/generated/instructions/crankPopV2.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/crankPush.ts b/javascript/solana.js/src/generated/instructions/crankPush.ts
index 27bfac2..89f5715 100644
--- a/javascript/solana.js/src/generated/instructions/crankPush.ts
+++ b/javascript/solana.js/src/generated/instructions/crankPush.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/jobInit.ts b/javascript/solana.js/src/generated/instructions/jobInit.ts
index e724aee..90a23cd 100644
--- a/javascript/solana.js/src/generated/instructions/jobInit.ts
+++ b/javascript/solana.js/src/generated/instructions/jobInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/jobSetData.ts b/javascript/solana.js/src/generated/instructions/jobSetData.ts
index 554b1fa..91a4617 100644
--- a/javascript/solana.js/src/generated/instructions/jobSetData.ts
+++ b/javascript/solana.js/src/generated/instructions/jobSetData.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/leaseExtend.ts b/javascript/solana.js/src/generated/instructions/leaseExtend.ts
index e4019bc..ce7b27a 100644
--- a/javascript/solana.js/src/generated/instructions/leaseExtend.ts
+++ b/javascript/solana.js/src/generated/instructions/leaseExtend.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/leaseInit.ts b/javascript/solana.js/src/generated/instructions/leaseInit.ts
index 243a96a..90240b7 100644
--- a/javascript/solana.js/src/generated/instructions/leaseInit.ts
+++ b/javascript/solana.js/src/generated/instructions/leaseInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/leaseSetAuthority.ts b/javascript/solana.js/src/generated/instructions/leaseSetAuthority.ts
index 5e2004d..a6b64a4 100644
--- a/javascript/solana.js/src/generated/instructions/leaseSetAuthority.ts
+++ b/javascript/solana.js/src/generated/instructions/leaseSetAuthority.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/leaseWithdraw.ts b/javascript/solana.js/src/generated/instructions/leaseWithdraw.ts
index 5f312bb..45c79f3 100644
--- a/javascript/solana.js/src/generated/instructions/leaseWithdraw.ts
+++ b/javascript/solana.js/src/generated/instructions/leaseWithdraw.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/oracleHeartbeat.ts b/javascript/solana.js/src/generated/instructions/oracleHeartbeat.ts
index 9106c94..d6df5bc 100644
--- a/javascript/solana.js/src/generated/instructions/oracleHeartbeat.ts
+++ b/javascript/solana.js/src/generated/instructions/oracleHeartbeat.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/oracleInit.ts b/javascript/solana.js/src/generated/instructions/oracleInit.ts
index 09e3f67..7a2a785 100644
--- a/javascript/solana.js/src/generated/instructions/oracleInit.ts
+++ b/javascript/solana.js/src/generated/instructions/oracleInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/oracleQueueInit.ts b/javascript/solana.js/src/generated/instructions/oracleQueueInit.ts
index 0e27d63..b1b1fbc 100644
--- a/javascript/solana.js/src/generated/instructions/oracleQueueInit.ts
+++ b/javascript/solana.js/src/generated/instructions/oracleQueueInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/oracleQueueSetConfig.ts b/javascript/solana.js/src/generated/instructions/oracleQueueSetConfig.ts
index 3d9554d..cc9e8c0 100644
--- a/javascript/solana.js/src/generated/instructions/oracleQueueSetConfig.ts
+++ b/javascript/solana.js/src/generated/instructions/oracleQueueSetConfig.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/oracleWithdraw.ts b/javascript/solana.js/src/generated/instructions/oracleWithdraw.ts
index 03db10a..5bd1efb 100644
--- a/javascript/solana.js/src/generated/instructions/oracleWithdraw.ts
+++ b/javascript/solana.js/src/generated/instructions/oracleWithdraw.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/permissionInit.ts b/javascript/solana.js/src/generated/instructions/permissionInit.ts
index cccff79..8ac5735 100644
--- a/javascript/solana.js/src/generated/instructions/permissionInit.ts
+++ b/javascript/solana.js/src/generated/instructions/permissionInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/permissionSet.ts b/javascript/solana.js/src/generated/instructions/permissionSet.ts
index a5301ba..5d58083 100644
--- a/javascript/solana.js/src/generated/instructions/permissionSet.ts
+++ b/javascript/solana.js/src/generated/instructions/permissionSet.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/programConfig.ts b/javascript/solana.js/src/generated/instructions/programConfig.ts
index 7ac6cba..e312cce 100644
--- a/javascript/solana.js/src/generated/instructions/programConfig.ts
+++ b/javascript/solana.js/src/generated/instructions/programConfig.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/programInit.ts b/javascript/solana.js/src/generated/instructions/programInit.ts
index c63d1ab..8516cda 100644
--- a/javascript/solana.js/src/generated/instructions/programInit.ts
+++ b/javascript/solana.js/src/generated/instructions/programInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vaultTransfer.ts b/javascript/solana.js/src/generated/instructions/vaultTransfer.ts
index e3ba943..2b7a6b8 100644
--- a/javascript/solana.js/src/generated/instructions/vaultTransfer.ts
+++ b/javascript/solana.js/src/generated/instructions/vaultTransfer.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfInit.ts b/javascript/solana.js/src/generated/instructions/vrfInit.ts
index 01eb288..b2a171d 100644
--- a/javascript/solana.js/src/generated/instructions/vrfInit.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfLiteInit.ts b/javascript/solana.js/src/generated/instructions/vrfLiteInit.ts
index a3efb8b..83d414a 100644
--- a/javascript/solana.js/src/generated/instructions/vrfLiteInit.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfLiteInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfLiteProveAndVerify.ts b/javascript/solana.js/src/generated/instructions/vrfLiteProveAndVerify.ts
index d05b1b3..f9f2d9e 100644
--- a/javascript/solana.js/src/generated/instructions/vrfLiteProveAndVerify.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfLiteProveAndVerify.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfLiteRequestRandomness.ts b/javascript/solana.js/src/generated/instructions/vrfLiteRequestRandomness.ts
index b893596..d26ad18 100644
--- a/javascript/solana.js/src/generated/instructions/vrfLiteRequestRandomness.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfLiteRequestRandomness.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfPoolAdd.ts b/javascript/solana.js/src/generated/instructions/vrfPoolAdd.ts
index 234a245..c7504a4 100644
--- a/javascript/solana.js/src/generated/instructions/vrfPoolAdd.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfPoolAdd.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfPoolInit.ts b/javascript/solana.js/src/generated/instructions/vrfPoolInit.ts
index 132ac18..7f13f07 100644
--- a/javascript/solana.js/src/generated/instructions/vrfPoolInit.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfPoolInit.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfPoolRemove.ts b/javascript/solana.js/src/generated/instructions/vrfPoolRemove.ts
index 0cf3385..f6905a1 100644
--- a/javascript/solana.js/src/generated/instructions/vrfPoolRemove.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfPoolRemove.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfPoolRequest.ts b/javascript/solana.js/src/generated/instructions/vrfPoolRequest.ts
index e80bcb7..5b61397 100644
--- a/javascript/solana.js/src/generated/instructions/vrfPoolRequest.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfPoolRequest.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfProveAndVerify.ts b/javascript/solana.js/src/generated/instructions/vrfProveAndVerify.ts
index d17078b..63ed2b8 100644
--- a/javascript/solana.js/src/generated/instructions/vrfProveAndVerify.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfProveAndVerify.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfRequestRandomness.ts b/javascript/solana.js/src/generated/instructions/vrfRequestRandomness.ts
index af5a001..1d777fa 100644
--- a/javascript/solana.js/src/generated/instructions/vrfRequestRandomness.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfRequestRandomness.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/instructions/vrfSetCallback.ts b/javascript/solana.js/src/generated/instructions/vrfSetCallback.ts
index a59d59d..f8abc63 100644
--- a/javascript/solana.js/src/generated/instructions/vrfSetCallback.ts
+++ b/javascript/solana.js/src/generated/instructions/vrfSetCallback.ts
@@ -4,7 +4,7 @@ import {
   PublicKey,
   AccountMeta,
 } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
diff --git a/javascript/solana.js/src/generated/types/Lanes.ts b/javascript/solana.js/src/generated/types/Lanes.ts
index 07c8da2..38920fd 100644
--- a/javascript/solana.js/src/generated/types/Lanes.ts
+++ b/javascript/solana.js/src/generated/types/Lanes.ts
@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh';
 
diff --git a/javascript/solana.js/src/generated/types/SwitchboardDecimal.ts b/javascript/solana.js/src/generated/types/SwitchboardDecimal.ts
index 55d9a03..ce99347 100644
--- a/javascript/solana.js/src/generated/types/SwitchboardDecimal.ts
+++ b/javascript/solana.js/src/generated/types/SwitchboardDecimal.ts
@@ -1,8 +1,8 @@
 import { PublicKey } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh';
-import Big from 'big.js';
+import { Big } from '@switchboard-xyz/common';
 
 export interface SwitchboardDecimalFields {
   /**
diff --git a/javascript/solana.js/src/generated/types/SwitchboardPermission.ts b/javascript/solana.js/src/generated/types/SwitchboardPermission.ts
index 6641678..58fdc61 100644
--- a/javascript/solana.js/src/generated/types/SwitchboardPermission.ts
+++ b/javascript/solana.js/src/generated/types/SwitchboardPermission.ts
@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
-import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { BN } from '@switchboard-xyz/common'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
 import * as borsh from '@project-serum/borsh';
 
diff --git a/javascript/solana.js/src/mint.ts b/javascript/solana.js/src/mint.ts
index 0e7f612..c1402ef 100644
--- a/javascript/solana.js/src/mint.ts
+++ b/javascript/solana.js/src/mint.ts
@@ -9,8 +9,8 @@ import {
 } from '@solana/web3.js';
 import { InsufficientFundsError, NativeMintOnlyError } from './errors';
 import { SwitchboardDecimal } from './generated';
-import Big from 'big.js';
-import BN from 'bn.js';
+import { Big } from '@switchboard-xyz/common';
+import { BN } from '@switchboard-xyz/common';
 import { TransactionObject } from './TransactionObject';
 
 export class Mint {