@wormhole-foundation/sdk-solana 0.5.3 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/dist/cjs/signer.d.ts +5 -5
  2. package/dist/cjs/signer.d.ts.map +1 -1
  3. package/dist/cjs/signer.js +64 -18
  4. package/dist/cjs/signer.js.map +1 -1
  5. package/dist/cjs/unsignedTransaction.d.ts +3 -2
  6. package/dist/cjs/unsignedTransaction.d.ts.map +1 -1
  7. package/dist/cjs/unsignedTransaction.js +6 -1
  8. package/dist/cjs/unsignedTransaction.js.map +1 -1
  9. package/dist/esm/signer.d.ts +5 -5
  10. package/dist/esm/signer.d.ts.map +1 -1
  11. package/dist/esm/signer.js +65 -19
  12. package/dist/esm/signer.js.map +1 -1
  13. package/dist/esm/unsignedTransaction.d.ts +3 -2
  14. package/dist/esm/unsignedTransaction.d.ts.map +1 -1
  15. package/dist/esm/unsignedTransaction.js +4 -0
  16. package/dist/esm/unsignedTransaction.js.map +1 -1
  17. package/package.json +2 -2
package/dist/cjs/signer.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- import type { Connection, SendOptions, Transaction, TransactionInstruction } from '@solana/web3.js';
2
+ import type { Connection, SendOptions, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
3
3
  import { Keypair, PublicKey } from '@solana/web3.js';
4
4
  import type { Network, SignAndSendSigner, SignOnlySigner, Signer, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
5
5
  import type { SolanaChains } from './types.js';
6
- import type { SolanaUnsignedTransaction } from './unsignedTransaction.js';
6
+ import { type SolanaUnsignedTransaction } from './unsignedTransaction.js';
7
7
  export declare function getSolanaSigner(rpc: Connection, privateKey: string): Promise<Signer>;
8
8
  export declare function getSolanaSignAndSendSigner(rpc: Connection, privateKey: string | Keypair, opts?: {
9
9
  debug?: boolean;
@@ -33,7 +33,7 @@ export declare class SolanaSendSigner<N extends Network, C extends SolanaChains
33
33
  private retryable;
34
34
  signAndSend(tx: UnsignedTransaction[]): Promise<any[]>;
35
35
  }
36
- export declare function logTxDetails(transaction: Transaction): void;
37
- export declare function createPriorityFeeInstructions(connection: Connection, transaction: Transaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
38
- export declare function determineComputeBudget(connection: Connection, transaction: Transaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
36
+ export declare function logTxDetails(transaction: Transaction | VersionedTransaction): void;
37
+ export declare function createPriorityFeeInstructions(connection: Connection, transaction: Transaction | VersionedTransaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
38
+ export declare function determineComputeBudget(connection: Connection, transaction: Transaction | VersionedTransaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
39
39
  //# sourceMappingURL=signer.d.ts.map
package/dist/cjs/signer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,OAAO,EACP,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAM1E,wBAAsB,eAAe,CACnC,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAGD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,GAAG,QAAQ,CAC5E,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;gBAHN,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,OAAe;IAGjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAoBlE;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,QAAQ,CACjC,YAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAGhC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS,CAAC;gBALV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAe,EACvB,sBAAsB,GAAE,MAAY,EACpC,SAAS,CAAC,yBAAa;IAOjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IASjB,OAAO,CAAC,SAAS;IA4BX,WAAW,CAAC,EAAE,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAgF7D;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,QAWpD;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAcnC;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6CnC"}
1
+ {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,OAAO,EACP,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,0BAA0B,CAAC;AAMlC,wBAAsB,eAAe,CACnC,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAGD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,GAAG,QAAQ,CAC5E,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;gBAHN,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,OAAe;IAGjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CA0BlE;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,QAAQ,CACjC,YAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAGhC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS,CAAC;gBALV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAe,EACvB,sBAAsB,GAAE,MAAY,EACpC,SAAS,CAAC,yBAAa;IAOjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IASjB,OAAO,CAAC,SAAS;IA4BX,WAAW,CAAC,EAAE,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA0F7D;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,QAyB3E;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAuBnC;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA+CnC"}
package/dist/cjs/signer.js CHANGED
@@ -4,6 +4,7 @@ exports.determineComputeBudget = exports.createPriorityFeeInstructions = exports
4
4
  const web3_js_1 = require("@solana/web3.js");
5
5
  const sdk_connect_1 = require("@wormhole-foundation/sdk-connect");
6
6
  const platform_js_1 = require("./platform.js");
7
+ const unsignedTransaction_js_1 = require("./unsignedTransaction.js");
7
8
  // Add priority fee according to 90th percentile of recent fees paid
8
9
  const DEFAULT_PRIORITY_FEE_PERCENTILE = 0.9;
9
10
  // returns a SignOnlySigner for the Solana platform
@@ -48,9 +49,16 @@ class SolanaSigner {
48
49
  console.log(`Signing: ${description} for ${this.address()}`);
49
50
  if (this._debug)
50
51
  logTxDetails(transaction);
51
- transaction.recentBlockhash = blockhash;
52
- transaction.partialSign(this._keypair, ...(extraSigners ?? []));
53
- signed.push(transaction.serialize());
52
+ if ((0, unsignedTransaction_js_1.isVersionedTransaction)(transaction)) {
53
+ transaction.message.recentBlockhash = blockhash;
54
+ transaction.sign([this._keypair, ...(extraSigners ?? [])]);
55
+ signed.push(Buffer.from(transaction.serialize()));
56
+ }
57
+ else {
58
+ transaction.recentBlockhash = blockhash;
59
+ transaction.partialSign(this._keypair, ...(extraSigners ?? []));
60
+ signed.push(transaction.serialize());
61
+ }
54
62
  }
55
63
  return signed;
56
64
  }
@@ -116,16 +124,30 @@ class SolanaSendSigner {
116
124
  for (const txn of tx) {
117
125
  const { description, transaction: { transaction, signers: extraSigners }, } = txn;
118
126
  console.log(`Signing: ${description} for ${this.address()}`);
127
+ let priorityFeeIx;
119
128
  if (this._priorityFeePercentile && this._priorityFeePercentile > 0)
120
- transaction.add(...(await createPriorityFeeInstructions(this._rpc, transaction, [], this._priorityFeePercentile)));
129
+ priorityFeeIx = await createPriorityFeeInstructions(this._rpc, transaction, [], this._priorityFeePercentile);
121
130
  if (this._debug)
122
131
  logTxDetails(transaction);
123
132
  // Try to send the transaction up to 5 times
124
133
  const maxRetries = 5;
125
134
  for (let i = 0; i < maxRetries; i++) {
126
135
  try {
127
- transaction.recentBlockhash = blockhash;
128
- transaction.partialSign(this._keypair, ...(extraSigners ?? []));
136
+ if ((0, unsignedTransaction_js_1.isVersionedTransaction)(transaction)) {
137
+ if (priorityFeeIx) {
138
+ const msg = web3_js_1.TransactionMessage.decompile(transaction.message);
139
+ msg.instructions.push(...priorityFeeIx);
140
+ transaction.message = msg.compileToV0Message();
141
+ }
142
+ transaction.message.recentBlockhash = blockhash;
143
+ transaction.sign([this._keypair, ...(extraSigners ?? [])]);
144
+ }
145
+ else {
146
+ if (priorityFeeIx)
147
+ transaction.add(...priorityFeeIx);
148
+ transaction.recentBlockhash = blockhash;
149
+ transaction.partialSign(this._keypair, ...(extraSigners ?? []));
150
+ }
129
151
  const txid = await this._rpc.sendRawTransaction(transaction.serialize(), this._sendOpts);
130
152
  txids.push(txid);
131
153
  break;
@@ -160,21 +182,43 @@ class SolanaSendSigner {
160
182
  }
161
183
  exports.SolanaSendSigner = SolanaSendSigner;
162
184
  function logTxDetails(transaction) {
163
- console.log(transaction.signatures);
164
- console.log(transaction.feePayer);
165
- transaction.instructions.forEach((ix) => {
166
- console.log('Program', ix.programId.toBase58());
167
- console.log('Data: ', ix.data.toString('hex'));
168
- console.log('Keys: ', ix.keys.map((k) => [k, k.pubkey.toBase58()]));
169
- });
185
+ if ((0, unsignedTransaction_js_1.isVersionedTransaction)(transaction)) {
186
+ console.log(transaction.signatures);
187
+ const msg = transaction.message;
188
+ const keys = msg.getAccountKeys();
189
+ msg.compiledInstructions.forEach((ix) => {
190
+ console.log('Program', keys.get(ix.programIdIndex).toBase58());
191
+ console.log('Data: ', sdk_connect_1.encoding.hex.encode(ix.data));
192
+ console.log('Keys: ', ix.accountKeyIndexes.map((k) => [k, keys.get(k).toBase58()]));
193
+ });
194
+ }
195
+ else {
196
+ console.log(transaction.signatures);
197
+ console.log(transaction.feePayer);
198
+ transaction.instructions.forEach((ix) => {
199
+ console.log('Program', ix.programId.toBase58());
200
+ console.log('Data: ', ix.data.toString('hex'));
201
+ console.log('Keys: ', ix.keys.map((k) => [k, k.pubkey.toBase58()]));
202
+ });
203
+ }
170
204
  }
171
205
  exports.logTxDetails = logTxDetails;
172
206
  async function createPriorityFeeInstructions(connection, transaction, lockedWritableAccounts = [], feePercentile = DEFAULT_PRIORITY_FEE_PERCENTILE, minPriorityFee = 0) {
173
207
  if (lockedWritableAccounts.length === 0) {
174
- lockedWritableAccounts = transaction.instructions
175
- .flatMap((ix) => ix.keys)
176
- .map((k) => (k.isWritable ? k.pubkey : null))
177
- .filter((k) => k !== null);
208
+ if ((0, unsignedTransaction_js_1.isVersionedTransaction)(transaction)) {
209
+ const msg = transaction.message;
210
+ const keys = msg.getAccountKeys();
211
+ lockedWritableAccounts = msg.compiledInstructions
212
+ .flatMap((ix) => ix.accountKeyIndexes)
213
+ .map((k) => (msg.isAccountWritable(k) ? keys.get(k) : null))
214
+ .filter((k) => k !== null);
215
+ }
216
+ else {
217
+ lockedWritableAccounts = transaction.instructions
218
+ .flatMap((ix) => ix.keys)
219
+ .map((k) => (k.isWritable ? k.pubkey : null))
220
+ .filter((k) => k !== null);
221
+ }
178
222
  }
179
223
  return await determineComputeBudget(connection, transaction, lockedWritableAccounts, feePercentile, minPriorityFee);
180
224
  }
@@ -183,7 +227,9 @@ async function determineComputeBudget(connection, transaction, lockedWritableAcc
183
227
  let computeBudget = 250_000;
184
228
  let priorityFee = 1;
185
229
  try {
186
- const simulateResponse = await connection.simulateTransaction(transaction);
230
+ const simulateResponse = await ((0, unsignedTransaction_js_1.isVersionedTransaction)(transaction)
231
+ ? connection.simulateTransaction(transaction)
232
+ : connection.simulateTransaction(transaction));
187
233
  if (simulateResponse.value.err) {
188
234
  console.error(`Error simulating Solana transaction: ${simulateResponse.value.err}`);
189
235
  }
package/dist/cjs/signer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"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"}
package/dist/cjs/unsignedTransaction.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- import type { Keypair, Transaction } from '@solana/web3.js';
1
+ import type { Keypair, Transaction, VersionedTransaction } from '@solana/web3.js';
2
2
  import type { Network, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
3
3
  import type { SolanaChains } from './types.js';
4
4
  export type SolanaTransaction = {
5
- transaction: Transaction;
5
+ transaction: Transaction | VersionedTransaction;
6
6
  signers?: Keypair[];
7
7
  };
8
8
  export declare class SolanaUnsignedTransaction<N extends Network, C extends SolanaChains = SolanaChains> implements UnsignedTransaction {
@@ -13,4 +13,5 @@ export declare class SolanaUnsignedTransaction<N extends Network, C extends Sola
13
13
  readonly parallelizable: boolean;
14
14
  constructor(transaction: SolanaTransaction, network: N, chain: C, description: string, parallelizable?: boolean);
15
15
  }
16
+ export declare function isVersionedTransaction(tx: any): tx is VersionedTransaction;
16
17
  //# sourceMappingURL=unsignedTransaction.d.ts.map
package/dist/cjs/unsignedTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unsignedTransaction.d.ts","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,yBAAyB,CACpC,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,YAAY,CACrC,YAAW,mBAAmB;IAG5B,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO;gBAJvB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,OAAe;CAE3C"}
1
+ {"version":3,"file":"unsignedTransaction.d.ts","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,yBAAyB,CACpC,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,YAAY,CACrC,YAAW,mBAAmB;IAG5B,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO;gBAJvB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,OAAe;CAE3C;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,GAAG,GAAG,EAAE,IAAI,oBAAoB,CAK1E"}
package/dist/cjs/unsignedTransaction.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.SolanaUnsignedTransaction = void 0;
3
+ exports.isVersionedTransaction = exports.SolanaUnsignedTransaction = void 0;
4
4
  class SolanaUnsignedTransaction {
5
5
  transaction;
6
6
  network;
@@ -16,4 +16,9 @@ class SolanaUnsignedTransaction {
16
16
  }
17
17
  }
18
18
  exports.SolanaUnsignedTransaction = SolanaUnsignedTransaction;
19
+ function isVersionedTransaction(tx) {
20
+ return (tx.signatures !== undefined &&
21
+ tx.message !== undefined);
22
+ }
23
+ exports.isVersionedTransaction = isVersionedTransaction;
19
24
  //# sourceMappingURL=unsignedTransaction.js.map
package/dist/cjs/unsignedTransaction.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unsignedTransaction.js","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":";;;AAYA,MAAa,yBAAyB;IAMzB;IACA;IACA;IACA;IACA;IALX,YACW,WAA8B,EAC9B,OAAU,EACV,KAAQ,EACR,WAAmB,EACnB,iBAA0B,KAAK;QAJ/B,gBAAW,GAAX,WAAW,CAAmB;QAC9B,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,mBAAc,GAAd,cAAc,CAAiB;IACvC,CAAC;CACL;AAZD,8DAYC"}
1
+ {"version":3,"file":"unsignedTransaction.js","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":";;;AAgBA,MAAa,yBAAyB;IAMzB;IACA;IACA;IACA;IACA;IALX,YACW,WAA8B,EAC9B,OAAU,EACV,KAAQ,EACR,WAAmB,EACnB,iBAA0B,KAAK;QAJ/B,gBAAW,GAAX,WAAW,CAAmB;QAC9B,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,mBAAc,GAAd,cAAc,CAAiB;IACvC,CAAC;CACL;AAZD,8DAYC;AAED,SAAgB,sBAAsB,CAAC,EAAO;IAC5C,OAAO,CACkB,EAAG,CAAC,UAAU,KAAK,SAAS;QAC5B,EAAG,CAAC,OAAO,KAAK,SAAS,CACjD,CAAC;AACJ,CAAC;AALD,wDAKC"}
package/dist/esm/signer.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- import type { Connection, SendOptions, Transaction, TransactionInstruction } from '@solana/web3.js';
2
+ import type { Connection, SendOptions, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
3
3
  import { Keypair, PublicKey } from '@solana/web3.js';
4
4
  import type { Network, SignAndSendSigner, SignOnlySigner, Signer, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
5
5
  import type { SolanaChains } from './types.js';
6
- import type { SolanaUnsignedTransaction } from './unsignedTransaction.js';
6
+ import { type SolanaUnsignedTransaction } from './unsignedTransaction.js';
7
7
  export declare function getSolanaSigner(rpc: Connection, privateKey: string): Promise<Signer>;
8
8
  export declare function getSolanaSignAndSendSigner(rpc: Connection, privateKey: string | Keypair, opts?: {
9
9
  debug?: boolean;
@@ -33,7 +33,7 @@ export declare class SolanaSendSigner<N extends Network, C extends SolanaChains
33
33
  private retryable;
34
34
  signAndSend(tx: UnsignedTransaction[]): Promise<any[]>;
35
35
  }
36
- export declare function logTxDetails(transaction: Transaction): void;
37
- export declare function createPriorityFeeInstructions(connection: Connection, transaction: Transaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
38
- export declare function determineComputeBudget(connection: Connection, transaction: Transaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
36
+ export declare function logTxDetails(transaction: Transaction | VersionedTransaction): void;
37
+ export declare function createPriorityFeeInstructions(connection: Connection, transaction: Transaction | VersionedTransaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
38
+ export declare function determineComputeBudget(connection: Connection, transaction: Transaction | VersionedTransaction, lockedWritableAccounts?: PublicKey[], feePercentile?: number, minPriorityFee?: number): Promise<TransactionInstruction[]>;
39
39
  //# sourceMappingURL=signer.d.ts.map
package/dist/esm/signer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,OAAO,EACP,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAM1E,wBAAsB,eAAe,CACnC,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAGD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,GAAG,QAAQ,CAC5E,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;gBAHN,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,OAAe;IAGjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAoBlE;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,QAAQ,CACjC,YAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAGhC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS,CAAC;gBALV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAe,EACvB,sBAAsB,GAAE,MAAY,EACpC,SAAS,CAAC,yBAAa;IAOjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IASjB,OAAO,CAAC,SAAS;IA4BX,WAAW,CAAC,EAAE,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAgF7D;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,QAWpD;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAcnC;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6CnC"}
1
+ {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,OAAO,EACP,SAAS,EAIV,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,MAAM,EACN,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,0BAA0B,CAAC;AAMlC,wBAAsB,eAAe,CACnC,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAGD,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,MAAM,GAAG,OAAO,EAC5B,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,CAAC,CAmBjB;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,YAAY,GAAG,QAAQ,CAC5E,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAG7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;gBAHN,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,OAAe;IAGjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IAIX,IAAI,CAAC,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CA0BlE;AAED,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,QAAQ,CACjC,YAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAGhC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,SAAS,CAAC;gBALV,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE,OAAe,EACvB,sBAAsB,GAAE,MAAY,EACpC,SAAS,CAAC,yBAAa;IAOjC,KAAK,IAAI,CAAC;IAIV,OAAO,IAAI,MAAM;IASjB,OAAO,CAAC,SAAS;IA4BX,WAAW,CAAC,EAAE,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA0F7D;AAED,wBAAgB,YAAY,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,QAyB3E;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAuBnC;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,GAAG,oBAAoB,EAC/C,sBAAsB,GAAE,SAAS,EAAO,EACxC,aAAa,GAAE,MAAwC,EACvD,cAAc,GAAE,MAAU,GACzB,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA+CnC"}
package/dist/esm/signer.js CHANGED
@@ -1,6 +1,7 @@
1
- import { ComputeBudgetProgram, Keypair, SendTransactionError, TransactionExpiredBlockheightExceededError, } from '@solana/web3.js';
1
+ import { ComputeBudgetProgram, Keypair, SendTransactionError, TransactionExpiredBlockheightExceededError, TransactionMessage, } from '@solana/web3.js';
2
2
  import { encoding } from '@wormhole-foundation/sdk-connect';
3
3
  import { SolanaPlatform } from './platform.js';
4
+ import { isVersionedTransaction, } from './unsignedTransaction.js';
4
5
  // Add priority fee according to 90th percentile of recent fees paid
5
6
  const DEFAULT_PRIORITY_FEE_PERCENTILE = 0.9;
6
7
  // returns a SignOnlySigner for the Solana platform
@@ -43,9 +44,16 @@ export class SolanaSigner {
43
44
  console.log(`Signing: ${description} for ${this.address()}`);
44
45
  if (this._debug)
45
46
  logTxDetails(transaction);
46
- transaction.recentBlockhash = blockhash;
47
- transaction.partialSign(this._keypair, ...(extraSigners ?? []));
48
- signed.push(transaction.serialize());
47
+ if (isVersionedTransaction(transaction)) {
48
+ transaction.message.recentBlockhash = blockhash;
49
+ transaction.sign([this._keypair, ...(extraSigners ?? [])]);
50
+ signed.push(Buffer.from(transaction.serialize()));
51
+ }
52
+ else {
53
+ transaction.recentBlockhash = blockhash;
54
+ transaction.partialSign(this._keypair, ...(extraSigners ?? []));
55
+ signed.push(transaction.serialize());
56
+ }
49
57
  }
50
58
  return signed;
51
59
  }
@@ -110,16 +118,30 @@ export class SolanaSendSigner {
110
118
  for (const txn of tx) {
111
119
  const { description, transaction: { transaction, signers: extraSigners }, } = txn;
112
120
  console.log(`Signing: ${description} for ${this.address()}`);
121
+ let priorityFeeIx;
113
122
  if (this._priorityFeePercentile && this._priorityFeePercentile > 0)
114
- transaction.add(...(await createPriorityFeeInstructions(this._rpc, transaction, [], this._priorityFeePercentile)));
123
+ priorityFeeIx = await createPriorityFeeInstructions(this._rpc, transaction, [], this._priorityFeePercentile);
115
124
  if (this._debug)
116
125
  logTxDetails(transaction);
117
126
  // Try to send the transaction up to 5 times
118
127
  const maxRetries = 5;
119
128
  for (let i = 0; i < maxRetries; i++) {
120
129
  try {
121
- transaction.recentBlockhash = blockhash;
122
- transaction.partialSign(this._keypair, ...(extraSigners ?? []));
130
+ if (isVersionedTransaction(transaction)) {
131
+ if (priorityFeeIx) {
132
+ const msg = TransactionMessage.decompile(transaction.message);
133
+ msg.instructions.push(...priorityFeeIx);
134
+ transaction.message = msg.compileToV0Message();
135
+ }
136
+ transaction.message.recentBlockhash = blockhash;
137
+ transaction.sign([this._keypair, ...(extraSigners ?? [])]);
138
+ }
139
+ else {
140
+ if (priorityFeeIx)
141
+ transaction.add(...priorityFeeIx);
142
+ transaction.recentBlockhash = blockhash;
143
+ transaction.partialSign(this._keypair, ...(extraSigners ?? []));
144
+ }
123
145
  const txid = await this._rpc.sendRawTransaction(transaction.serialize(), this._sendOpts);
124
146
  txids.push(txid);
125
147
  break;
@@ -153,20 +175,42 @@ export class SolanaSendSigner {
153
175
  }
154
176
  }
155
177
  export function logTxDetails(transaction) {
156
- console.log(transaction.signatures);
157
- console.log(transaction.feePayer);
158
- transaction.instructions.forEach((ix) => {
159
- console.log('Program', ix.programId.toBase58());
160
- console.log('Data: ', ix.data.toString('hex'));
161
- console.log('Keys: ', ix.keys.map((k) => [k, k.pubkey.toBase58()]));
162
- });
178
+ if (isVersionedTransaction(transaction)) {
179
+ console.log(transaction.signatures);
180
+ const msg = transaction.message;
181
+ const keys = msg.getAccountKeys();
182
+ msg.compiledInstructions.forEach((ix) => {
183
+ console.log('Program', keys.get(ix.programIdIndex).toBase58());
184
+ console.log('Data: ', encoding.hex.encode(ix.data));
185
+ console.log('Keys: ', ix.accountKeyIndexes.map((k) => [k, keys.get(k).toBase58()]));
186
+ });
187
+ }
188
+ else {
189
+ console.log(transaction.signatures);
190
+ console.log(transaction.feePayer);
191
+ transaction.instructions.forEach((ix) => {
192
+ console.log('Program', ix.programId.toBase58());
193
+ console.log('Data: ', ix.data.toString('hex'));
194
+ console.log('Keys: ', ix.keys.map((k) => [k, k.pubkey.toBase58()]));
195
+ });
196
+ }
163
197
  }
164
198
  export async function createPriorityFeeInstructions(connection, transaction, lockedWritableAccounts = [], feePercentile = DEFAULT_PRIORITY_FEE_PERCENTILE, minPriorityFee = 0) {
165
199
  if (lockedWritableAccounts.length === 0) {
166
- lockedWritableAccounts = transaction.instructions
167
- .flatMap((ix) => ix.keys)
168
- .map((k) => (k.isWritable ? k.pubkey : null))
169
- .filter((k) => k !== null);
200
+ if (isVersionedTransaction(transaction)) {
201
+ const msg = transaction.message;
202
+ const keys = msg.getAccountKeys();
203
+ lockedWritableAccounts = msg.compiledInstructions
204
+ .flatMap((ix) => ix.accountKeyIndexes)
205
+ .map((k) => (msg.isAccountWritable(k) ? keys.get(k) : null))
206
+ .filter((k) => k !== null);
207
+ }
208
+ else {
209
+ lockedWritableAccounts = transaction.instructions
210
+ .flatMap((ix) => ix.keys)
211
+ .map((k) => (k.isWritable ? k.pubkey : null))
212
+ .filter((k) => k !== null);
213
+ }
170
214
  }
171
215
  return await determineComputeBudget(connection, transaction, lockedWritableAccounts, feePercentile, minPriorityFee);
172
216
  }
@@ -174,7 +218,9 @@ export async function determineComputeBudget(connection, transaction, lockedWrit
174
218
  let computeBudget = 250_000;
175
219
  let priorityFee = 1;
176
220
  try {
177
- const simulateResponse = await connection.simulateTransaction(transaction);
221
+ const simulateResponse = await (isVersionedTransaction(transaction)
222
+ ? connection.simulateTransaction(transaction)
223
+ : connection.simulateTransaction(transaction));
178
224
  if (simulateResponse.value.err) {
179
225
  console.error(`Error simulating Solana transaction: ${simulateResponse.value.err}`);
180
226
  }
package/dist/esm/signer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/signer.ts"],"names":[],"mappings":"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"}
package/dist/esm/unsignedTransaction.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- import type { Keypair, Transaction } from '@solana/web3.js';
1
+ import type { Keypair, Transaction, VersionedTransaction } from '@solana/web3.js';
2
2
  import type { Network, UnsignedTransaction } from '@wormhole-foundation/sdk-connect';
3
3
  import type { SolanaChains } from './types.js';
4
4
  export type SolanaTransaction = {
5
- transaction: Transaction;
5
+ transaction: Transaction | VersionedTransaction;
6
6
  signers?: Keypair[];
7
7
  };
8
8
  export declare class SolanaUnsignedTransaction<N extends Network, C extends SolanaChains = SolanaChains> implements UnsignedTransaction {
@@ -13,4 +13,5 @@ export declare class SolanaUnsignedTransaction<N extends Network, C extends Sola
13
13
  readonly parallelizable: boolean;
14
14
  constructor(transaction: SolanaTransaction, network: N, chain: C, description: string, parallelizable?: boolean);
15
15
  }
16
+ export declare function isVersionedTransaction(tx: any): tx is VersionedTransaction;
16
17
  //# sourceMappingURL=unsignedTransaction.d.ts.map
package/dist/esm/unsignedTransaction.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unsignedTransaction.d.ts","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,yBAAyB,CACpC,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,YAAY,CACrC,YAAW,mBAAmB;IAG5B,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO;gBAJvB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,OAAe;CAE3C"}
1
+ {"version":3,"file":"unsignedTransaction.d.ts","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,yBAAyB,CACpC,CAAC,SAAS,OAAO,EACjB,CAAC,SAAS,YAAY,GAAG,YAAY,CACrC,YAAW,mBAAmB;IAG5B,QAAQ,CAAC,WAAW,EAAE,iBAAiB;IACvC,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,OAAO;gBAJvB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,OAAe;CAE3C;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,GAAG,GAAG,EAAE,IAAI,oBAAoB,CAK1E"}
package/dist/esm/unsignedTransaction.js CHANGED
@@ -12,4 +12,8 @@ export class SolanaUnsignedTransaction {
12
12
  this.parallelizable = parallelizable;
13
13
  }
14
14
  }
15
+ export function isVersionedTransaction(tx) {
16
+ return (tx.signatures !== undefined &&
17
+ tx.message !== undefined);
18
+ }
15
19
  //# sourceMappingURL=unsignedTransaction.js.map
package/dist/esm/unsignedTransaction.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unsignedTransaction.js","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,yBAAyB;IAMzB;IACA;IACA;IACA;IACA;IALX,YACW,WAA8B,EAC9B,OAAU,EACV,KAAQ,EACR,WAAmB,EACnB,iBAA0B,KAAK;QAJ/B,gBAAW,GAAX,WAAW,CAAmB;QAC9B,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,mBAAc,GAAd,cAAc,CAAiB;IACvC,CAAC;CACL"}
1
+ {"version":3,"file":"unsignedTransaction.js","sourceRoot":"","sources":["../../src/unsignedTransaction.ts"],"names":[],"mappings":"AAgBA,MAAM,OAAO,yBAAyB;IAMzB;IACA;IACA;IACA;IACA;IALX,YACW,WAA8B,EAC9B,OAAU,EACV,KAAQ,EACR,WAAmB,EACnB,iBAA0B,KAAK;QAJ/B,gBAAW,GAAX,WAAW,CAAmB;QAC9B,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,gBAAW,GAAX,WAAW,CAAQ;QACnB,mBAAc,GAAd,cAAc,CAAiB;IACvC,CAAC;CACL;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAO;IAC5C,OAAO,CACkB,EAAG,CAAC,UAAU,KAAK,SAAS;QAC5B,EAAG,CAAC,OAAO,KAAK,SAAS,CACjD,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wormhole-foundation/sdk-solana",
3
- "version": "0.5.3",
3
+ "version": "0.6.0",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+https://github.com/wormhole-foundation/connect-sdk.git"
@@ -49,7 +49,7 @@
49
49
  "nock": "^13.3.3"
50
50
  },
51
51
  "dependencies": {
52
- "@wormhole-foundation/sdk-connect": "0.5.3",
52
+ "@wormhole-foundation/sdk-connect": "0.6.0",
53
53
  "@coral-xyz/borsh": "0.29.0",
54
54
  "@coral-xyz/anchor": "0.29.0",
55
55
  "@solana/spl-token": "0.3.9",