@solana/transactions 2.0.0-experimental.19791fe → 2.0.0-experimental.1a0940d

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 (63) hide show
  1. package/README.md +272 -5
  2. package/dist/index.browser.cjs +427 -238
  3. package/dist/index.browser.cjs.map +1 -1
  4. package/dist/index.browser.js +420 -238
  5. package/dist/index.browser.js.map +1 -1
  6. package/dist/index.native.js +420 -238
  7. package/dist/index.native.js.map +1 -1
  8. package/dist/index.node.cjs +427 -238
  9. package/dist/index.node.cjs.map +1 -1
  10. package/dist/index.node.js +418 -238
  11. package/dist/index.node.js.map +1 -1
  12. package/dist/types/accounts.d.ts +2 -2
  13. package/dist/types/accounts.d.ts.map +1 -1
  14. package/dist/types/blockhash.d.ts +5 -7
  15. package/dist/types/blockhash.d.ts.map +1 -1
  16. package/dist/types/compilable-transaction.d.ts +7 -0
  17. package/dist/types/compilable-transaction.d.ts.map +1 -0
  18. package/dist/types/compile-address-table-lookups.d.ts +3 -3
  19. package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
  20. package/dist/types/compile-header.d.ts +1 -1
  21. package/dist/types/compile-instructions.d.ts +1 -1
  22. package/dist/types/compile-lifetime-token.d.ts +1 -1
  23. package/dist/types/compile-static-accounts.d.ts +3 -3
  24. package/dist/types/compile-static-accounts.d.ts.map +1 -1
  25. package/dist/types/compile-transaction.d.ts +6 -7
  26. package/dist/types/compile-transaction.d.ts.map +1 -1
  27. package/dist/types/create-transaction.d.ts +1 -1
  28. package/dist/types/decompile-transaction.d.ts +13 -0
  29. package/dist/types/decompile-transaction.d.ts.map +1 -0
  30. package/dist/types/durable-nonce.d.ts +7 -8
  31. package/dist/types/durable-nonce.d.ts.map +1 -1
  32. package/dist/types/fee-payer.d.ts +6 -6
  33. package/dist/types/fee-payer.d.ts.map +1 -1
  34. package/dist/types/index.d.ts +12 -9
  35. package/dist/types/index.d.ts.map +1 -1
  36. package/dist/types/instructions.d.ts +2 -2
  37. package/dist/types/message.d.ts +6 -10
  38. package/dist/types/message.d.ts.map +1 -1
  39. package/dist/types/serializers/address-table-lookup.d.ts +5 -5
  40. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
  41. package/dist/types/serializers/header.d.ts +5 -5
  42. package/dist/types/serializers/header.d.ts.map +1 -1
  43. package/dist/types/serializers/index.d.ts +2 -1
  44. package/dist/types/serializers/index.d.ts.map +1 -1
  45. package/dist/types/serializers/instruction.d.ts +5 -5
  46. package/dist/types/serializers/instruction.d.ts.map +1 -1
  47. package/dist/types/serializers/message.d.ts +5 -5
  48. package/dist/types/serializers/message.d.ts.map +1 -1
  49. package/dist/types/serializers/transaction-version.d.ts +5 -5
  50. package/dist/types/serializers/transaction-version.d.ts.map +1 -1
  51. package/dist/types/serializers/transaction.d.ts +9 -6
  52. package/dist/types/serializers/transaction.d.ts.map +1 -1
  53. package/dist/types/signatures.d.ts +9 -13
  54. package/dist/types/signatures.d.ts.map +1 -1
  55. package/dist/types/types.d.ts +6 -13
  56. package/dist/types/types.d.ts.map +1 -1
  57. package/dist/types/unsigned-transaction.d.ts +1 -1
  58. package/dist/types/wire-transaction.d.ts +1 -1
  59. package/dist/types/wire-transaction.d.ts.map +1 -1
  60. package/package.json +18 -16
  61. package/dist/index.development.js +0 -1378
  62. package/dist/index.development.js.map +0 -1
  63. package/dist/index.production.min.js +0 -26
