fix: add PACKET_DATA_SIZE since it was removed from @solana/web3.js

saber-hq · Apr 28, 2022 · b67425d · b67425d
1 parent 8c23263
commit b67425d
Show file tree

Hide file tree

Showing 10 changed files with 1,568 additions and 2,764 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "@size-limit/file": "^7.0.8",
     "@size-limit/webpack": "^7.0.8",
     "@size-limit/webpack-why": "^7.0.8",
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/babel__core": "^7.1.19",
     "@types/babel__preset-env": "^7.9.2",
     "@types/bn.js": "^5.1.0",

diff --git a/packages/anchor-contrib/package.json b/packages/anchor-contrib/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@project-serum/anchor": "^0.24.2",
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/lodash.camelcase": "^4.3.7",
     "@types/lodash.mapvalues": "^4.6.7",
     "bn.js": "^5.2.0"

diff --git a/packages/chai-solana/package.json b/packages/chai-solana/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@project-serum/anchor": "^0.24.2",
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "bn.js": "^5.2.0",
     "jsbi": "^4.3.0"
   }

diff --git a/packages/solana-contrib/package.json b/packages/solana-contrib/package.json
@@ -33,7 +33,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/bn.js": "^5.1.0",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.27",

diff --git a/packages/solana-contrib/src/transaction/PendingTransaction.ts b/packages/solana-contrib/src/transaction/PendingTransaction.ts
@@ -5,14 +5,14 @@ import type {
   TransactionSignature,
 } from "@solana/web3.js";
 import promiseRetry from "promise-retry";
-import type { OperationOptions } from "retry";
+import type { WrapOptions } from "retry";
 
 import { TransactionReceipt } from "../transaction";
 
 /**
  * Options for awaiting a transaction confirmation.
  */
-export interface TransactionWaitOptions extends OperationOptions {
+export interface TransactionWaitOptions extends WrapOptions {
   /**
    * Commitment of the transaction. Defaults to `confirmed`.
    */

diff --git a/packages/solana-contrib/src/transaction/TransactionEnvelope.ts b/packages/solana-contrib/src/transaction/TransactionEnvelope.ts
@@ -6,7 +6,7 @@ import type {
   SimulatedTransactionResponse,
   TransactionInstruction,
 } from "@solana/web3.js";
-import { PACKET_DATA_SIZE, PublicKey, Transaction } from "@solana/web3.js";
+import { PublicKey, Transaction } from "@solana/web3.js";
 import invariant from "tiny-invariant";
 
 import type { BroadcastOptions } from "../broadcaster";
@@ -28,6 +28,8 @@ import { calculateTxSizeUnsafe } from "./txSizer";
 import type { SerializableInstruction } from "./utils";
 import { generateInspectLinkFromBase64, RECENT_BLOCKHASH_STUB } from "./utils";
 
+export const PACKET_DATA_SIZE = 1280 - 40 - 8;
+
 const ASSOCIATED_TOKEN_PROGRAM_ID = new PublicKey(
   "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
 );

diff --git a/packages/stableswap-sdk/package.json b/packages/stableswap-sdk/package.json
@@ -23,7 +23,7 @@
     "node": ">=12.x"
   },
   "devDependencies": {
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/bn.js": "^5.1.0",
     "@types/lodash.mapvalues": "^4.6.7",
     "@types/node": "^17.0.27",

diff --git a/packages/token-utils/package.json b/packages/token-utils/package.json
@@ -30,7 +30,7 @@
   ],
   "devDependencies": {
     "@saberhq/tsconfig": "^1.12.67",
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/bn.js": "^5.1.0",
     "jsbi": "^4.3.0"
   },

diff --git a/packages/use-solana/package.json b/packages/use-solana/package.json
@@ -12,7 +12,7 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@solana/web3.js": "^1.39.1",
+    "@solana/web3.js": "^1.41.1",
     "@types/bn.js": "^5.1.0",
     "@types/node": "^17.0.27",
     "@types/react": "^18.0.7",