@@ -1,30 +1,17 @@
1
- import { base58 } from '@metaplex-foundation/umi-serializers';
2
- import { mapEncoder } from '@solana/codecs-core';
3
- import { getStructEncoder, getArrayEncoder, getBytesEncoder } from '@solana/codecs-data-structures';
4
- import { getShortU16Encoder, getU8Encoder } from '@solana/codecs-numbers';
5
- import { getAddressFromPublicKey, getAddressComparator, getAddressEncoder } from '@solana/addresses';
6
- import { getStringEncoder, getBase58Encoder } from '@solana/codecs-strings';
1
+ import { getBase58Decoder, getBase64Decoder, getStringEncoder, getBase58Encoder, getStringDecoder } from '@solana/codecs-strings';
2
+ import { getAddressFromPublicKey, assertIsAddress, getAddressComparator, getAddressEncoder, getAddressDecoder } from '@solana/addresses';
3
+ import { pipe } from '@solana/functional';
4
+ import { createEncoder, mapDecoder, combineCodec, mapEncoder, createDecoder } from '@solana/codecs-core';
5
+ import { getStructDecoder, getArrayDecoder, getBytesDecoder, getStructEncoder, getArrayEncoder, getBytesEncoder } from '@solana/codecs-data-structures';
6
+ import { getShortU16Decoder, getShortU16Encoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
7
+ import { SolanaError, SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE, SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES } from '@solana/errors';
7
8
  import { signBytes } from '@solana/keys';
8
9
 
9
- // ../build-scripts/env-shim.ts
10
- var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
11
-
12
- // src/unsigned-transaction.ts
13
- function getUnsignedTransaction(transaction) {
14
- if ("signatures" in transaction) {
15
- const {
16
- signatures: _,
17
- // eslint-disable-line @typescript-eslint/no-unused-vars
18
- ...unsignedTransaction
19
- } = transaction;
20
- return unsignedTransaction;
21
- } else {
22
- return transaction;
23
- }
24
- }
25
-
26
- // src/blockhash.ts
10
+ // ../rpc-types/dist/index.browser.js
11
+ var base58Encoder;
27
12
  function assertIsBlockhash(putativeBlockhash) {
13
+ if (!base58Encoder)
14
+ base58Encoder = getBase58Encoder();
28
15
  try {
29
16
  if (
30
17
  // Lowest value (32 bytes of zeroes)
@@ -33,7 +20,7 @@ function assertIsBlockhash(putativeBlockhash) {
33
20
  ) {
34
21
  throw new Error("Expected input string to decode to a byte array of length 32.");
35
22
  }
36
- const bytes = base58.serialize(putativeBlockhash);
23
+ const bytes = base58Encoder.encode(putativeBlockhash);
37
24
  const numBytes = bytes.byteLength;
38
25
  if (numBytes !== 32) {
39
26
  throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
@@ -44,6 +31,38 @@ function assertIsBlockhash(putativeBlockhash) {
44
31
  });
45
32
  }
46
33
  }
34
+
35
+ // src/unsigned-transaction.ts
36
+ function getUnsignedTransaction(transaction) {
37
+ if ("signatures" in transaction) {
38
+ const {
39
+ signatures: _,
40
+ // eslint-disable-line @typescript-eslint/no-unused-vars
41
+ ...unsignedTransaction
42
+ } = transaction;
43
+ return unsignedTransaction;
44
+ } else {
45
+ return transaction;
46
+ }
47
+ }
48
+
49
+ // src/blockhash.ts
50
+ function isTransactionWithBlockhashLifetime(transaction) {
51
+ const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
52
+ if (!lifetimeConstraintShapeMatches)
53
+ return false;
54
+ try {
55
+ assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
56
+ return true;
57
+ } catch {
58
+ return false;
59
+ }
60
+ }
61
+ function assertIsTransactionWithBlockhashLifetime(transaction) {
62
+ if (!isTransactionWithBlockhashLifetime(transaction)) {
63
+ throw new Error("Transaction does not have a blockhash lifetime");
64
+ }
65
+ }
47
66
  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
48
67
  if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
49
68
  return transaction;
@@ -119,7 +138,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
119
138
  instruction.accounts?.length === 3 && // First account is nonce account address
120
139
  instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
121
140
  instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
122
- instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole.READONLY_SIGNER;
141
+ instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
123
142
  }
124
143
  function isAdvanceNonceAccountInstructionData(data) {
125
144
  return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -127,21 +146,38 @@ function isAdvanceNonceAccountInstructionData(data) {
127
146
  function isDurableNonceTransaction(transaction) {
128
147
  return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
129
148
  }
149
+ function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
150
+ return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
151
+ }
130
152
  function setTransactionLifetimeUsingDurableNonce({
131
153
  nonce,
132
154
  nonceAccountAddress,
133
155
  nonceAuthorityAddress
134
156
  }, transaction) {
135
- const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
136
- if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
137
- return transaction;
157
+ let newInstructions;
158
+ const firstInstruction = transaction.instructions[0];
159
+ if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
160
+ if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
161
+ if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
162
+ return transaction;
163
+ } else {
164
+ newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
165
+ }
166
+ } else {
167
+ newInstructions = [
168
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
169
+ ...transaction.instructions.slice(1)
170
+ ];
171
+ }
172
+ } else {
173
+ newInstructions = [
174
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
175
+ ...transaction.instructions
176
+ ];
138
177
  }
139
178
  const out = {
140
179
  ...getUnsignedTransaction(transaction),
141
- instructions: [
142
- createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
143
- ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
144
- ],
180
+ instructions: newInstructions,
145
181
  lifetimeConstraint: {
146
182
  nonce
147
183
  }
@@ -180,6 +216,151 @@ function prependTransactionInstruction(instruction, transaction) {
180
216
  Object.freeze(out);
181
217
  return out;
182
218
  }
219
+
220
+ // src/decompile-transaction.ts
221
+ function getAccountMetas(message) {
222
+ const { header } = message;
223
+ const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
224
+ const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
225
+ const accountMetas = [];
226
+ let accountIndex = 0;
227
+ for (let i = 0; i < numWritableSignerAccounts; i++) {
228
+ accountMetas.push({
229
+ address: message.staticAccounts[accountIndex],
230
+ role: AccountRole.WRITABLE_SIGNER
231
+ });
232
+ accountIndex++;
233
+ }
234
+ for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
235
+ accountMetas.push({
236
+ address: message.staticAccounts[accountIndex],
237
+ role: AccountRole.READONLY_SIGNER
238
+ });
239
+ accountIndex++;
240
+ }
241
+ for (let i = 0; i < numWritableNonSignerAccounts; i++) {
242
+ accountMetas.push({
243
+ address: message.staticAccounts[accountIndex],
244
+ role: AccountRole.WRITABLE
245
+ });
246
+ accountIndex++;
247
+ }
248
+ for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
249
+ accountMetas.push({
250
+ address: message.staticAccounts[accountIndex],
251
+ role: AccountRole.READONLY
252
+ });
253
+ accountIndex++;
254
+ }
255
+ return accountMetas;
256
+ }
257
+ function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTableAddress) {
258
+ const compiledAddressTableLookupAddresses = compiledAddressTableLookups.map((l) => l.lookupTableAddress);
259
+ const missing = compiledAddressTableLookupAddresses.filter((a) => addressesByLookupTableAddress[a] === void 0);
260
+ if (missing.length > 0) {
261
+ const missingAddresses = missing.join(", ");
262
+ throw new Error(`Addresses not provided for lookup tables: [${missingAddresses}]`);
263
+ }
264
+ const readOnlyMetas = [];
265
+ const writableMetas = [];
266
+ for (const lookup of compiledAddressTableLookups) {
267
+ const addresses = addressesByLookupTableAddress[lookup.lookupTableAddress];
268
+ const highestIndex = Math.max(...lookup.readableIndices, ...lookup.writableIndices);
269
+ if (highestIndex >= addresses.length) {
270
+ throw new Error(
271
+ `Cannot look up index ${highestIndex} in lookup table [${lookup.lookupTableAddress}]. The lookup table may have been extended since the addresses provided were retrieved.`
272
+ );
273
+ }
274
+ const readOnlyForLookup = lookup.readableIndices.map((r) => ({
275
+ address: addresses[r],
276
+ addressIndex: r,
277
+ lookupTableAddress: lookup.lookupTableAddress,
278
+ role: AccountRole.READONLY
279
+ }));
280
+ readOnlyMetas.push(...readOnlyForLookup);
281
+ const writableForLookup = lookup.writableIndices.map((w) => ({
282
+ address: addresses[w],
283
+ addressIndex: w,
284
+ lookupTableAddress: lookup.lookupTableAddress,
285
+ role: AccountRole.WRITABLE
286
+ }));
287
+ writableMetas.push(...writableForLookup);
288
+ }
289
+ return [...writableMetas, ...readOnlyMetas];
290
+ }
291
+ function convertInstruction(instruction, accountMetas) {
292
+ const programAddress = accountMetas[instruction.programAddressIndex]?.address;
293
+ if (!programAddress) {
294
+ throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
295
+ }
296
+ const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
297
+ const { data } = instruction;
298
+ return {
299
+ programAddress,
300
+ ...accounts && accounts.length ? { accounts } : {},
301
+ ...data && data.length ? { data } : {}
302
+ };
303
+ }
304
+ function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
305
+ if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
306
+ return {
307
+ blockhash: messageLifetimeToken,
308
+ lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
309
+ // U64 MAX
310
+ };
311
+ } else {
312
+ const nonceAccountAddress = firstInstruction.accounts[0].address;
313
+ assertIsAddress(nonceAccountAddress);
314
+ const nonceAuthorityAddress = firstInstruction.accounts[2].address;
315
+ assertIsAddress(nonceAuthorityAddress);
316
+ return {
317
+ nonce: messageLifetimeToken,
318
+ nonceAccountAddress,
319
+ nonceAuthorityAddress
320
+ };
321
+ }
322
+ }
323
+ function convertSignatures(compiledTransaction) {
324
+ const {
325
+ compiledMessage: { staticAccounts },
326
+ signatures
327
+ } = compiledTransaction;
328
+ return signatures.reduce((acc, sig, index) => {
329
+ const allZeros = sig.every((byte) => byte === 0);
330
+ if (allZeros)
331
+ return acc;
332
+ const address = staticAccounts[index];
333
+ return { ...acc, [address]: sig };
334
+ }, {});
335
+ }
336
+ function decompileTransaction(compiledTransaction, config) {
337
+ const { compiledMessage } = compiledTransaction;
338
+ const feePayer = compiledMessage.staticAccounts[0];
339
+ if (!feePayer)
340
+ throw new Error("No fee payer set in CompiledTransaction");
341
+ const accountMetas = getAccountMetas(compiledMessage);
342
+ const accountLookupMetas = "addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups !== void 0 && compiledMessage.addressTableLookups.length > 0 ? getAddressLookupMetas(compiledMessage.addressTableLookups, config?.addressesByLookupTableAddress ?? {}) : [];
343
+ const transactionMetas = [...accountMetas, ...accountLookupMetas];
344
+ const instructions = compiledMessage.instructions.map(
345
+ (compiledInstruction) => convertInstruction(compiledInstruction, transactionMetas)
346
+ );
347
+ const firstInstruction = instructions[0];
348
+ const lifetimeConstraint = getLifetimeConstraint(
349
+ compiledMessage.lifetimeToken,
350
+ firstInstruction,
351
+ config?.lastValidBlockHeight
352
+ );
353
+ const signatures = convertSignatures(compiledTransaction);
354
+ return pipe(
355
+ createTransaction({ version: compiledMessage.version }),
356
+ (tx) => setTransactionFeePayer(feePayer, tx),
357
+ (tx) => instructions.reduce((acc, instruction) => {
358
+ return appendTransactionInstruction(instruction, acc);
359
+ }, tx),
360
+ (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
361
+ (tx) => Object.keys(signatures).length > 0 ? { ...tx, signatures } : tx
362
+ );
363
+ }
183
364
  function upsert(addressMap, address, update) {
184
365
  addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
185
366
  }
@@ -232,7 +413,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
232
413
  const shouldReplaceEntry = (
233
414
  // Consider using the new LOOKUP_TABLE if its address is different...
234
415
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
235
- (addressComparator || (addressComparator = getAddressComparator()))(
416
+ (addressComparator ||= getAddressComparator())(
236
417
  accountMeta.lookupTableAddress,
237
418
  entry.lookupTableAddress
238
419
  ) < 0
@@ -338,7 +519,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
338
519
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
339
520
  return leftIsWritable ? -1 : 1;
340
521
  }
341
- addressComparator || (addressComparator = getAddressComparator());
522
+ addressComparator ||= getAddressComparator();
342
523
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
343
524
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
344
525
  } else {
@@ -351,16 +532,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
351
532
  return orderedAccounts;
352
533
  }
353
534
  function getCompiledAddressTableLookups(orderedAccounts) {
354
- var _a;
355
535
  const index = {};
356
536
  for (const account of orderedAccounts) {
357
537
  if (!("lookupTableAddress" in account)) {
358
538
  continue;
359
539
  }
360
- const entry = index[_a = account.lookupTableAddress] || (index[_a] = {
540
+ const entry = index[account.lookupTableAddress] ||= {
361
541
  readableIndices: [],
362
542
  writableIndices: []
363
- });
543
+ };
364
544
  if (account.role === AccountRole.WRITABLE) {
365
545
  entry.writableIndices.push(account.addressIndex);
366
546
  } else {
@@ -446,101 +626,68 @@ function compileMessage(transaction) {
446
626
  version: transaction.version
447
627
  };
448
628
  }
449
-
450
- // src/compile-transaction.ts
451
- function getCompiledTransaction(transaction) {
452
- const compiledMessage = compileMessage(transaction);
453
- let signatures;
454
- if ("signatures" in transaction) {
455
- signatures = [];
456
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
457
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
458
- }
459
- } else {
460
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
461
- }
462
- return {
463
- compiledMessage,
464
- signatures
465
- };
466
- }
467
- var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
468
- var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
469
- var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
470
- var addressTableLookupDescription = __DEV__ ? "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it" : "addressTableLookup";
471
629
  var memoizedAddressTableLookupEncoder;
472
630
  function getAddressTableLookupEncoder() {
473
631
  if (!memoizedAddressTableLookupEncoder) {
474
- memoizedAddressTableLookupEncoder = getStructEncoder(
632
+ memoizedAddressTableLookupEncoder = getStructEncoder([
633
+ ["lookupTableAddress", getAddressEncoder()],
475
634
  [
476
- ["lookupTableAddress", getAddressEncoder({ description: lookupTableAddressDescription })],
477
- [
478
- "writableIndices",
479
- getArrayEncoder(getU8Encoder(), {
480
- description: writableIndicesDescription,
481
- size: getShortU16Encoder()
482
- })
483
- ],
484
- [
485
- "readableIndices",
486
- getArrayEncoder(getU8Encoder(), {
487
- description: readableIndicesDescription,
488
- size: getShortU16Encoder()
489
- })
490
- ]
635
+ "writableIndices",
636
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
491
637
  ],
492
- { description: addressTableLookupDescription }
493
- );
638
+ [
639
+ "readableIndices",
640
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
641
+ ]
642
+ ]);
494
643
  }
495
644
  return memoizedAddressTableLookupEncoder;
496
645
  }
646
+ var memoizedAddressTableLookupDecoder;
647
+ function getAddressTableLookupDecoder() {
648
+ if (!memoizedAddressTableLookupDecoder) {
649
+ memoizedAddressTableLookupDecoder = getStructDecoder([
650
+ ["lookupTableAddress", getAddressDecoder()],
651
+ ["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
652
+ ["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
653
+ ]);
654
+ }
655
+ return memoizedAddressTableLookupDecoder;
656
+ }
497
657
  var memoizedU8Encoder;
498
658
  function getMemoizedU8Encoder() {
499
659
  if (!memoizedU8Encoder)
500
660
  memoizedU8Encoder = getU8Encoder();
501
661
  return memoizedU8Encoder;
502
662
  }
503
- function getMemoizedU8EncoderDescription(description) {
504
- const encoder = getMemoizedU8Encoder();
505
- return {
506
- ...encoder,
507
- description: description ?? encoder.description
508
- };
663
+ var memoizedU8Decoder;
664
+ function getMemoizedU8Decoder() {
665
+ if (!memoizedU8Decoder)
666
+ memoizedU8Decoder = getU8Decoder();
667
+ return memoizedU8Decoder;
509
668
  }
510
- var numSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" : void 0;
511
- var numReadonlySignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable" : void 0;
512
- var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
513
- var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
514
669
  function getMessageHeaderEncoder() {
515
- return getStructEncoder(
516
- [
517
- ["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
518
- ["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
519
- ["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
520
- ],
521
- {
522
- description: messageHeaderDescription
523
- }
524
- );
670
+ return getStructEncoder([
671
+ ["numSignerAccounts", getMemoizedU8Encoder()],
672
+ ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
673
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
674
+ ]);
675
+ }
676
+ function getMessageHeaderDecoder() {
677
+ return getStructDecoder([
678
+ ["numSignerAccounts", getMemoizedU8Decoder()],
679
+ ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
680
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
681
+ ]);
525
682
  }
526
- var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
527
- var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
528
- var accountIndicesDescription = __DEV__ ? "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" : "accountIndices";
529
- var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
530
683
  var memoizedGetInstructionEncoder;
531
684
  function getInstructionEncoder() {
532
685
  if (!memoizedGetInstructionEncoder) {
533
686
  memoizedGetInstructionEncoder = mapEncoder(
534
687
  getStructEncoder([
535
- ["programAddressIndex", getU8Encoder({ description: programAddressIndexDescription })],
536
- [
537
- "accountIndices",
538
- getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
539
- description: accountIndicesDescription,
540
- size: getShortU16Encoder()
541
- })
542
- ],
543
- ["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
688
+ ["programAddressIndex", getU8Encoder()],
689
+ ["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
690
+ ["data", getBytesEncoder({ size: getShortU16Encoder() })]
544
691
  ]),
545
692
  // Convert an instruction to have all fields defined
546
693
  (instruction) => {
@@ -557,33 +704,64 @@ function getInstructionEncoder() {
557
704
  }
558
705
  return memoizedGetInstructionEncoder;
559
706
  }
560
- var VERSION_FLAG_MASK = 128;
561
- var BASE_CONFIG = {
562
- description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
563
- fixedSize: null,
564
- maxSize: 1
565
- };
566
- function encode(value) {
567
- if (value === "legacy") {
568
- return new Uint8Array();
569
- }
570
- if (value < 0 || value > 127) {
571
- throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
707
+ var memoizedGetInstructionDecoder;
708
+ function getInstructionDecoder() {
709
+ if (!memoizedGetInstructionDecoder) {
710
+ memoizedGetInstructionDecoder = mapDecoder(
711
+ getStructDecoder([
712
+ ["programAddressIndex", getU8Decoder()],
713
+ ["accountIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
714
+ ["data", getBytesDecoder({ size: getShortU16Decoder() })]
715
+ ]),
716
+ // Convert an instruction to exclude optional fields if they are empty
717
+ (instruction) => {
718
+ if (instruction.accountIndices.length && instruction.data.byteLength) {
719
+ return instruction;
720
+ }
721
+ const { accountIndices, data, ...rest } = instruction;
722
+ return {
723
+ ...rest,
724
+ ...accountIndices.length ? { accountIndices } : null,
725
+ ...data.byteLength ? { data } : null
726
+ };
727
+ }
728
+ );
572
729
  }
573
- return new Uint8Array([value | VERSION_FLAG_MASK]);
730
+ return memoizedGetInstructionDecoder;
574
731
  }
732
+ var VERSION_FLAG_MASK = 128;
575
733
  function getTransactionVersionEncoder() {
576
- return {
577
- ...BASE_CONFIG,
578
- encode
579
- };
734
+ return createEncoder({
735
+ getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
736
+ maxSize: 1,
737
+ write: (value, bytes, offset) => {
738
+ if (value === "legacy") {
739
+ return offset;
740
+ }
741
+ if (value < 0 || value > 127) {
742
+ throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
743
+ }
744
+ bytes.set([value | VERSION_FLAG_MASK], offset);
745
+ return offset + 1;
746
+ }
747
+ });
748
+ }
749
+ function getTransactionVersionDecoder() {
750
+ return createDecoder({
751
+ maxSize: 1,
752
+ read: (bytes, offset) => {
753
+ const firstByte = bytes[offset];
754
+ if ((firstByte & VERSION_FLAG_MASK) === 0) {
755
+ return ["legacy", offset];
756
+ } else {
757
+ const version = firstByte ^ VERSION_FLAG_MASK;
758
+ return [version, offset + 1];
759
+ }
760
+ }
761
+ });
580
762
  }
581
763
 
582
764
  // src/serializers/message.ts
583
- var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
584
- var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
585
- var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
586
- var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
587
765
  function getCompiledMessageLegacyEncoder() {
588
766
  return getStructEncoder(getPreludeStructEncoderTuple());
589
767
  }
@@ -608,134 +786,123 @@ function getPreludeStructEncoderTuple() {
608
786
  return [
609
787
  ["version", getTransactionVersionEncoder()],
610
788
  ["header", getMessageHeaderEncoder()],
611
- [
612
- "staticAccounts",
613
- getArrayEncoder(getAddressEncoder(), {
614
- description: staticAccountsDescription,
615
- size: getShortU16Encoder()
616
- })
617
- ],
618
- [
619
- "lifetimeToken",
620
- getStringEncoder({
621
- description: lifetimeTokenDescription,
622
- encoding: getBase58Encoder(),
623
- size: 32
624
- })
625
- ],
626
- [
627
- "instructions",
628
- getArrayEncoder(getInstructionEncoder(), {
629
- description: instructionsDescription,
630
- size: getShortU16Encoder()
631
- })
632
- ]
789
+ ["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
790
+ ["lifetimeToken", getStringEncoder({ encoding: getBase58Encoder(), size: 32 })],
791
+ ["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
792
+ ];
793
+ }
794
+ function getPreludeStructDecoderTuple() {
795
+ return [
796
+ ["version", getTransactionVersionDecoder()],
797
+ ["header", getMessageHeaderDecoder()],
798
+ ["staticAccounts", getArrayDecoder(getAddressDecoder(), { size: getShortU16Decoder() })],
799
+ ["lifetimeToken", getStringDecoder({ encoding: getBase58Decoder(), size: 32 })],
800
+ ["instructions", getArrayDecoder(getInstructionDecoder(), { size: getShortU16Decoder() })],
801
+ ["addressTableLookups", getAddressTableLookupArrayDecoder()]
633
802
  ];
634
803
  }
635
804
  function getAddressTableLookupArrayEncoder() {
636
- return getArrayEncoder(getAddressTableLookupEncoder(), {
637
- description: addressTableLookupsDescription,
638
- size: getShortU16Encoder()
639
- });
805
+ return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
806
+ }
807
+ function getAddressTableLookupArrayDecoder() {
808
+ return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
640
809
  }
641
- var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
642
810
  function getCompiledMessageEncoder() {
643
- return {
644
- description: messageDescription,
645
- encode: (compiledMessage) => {
811
+ return createEncoder({
812
+ getSizeFromValue: (compiledMessage) => {
646
813
  if (compiledMessage.version === "legacy") {
647
- return getCompiledMessageLegacyEncoder().encode(compiledMessage);
814
+ return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
648
815
  } else {
649
- return getCompiledMessageVersionedEncoder().encode(compiledMessage);
816
+ return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
650
817
  }
651
818
  },
652
- fixedSize: null,
653
- maxSize: null
819
+ write: (compiledMessage, bytes, offset) => {
820
+ if (compiledMessage.version === "legacy") {
821
+ return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
822
+ } else {
823
+ return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
824
+ }
825
+ }
826
+ });
827
+ }
828
+ function getCompiledMessageDecoder() {
829
+ return mapDecoder(getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
830
+ if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
831
+ return restOfMessage;
832
+ }
833
+ return { ...restOfMessage, addressTableLookups };
834
+ });
835
+ }
836
+ function getCompiledMessageCodec() {
837
+ return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
838
+ }
839
+
840
+ // src/compile-transaction.ts
841
+ function getCompiledTransaction(transaction) {
842
+ const compiledMessage = compileMessage(transaction);
843
+ let signatures;
844
+ if ("signatures" in transaction) {
845
+ signatures = [];
846
+ for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
847
+ signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
848
+ }
849
+ } else {
850
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
851
+ }
852
+ return {
853
+ compiledMessage,
854
+ signatures
654
855
  };
655
856
  }
656
857
 
657
858
  // src/serializers/transaction.ts
658
- var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
659
- var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
660
859
  function getCompiledTransactionEncoder() {
661
- return getStructEncoder(
860
+ return getStructEncoder([
861
+ ["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
862
+ ["compiledMessage", getCompiledMessageEncoder()]
863
+ ]);
864
+ }
865
+ function getCompiledTransactionDecoder() {
866
+ return getStructDecoder([
662
867
  [
663
- [
664
- "signatures",
665
- getArrayEncoder(getBytesEncoder({ size: 64 }), {
666
- description: signaturesDescription,
667
- size: getShortU16Encoder()
668
- })
669
- ],
670
- ["compiledMessage", getCompiledMessageEncoder()]
868
+ "signatures",
869
+ getArrayDecoder(getBytesDecoder({ size: 64 }), {
870
+ size: getShortU16Decoder()
871
+ })
671
872
  ],
672
- {
673
- description: transactionDescription
674
- }
675
- );
873
+ ["compiledMessage", getCompiledMessageDecoder()]
874
+ ]);
676
875
  }
677
876
  function getTransactionEncoder() {
678
877
  return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
679
878
  }
680
- function assertIsTransactionSignature(putativeTransactionSignature) {
681
- try {
682
- if (
683
- // Lowest value (64 bytes of zeroes)
684
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
685
- putativeTransactionSignature.length > 88
686
- ) {
687
- throw new Error("Expected input string to decode to a byte array of length 64.");
688
- }
689
- const bytes = base58.serialize(putativeTransactionSignature);
690
- const numBytes = bytes.byteLength;
691
- if (numBytes !== 64) {
692
- throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
693
- }
694
- } catch (e) {
695
- throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
696
- cause: e
697
- });
698
- }
699
- }
700
- function isTransactionSignature(putativeTransactionSignature) {
701
- if (
702
- // Lowest value (64 bytes of zeroes)
703
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
704
- putativeTransactionSignature.length > 88
705
- ) {
706
- return false;
707
- }
708
- const bytes = base58.serialize(putativeTransactionSignature);
709
- const numBytes = bytes.byteLength;
710
- if (numBytes !== 64) {
711
- return false;
712
- }
713
- return true;
879
+ function getTransactionDecoder(config) {
880
+ return mapDecoder(
881
+ getCompiledTransactionDecoder(),
882
+ (compiledTransaction) => decompileTransaction(compiledTransaction, config)
883
+ );
714
884
  }
715
- async function getCompiledMessageSignature(message, secretKey) {
716
- const wireMessageBytes = getCompiledMessageEncoder().encode(message);
717
- const signature = await signBytes(secretKey, wireMessageBytes);
718
- return signature;
885
+ function getTransactionCodec(config) {
886
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
719
887
  }
888
+ var base58Decoder;
720
889
  function getSignatureFromTransaction(transaction) {
890
+ if (!base58Decoder)
891
+ base58Decoder = getBase58Decoder();
721
892
  const signatureBytes = transaction.signatures[transaction.feePayer];
722
893
  if (!signatureBytes) {
723
- throw new Error(
724
- "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
725
- );
894
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
726
895
  }
727
- const transactionSignature2 = base58.deserialize(signatureBytes)[0];
728
- return transactionSignature2;
896
+ const transactionSignature = base58Decoder.decode(signatureBytes);
897
+ return transactionSignature;
729
898
  }
730
- async function signTransaction(keyPairs, transaction) {
899
+ async function partiallySignTransaction(keyPairs, transaction) {
731
900
  const compiledMessage = compileMessage(transaction);
732
901
  const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
902
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
733
903
  const publicKeySignaturePairs = await Promise.all(
734
904
  keyPairs.map(
735
- (keyPair) => Promise.all([
736
- getAddressFromPublicKey(keyPair.publicKey),
737
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
738
- ])
905
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
739
906
  )
740
907
  );
741
908
  for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
@@ -748,17 +915,32 @@ async function signTransaction(keyPairs, transaction) {
748
915
  Object.freeze(out);
749
916
  return out;
750
917
  }
751
- function transactionSignature(putativeTransactionSignature) {
752
- assertIsTransactionSignature(putativeTransactionSignature);
753
- return putativeTransactionSignature;
918
+ async function signTransaction(keyPairs, transaction) {
919
+ const out = await partiallySignTransaction(keyPairs, transaction);
920
+ assertTransactionIsFullySigned(out);
921
+ Object.freeze(out);
922
+ return out;
923
+ }
924
+ function assertTransactionIsFullySigned(transaction) {
925
+ const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
926
+ const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
927
+ const missingSigs = [];
928
+ requiredSigners.forEach((address) => {
929
+ if (!transaction.signatures[address]) {
930
+ missingSigs.push(address);
931
+ }
932
+ });
933
+ if (missingSigs.length > 0) {
934
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
935
+ addresses: missingSigs
936
+ });
937
+ }
754
938
  }
755
-
756
- // src/wire-transaction.ts
757
939
  function getBase64EncodedWireTransaction(transaction) {
758
940
  const wireTransactionBytes = getTransactionEncoder().encode(transaction);
759
- {
760
- return btoa(String.fromCharCode(...wireTransactionBytes));
761
- }
941
+ return getBase64Decoder().decode(wireTransactionBytes);
762
942
  }
763
943
 
764
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionSignature, createTransaction, getBase64EncodedWireTransaction, getSignatureFromTransaction, getTransactionEncoder, isAdvanceNonceAccountInstruction, isTransactionSignature, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction, transactionSignature };
944
+ export { appendTransactionInstruction, assertIsDurableNonceTransaction, assertIsTransactionWithBlockhashLifetime, assertTransactionIsFullySigned, compileMessage, createTransaction, decompileTransaction, getBase64EncodedWireTransaction, getCompiledMessageCodec, getCompiledMessageDecoder, getCompiledMessageEncoder, getCompiledTransactionDecoder, getSignatureFromTransaction, getTransactionCodec, getTransactionDecoder, getTransactionEncoder, isAdvanceNonceAccountInstruction, partiallySignTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
945
+ //# sourceMappingURL=out.js.map
946
+ //# sourceMappingURL=index.browser.js.map