@solana/transactions 2.0.0-experimental.f57da91 → 2.0.0-experimental.f5d64e6

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 (66) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +272 -5
  3. package/dist/index.browser.cjs +415 -314
  4. package/dist/index.browser.cjs.map +1 -1
  5. package/dist/index.browser.js +407 -313
  6. package/dist/index.browser.js.map +1 -1
  7. package/dist/index.native.js +407 -313
  8. package/dist/index.native.js.map +1 -1
  9. package/dist/index.node.cjs +415 -314
  10. package/dist/index.node.cjs.map +1 -1
  11. package/dist/index.node.js +407 -313
  12. package/dist/index.node.js.map +1 -1
  13. package/dist/types/accounts.d.ts +2 -2
  14. package/dist/types/accounts.d.ts.map +1 -1
  15. package/dist/types/blockhash.d.ts +4 -3
  16. package/dist/types/blockhash.d.ts.map +1 -1
  17. package/dist/types/compilable-transaction.d.ts +7 -0
  18. package/dist/types/compilable-transaction.d.ts.map +1 -0
  19. package/dist/types/compile-address-table-lookups.d.ts +3 -3
  20. package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
  21. package/dist/types/compile-header.d.ts +1 -1
  22. package/dist/types/compile-instructions.d.ts +1 -1
  23. package/dist/types/compile-lifetime-token.d.ts +1 -1
  24. package/dist/types/compile-static-accounts.d.ts +3 -3
  25. package/dist/types/compile-static-accounts.d.ts.map +1 -1
  26. package/dist/types/compile-transaction.d.ts +6 -7
  27. package/dist/types/compile-transaction.d.ts.map +1 -1
  28. package/dist/types/create-transaction.d.ts +1 -1
  29. package/dist/types/decompile-transaction.d.ts +5 -0
  30. package/dist/types/decompile-transaction.d.ts.map +1 -0
  31. package/dist/types/durable-nonce.d.ts +8 -8
  32. package/dist/types/durable-nonce.d.ts.map +1 -1
  33. package/dist/types/fee-payer.d.ts +6 -6
  34. package/dist/types/fee-payer.d.ts.map +1 -1
  35. package/dist/types/index.d.ts +11 -9
  36. package/dist/types/index.d.ts.map +1 -1
  37. package/dist/types/instructions.d.ts +2 -2
  38. package/dist/types/message.d.ts +6 -10
  39. package/dist/types/message.d.ts.map +1 -1
  40. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  41. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
  42. package/dist/types/serializers/header.d.ts +5 -3
  43. package/dist/types/serializers/header.d.ts.map +1 -1
  44. package/dist/types/serializers/index.d.ts +2 -1
  45. package/dist/types/serializers/index.d.ts.map +1 -1
  46. package/dist/types/serializers/instruction.d.ts +5 -3
  47. package/dist/types/serializers/instruction.d.ts.map +1 -1
  48. package/dist/types/serializers/message.d.ts +5 -5
  49. package/dist/types/serializers/message.d.ts.map +1 -1
  50. package/dist/types/serializers/transaction-version.d.ts +5 -5
  51. package/dist/types/serializers/transaction-version.d.ts.map +1 -1
  52. package/dist/types/serializers/transaction.d.ts +6 -5
  53. package/dist/types/serializers/transaction.d.ts.map +1 -1
  54. package/dist/types/signatures.d.ts +9 -13
  55. package/dist/types/signatures.d.ts.map +1 -1
  56. package/dist/types/types.d.ts +6 -13
  57. package/dist/types/types.d.ts.map +1 -1
  58. package/dist/types/unsigned-transaction.d.ts +1 -1
  59. package/dist/types/wire-transaction.d.ts +2 -2
  60. package/dist/types/wire-transaction.d.ts.map +1 -1
  61. package/package.json +19 -15
  62. package/dist/index.development.js +0 -1384
  63. package/dist/index.development.js.map +0 -1
  64. package/dist/index.production.min.js +0 -25
  65. package/dist/types/serializers/unimplemented.d.ts +0 -3
  66. package/dist/types/serializers/unimplemented.d.ts.map +0 -1
@@ -1,9 +1,12 @@
1
- import { base58, struct, array, bytes, shortU16, mapSerializer, string, u8 } from '@metaplex-foundation/umi-serializers';
2
- import { getAddressFromPublicKey, getAddressComparator, getAddressCodec } from '@solana/addresses';
1
+ import { getBase58Encoder, getBase58Decoder, getBase64Decoder, getStringEncoder, getStringDecoder } from '@solana/codecs-strings';
2
+ import { getAddressFromPublicKey, getAddressComparator, getAddressEncoder, getAddressDecoder, assertIsAddress } from '@solana/addresses';
3
+ import { createEncoder, mapDecoder, combineCodec, mapEncoder, createDecoder } from '@solana/codecs-core';
4
+ import { getStructDecoder, getStructEncoder, getArrayEncoder, getArrayDecoder, getBytesEncoder, getBytesDecoder } from '@solana/codecs-data-structures';
5
+ import { getShortU16Encoder, getShortU16Decoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
6
+ import { pipe } from '@solana/functional';
3
7
  import { signBytes } from '@solana/keys';
4
8
 
5
- // ../build-scripts/env-shim.ts
6
- var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
9
+ // src/blockhash.ts
7
10
 
8
11
  // src/unsigned-transaction.ts
9
12
  function getUnsignedTransaction(transaction) {
@@ -20,7 +23,10 @@ function getUnsignedTransaction(transaction) {
20
23
  }
21
24
 
22
25
  // src/blockhash.ts
26
+ var base58Encoder;
23
27
  function assertIsBlockhash(putativeBlockhash) {
28
+ if (!base58Encoder)
29
+ base58Encoder = getBase58Encoder();
24
30
  try {
25
31
  if (
26
32
  // Lowest value (32 bytes of zeroes)
@@ -29,8 +35,8 @@ function assertIsBlockhash(putativeBlockhash) {
29
35
  ) {
30
36
  throw new Error("Expected input string to decode to a byte array of length 32.");
31
37
  }
32
- const bytes3 = base58.serialize(putativeBlockhash);
33
- const numBytes = bytes3.byteLength;
38
+ const bytes = base58Encoder.encode(putativeBlockhash);
39
+ const numBytes = bytes.byteLength;
34
40
  if (numBytes !== 32) {
35
41
  throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
36
42
  }
@@ -40,6 +46,22 @@ function assertIsBlockhash(putativeBlockhash) {
40
46
  });
41
47
  }
42
48
  }
49
+ function isTransactionWithBlockhashLifetime(transaction) {
50
+ const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
51
+ if (!lifetimeConstraintShapeMatches)
52
+ return false;
53
+ try {
54
+ assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
55
+ return true;
56
+ } catch {
57
+ return false;
58
+ }
59
+ }
60
+ function assertIsTransactionWithBlockhashLifetime(transaction) {
61
+ if (!isTransactionWithBlockhashLifetime(transaction)) {
62
+ throw new Error("Transaction does not have a blockhash lifetime");
63
+ }
64
+ }
43
65
  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
44
66
  if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
45
67
  return transaction;
@@ -115,7 +137,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
115
137
  instruction.accounts?.length === 3 && // First account is nonce account address
116
138
  instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
117
139
  instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
118
- instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole.READONLY_SIGNER;
140
+ instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
119
141
  }
120
142
  function isAdvanceNonceAccountInstructionData(data) {
121
143
  return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -123,21 +145,38 @@ function isAdvanceNonceAccountInstructionData(data) {
123
145
  function isDurableNonceTransaction(transaction) {
124
146
  return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
125
147
  }
148
+ function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
149
+ return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
150
+ }
126
151
  function setTransactionLifetimeUsingDurableNonce({
127
152
  nonce,
128
153
  nonceAccountAddress,
129
154
  nonceAuthorityAddress
130
155
  }, transaction) {
131
- const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
132
- if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
133
- return transaction;
156
+ let newInstructions;
157
+ const firstInstruction = transaction.instructions[0];
158
+ if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
159
+ if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
160
+ if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
161
+ return transaction;
162
+ } else {
163
+ newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
164
+ }
165
+ } else {
166
+ newInstructions = [
167
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
168
+ ...transaction.instructions.slice(1)
169
+ ];
170
+ }
171
+ } else {
172
+ newInstructions = [
173
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
174
+ ...transaction.instructions
175
+ ];
134
176
  }
135
177
  const out = {
136
178
  ...getUnsignedTransaction(transaction),
137
- instructions: [
138
- createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
139
- ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
140
- ],
179
+ instructions: newInstructions,
141
180
  lifetimeConstraint: {
142
181
  nonce
143
182
  }
@@ -228,7 +267,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
228
267
  const shouldReplaceEntry = (
229
268
  // Consider using the new LOOKUP_TABLE if its address is different...
230
269
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
231
- (addressComparator || (addressComparator = getAddressComparator()))(
270
+ (addressComparator ||= getAddressComparator())(
232
271
  accountMeta.lookupTableAddress,
233
272
  entry.lookupTableAddress
234
273
  ) < 0
@@ -334,7 +373,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
334
373
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
335
374
  return leftIsWritable ? -1 : 1;
336
375
  }
337
- addressComparator || (addressComparator = getAddressComparator());
376
+ addressComparator ||= getAddressComparator();
338
377
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
339
378
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
340
379
  } else {
@@ -347,16 +386,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
347
386
  return orderedAccounts;
348
387
  }
349
388
  function getCompiledAddressTableLookups(orderedAccounts) {
350
- var _a;
351
389
  const index = {};
352
390
  for (const account of orderedAccounts) {
353
391
  if (!("lookupTableAddress" in account)) {
354
392
  continue;
355
393
  }
356
- const entry = index[_a = account.lookupTableAddress] || (index[_a] = {
394
+ const entry = index[account.lookupTableAddress] ||= {
357
395
  readableIndices: [],
358
396
  writableIndices: []
359
- });
397
+ };
360
398
  if (account.role === AccountRole.WRITABLE) {
361
399
  entry.writableIndices.push(account.addressIndex);
362
400
  } else {
@@ -442,346 +480,395 @@ function compileMessage(transaction) {
442
480
  version: transaction.version
443
481
  };
444
482
  }
445
-
446
- // src/compile-transaction.ts
447
- function getCompiledTransaction(transaction) {
448
- const compiledMessage = compileMessage(transaction);
449
- let signatures;
450
- if ("signatures" in transaction) {
451
- signatures = [];
452
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
453
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
454
- }
455
- } else {
456
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
457
- }
458
- return {
459
- compiledMessage,
460
- signatures
461
- };
462
- }
463
- function getAddressTableLookupCodec() {
464
- return struct(
465
- [
466
- [
467
- "lookupTableAddress",
468
- getAddressCodec(
469
- __DEV__ ? {
470
- description: "The address of the address lookup table account from which instruction addresses should be looked up"
471
- } : void 0
472
- )
473
- ],
483
+ var memoizedAddressTableLookupEncoder;
484
+ function getAddressTableLookupEncoder() {
485
+ if (!memoizedAddressTableLookupEncoder) {
486
+ memoizedAddressTableLookupEncoder = getStructEncoder([
487
+ ["lookupTableAddress", getAddressEncoder()],
474
488
  [
475
489
  "writableIndices",
476
- array(u8(), {
477
- ...__DEV__ ? {
478
- description: "The indices of the accounts in the lookup table that should be loaded as writeable"
479
- } : null,
480
- size: shortU16()
481
- })
490
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
482
491
  ],
483
492
  [
484
493
  "readableIndices",
485
- array(u8(), {
486
- ...__DEV__ ? {
487
- description: "The indices of the accounts in the lookup table that should be loaded as read-only"
488
- } : void 0,
489
- size: shortU16()
490
- })
494
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
491
495
  ]
492
- ],
493
- __DEV__ ? {
494
- description: "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"
495
- } : void 0
496
- );
496
+ ]);
497
+ }
498
+ return memoizedAddressTableLookupEncoder;
499
+ }
500
+ var memoizedAddressTableLookupDecoder;
501
+ function getAddressTableLookupDecoder() {
502
+ if (!memoizedAddressTableLookupDecoder) {
503
+ memoizedAddressTableLookupDecoder = getStructDecoder([
504
+ ["lookupTableAddress", getAddressDecoder()],
505
+ ["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
506
+ ["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
507
+ ]);
508
+ }
509
+ return memoizedAddressTableLookupDecoder;
510
+ }
511
+ var memoizedU8Encoder;
512
+ function getMemoizedU8Encoder() {
513
+ if (!memoizedU8Encoder)
514
+ memoizedU8Encoder = getU8Encoder();
515
+ return memoizedU8Encoder;
516
+ }
517
+ var memoizedU8Decoder;
518
+ function getMemoizedU8Decoder() {
519
+ if (!memoizedU8Decoder)
520
+ memoizedU8Decoder = getU8Decoder();
521
+ return memoizedU8Decoder;
522
+ }
523
+ function getMessageHeaderEncoder() {
524
+ return getStructEncoder([
525
+ ["numSignerAccounts", getMemoizedU8Encoder()],
526
+ ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
527
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
528
+ ]);
529
+ }
530
+ function getMessageHeaderDecoder() {
531
+ return getStructDecoder([
532
+ ["numSignerAccounts", getMemoizedU8Decoder()],
533
+ ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
534
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
535
+ ]);
536
+ }
537
+ var memoizedGetInstructionEncoder;
538
+ function getInstructionEncoder() {
539
+ if (!memoizedGetInstructionEncoder) {
540
+ memoizedGetInstructionEncoder = mapEncoder(
541
+ getStructEncoder([
542
+ ["programAddressIndex", getU8Encoder()],
543
+ ["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
544
+ ["data", getBytesEncoder({ size: getShortU16Encoder() })]
545
+ ]),
546
+ // Convert an instruction to have all fields defined
547
+ (instruction) => {
548
+ if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
549
+ return instruction;
550
+ }
551
+ return {
552
+ ...instruction,
553
+ accountIndices: instruction.accountIndices ?? [],
554
+ data: instruction.data ?? new Uint8Array(0)
555
+ };
556
+ }
557
+ );
558
+ }
559
+ return memoizedGetInstructionEncoder;
560
+ }
561
+ var memoizedGetInstructionDecoder;
562
+ function getInstructionDecoder() {
563
+ if (!memoizedGetInstructionDecoder) {
564
+ memoizedGetInstructionDecoder = mapDecoder(
565
+ getStructDecoder([
566
+ ["programAddressIndex", getU8Decoder()],
567
+ ["accountIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
568
+ ["data", getBytesDecoder({ size: getShortU16Decoder() })]
569
+ ]),
570
+ // Convert an instruction to exclude optional fields if they are empty
571
+ (instruction) => {
572
+ if (instruction.accountIndices.length && instruction.data.byteLength) {
573
+ return instruction;
574
+ }
575
+ const { accountIndices, data, ...rest } = instruction;
576
+ return {
577
+ ...rest,
578
+ ...accountIndices.length ? { accountIndices } : null,
579
+ ...data.byteLength ? { data } : null
580
+ };
581
+ }
582
+ );
583
+ }
584
+ return memoizedGetInstructionDecoder;
497
585
  }
498
- function getMessageHeaderCodec() {
499
- return struct(
500
- [
501
- [
502
- "numSignerAccounts",
503
- u8(
504
- __DEV__ ? {
505
- description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
506
- } : void 0
507
- )
508
- ],
509
- [
510
- "numReadonlySignerAccounts",
511
- u8(
512
- __DEV__ ? {
513
- description: "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"
514
- } : void 0
515
- )
516
- ],
517
- [
518
- "numReadonlyNonSignerAccounts",
519
- u8(
520
- __DEV__ ? {
521
- description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
522
- } : void 0
523
- )
524
- ]
525
- ],
526
- __DEV__ ? {
527
- description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
528
- } : void 0
529
- );
586
+ var VERSION_FLAG_MASK = 128;
587
+ function getTransactionVersionEncoder() {
588
+ return createEncoder({
589
+ getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
590
+ maxSize: 1,
591
+ write: (value, bytes, offset) => {
592
+ if (value === "legacy") {
593
+ return offset;
594
+ }
595
+ if (value < 0 || value > 127) {
596
+ throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
597
+ }
598
+ bytes.set([value | VERSION_FLAG_MASK], offset);
599
+ return offset + 1;
600
+ }
601
+ });
530
602
  }
531
- function getInstructionCodec() {
532
- return mapSerializer(
533
- struct([
534
- [
535
- "programAddressIndex",
536
- u8(
537
- __DEV__ ? {
538
- description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
539
- } : void 0
540
- )
541
- ],
542
- [
543
- "accountIndices",
544
- array(
545
- u8({
546
- description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
547
- }),
548
- {
549
- description: __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" : "",
550
- size: shortU16()
551
- }
552
- )
553
- ],
554
- [
555
- "data",
556
- bytes({
557
- description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
558
- size: shortU16()
559
- })
560
- ]
603
+ function getTransactionVersionDecoder() {
604
+ return createDecoder({
605
+ maxSize: 1,
606
+ read: (bytes, offset) => {
607
+ const firstByte = bytes[offset];
608
+ if ((firstByte & VERSION_FLAG_MASK) === 0) {
609
+ return ["legacy", offset];
610
+ } else {
611
+ const version = firstByte ^ VERSION_FLAG_MASK;
612
+ return [version, offset + 1];
613
+ }
614
+ }
615
+ });
616
+ }
617
+
618
+ // src/serializers/message.ts
619
+ function getCompiledMessageLegacyEncoder() {
620
+ return getStructEncoder(getPreludeStructEncoderTuple());
621
+ }
622
+ function getCompiledMessageVersionedEncoder() {
623
+ return mapEncoder(
624
+ getStructEncoder([
625
+ ...getPreludeStructEncoderTuple(),
626
+ ["addressTableLookups", getAddressTableLookupArrayEncoder()]
561
627
  ]),
562
628
  (value) => {
563
- if (value.accountIndices !== void 0 && value.data !== void 0) {
629
+ if (value.version === "legacy") {
564
630
  return value;
565
631
  }
566
632
  return {
567
633
  ...value,
568
- accountIndices: value.accountIndices ?? [],
569
- data: value.data ?? new Uint8Array(0)
634
+ addressTableLookups: value.addressTableLookups ?? []
570
635
  };
636
+ }
637
+ );
638
+ }
639
+ function getPreludeStructEncoderTuple() {
640
+ return [
641
+ ["version", getTransactionVersionEncoder()],
642
+ ["header", getMessageHeaderEncoder()],
643
+ ["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
644
+ ["lifetimeToken", getStringEncoder({ encoding: getBase58Encoder(), size: 32 })],
645
+ ["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
646
+ ];
647
+ }
648
+ function getPreludeStructDecoderTuple() {
649
+ return [
650
+ ["version", getTransactionVersionDecoder()],
651
+ ["header", getMessageHeaderDecoder()],
652
+ ["staticAccounts", getArrayDecoder(getAddressDecoder(), { size: getShortU16Decoder() })],
653
+ ["lifetimeToken", getStringDecoder({ encoding: getBase58Decoder(), size: 32 })],
654
+ ["instructions", getArrayDecoder(getInstructionDecoder(), { size: getShortU16Decoder() })],
655
+ ["addressTableLookups", getAddressTableLookupArrayDecoder()]
656
+ ];
657
+ }
658
+ function getAddressTableLookupArrayEncoder() {
659
+ return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
660
+ }
661
+ function getAddressTableLookupArrayDecoder() {
662
+ return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
663
+ }
664
+ function getCompiledMessageEncoder() {
665
+ return createEncoder({
666
+ getSizeFromValue: (compiledMessage) => {
667
+ if (compiledMessage.version === "legacy") {
668
+ return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
669
+ } else {
670
+ return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
671
+ }
571
672
  },
572
- (value) => {
573
- if (value.accountIndices.length && value.data.byteLength) {
574
- return value;
673
+ write: (compiledMessage, bytes, offset) => {
674
+ if (compiledMessage.version === "legacy") {
675
+ return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
676
+ } else {
677
+ return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
575
678
  }
576
- const { accountIndices, data, ...rest } = value;
577
- return {
578
- ...rest,
579
- ...accountIndices.length ? { accountIndices } : null,
580
- ...data.byteLength ? { data } : null
581
- };
582
679
  }
583
- );
680
+ });
584
681
  }
585
-
586
- // src/serializers/unimplemented.ts
587
- function getError(type, name) {
588
- const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
589
- return new Error(
590
- `No ${type} exists for ${name}. Use \`get${functionSuffix}()\` if you need a ${type}, and \`get${name}Codec()\` if you need to both encode and decode ${name}`
591
- );
682
+ function getCompiledMessageDecoder() {
683
+ return mapDecoder(getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
684
+ if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
685
+ return restOfMessage;
686
+ }
687
+ return { ...restOfMessage, addressTableLookups };
688
+ });
592
689
  }
593
- function getUnimplementedDecoder(name) {
594
- return () => {
595
- throw getError("decoder", name);
596
- };
690
+ function getCompiledMessageCodec() {
691
+ return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
597
692
  }
598
693
 
599
- // src/serializers/transaction-version.ts
600
- var VERSION_FLAG_MASK = 128;
601
- var BASE_CONFIG = {
602
- description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
603
- fixedSize: null,
604
- maxSize: 1
605
- };
606
- function deserialize(bytes3, offset = 0) {
607
- const firstByte = bytes3[offset];
608
- if ((firstByte & VERSION_FLAG_MASK) === 0) {
609
- return ["legacy", offset];
694
+ // src/compile-transaction.ts
695
+ function getCompiledTransaction(transaction) {
696
+ const compiledMessage = compileMessage(transaction);
697
+ let signatures;
698
+ if ("signatures" in transaction) {
699
+ signatures = [];
700
+ for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
701
+ signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
702
+ }
610
703
  } else {
611
- const version = firstByte ^ VERSION_FLAG_MASK;
612
- return [version, offset + 1];
704
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
613
705
  }
706
+ return {
707
+ compiledMessage,
708
+ signatures
709
+ };
614
710
  }
615
- function serialize(value) {
616
- if (value === "legacy") {
617
- return new Uint8Array();
711
+ function getAccountMetas(message) {
712
+ const { header } = message;
713
+ const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
714
+ const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
715
+ const accountMetas = [];
716
+ let accountIndex = 0;
717
+ for (let i = 0; i < numWritableSignerAccounts; i++) {
718
+ accountMetas.push({
719
+ address: message.staticAccounts[accountIndex],
720
+ role: AccountRole.WRITABLE_SIGNER
721
+ });
722
+ accountIndex++;
723
+ }
724
+ for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
725
+ accountMetas.push({
726
+ address: message.staticAccounts[accountIndex],
727
+ role: AccountRole.READONLY_SIGNER
728
+ });
729
+ accountIndex++;
730
+ }
731
+ for (let i = 0; i < numWritableNonSignerAccounts; i++) {
732
+ accountMetas.push({
733
+ address: message.staticAccounts[accountIndex],
734
+ role: AccountRole.WRITABLE
735
+ });
736
+ accountIndex++;
618
737
  }
619
- if (value < 0 || value > 127) {
620
- throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
738
+ for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
739
+ accountMetas.push({
740
+ address: message.staticAccounts[accountIndex],
741
+ role: AccountRole.READONLY
742
+ });
743
+ accountIndex++;
621
744
  }
622
- return new Uint8Array([value | VERSION_FLAG_MASK]);
745
+ return accountMetas;
623
746
  }
624
- function getTransactionVersionCodec() {
747
+ function convertInstruction(instruction, accountMetas) {
748
+ const programAddress = accountMetas[instruction.programAddressIndex]?.address;
749
+ if (!programAddress) {
750
+ throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
751
+ }
752
+ const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
753
+ const { data } = instruction;
625
754
  return {
626
- ...BASE_CONFIG,
627
- deserialize,
628
- serialize
755
+ programAddress,
756
+ ...accounts && accounts.length ? { accounts } : {},
757
+ ...data && data.length ? { data } : {}
629
758
  };
630
759
  }
631
-
632
- // src/serializers/message.ts
633
- var BASE_CONFIG2 = {
634
- description: __DEV__ ? "The wire format of a Solana transaction message" : "",
635
- fixedSize: null,
636
- maxSize: null
637
- };
638
- function serialize2(compiledMessage) {
639
- if (compiledMessage.version === "legacy") {
640
- return struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
760
+ function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
761
+ if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
762
+ return {
763
+ blockhash: messageLifetimeToken,
764
+ lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
765
+ // U64 MAX
766
+ };
641
767
  } else {
642
- return mapSerializer(
643
- struct([
644
- ...getPreludeStructSerializerTuple(),
645
- ["addressTableLookups", getAddressTableLookupsSerializer()]
646
- ]),
647
- (value) => {
648
- if (value.version === "legacy") {
649
- return value;
650
- }
651
- return {
652
- ...value,
653
- addressTableLookups: value.addressTableLookups ?? []
654
- };
655
- }
656
- ).serialize(compiledMessage);
768
+ const nonceAccountAddress = firstInstruction.accounts[0].address;
769
+ assertIsAddress(nonceAccountAddress);
770
+ const nonceAuthorityAddress = firstInstruction.accounts[2].address;
771
+ assertIsAddress(nonceAuthorityAddress);
772
+ return {
773
+ nonce: messageLifetimeToken,
774
+ nonceAccountAddress,
775
+ nonceAuthorityAddress
776
+ };
657
777
  }
658
778
  }
659
- function getPreludeStructSerializerTuple() {
660
- return [
661
- ["version", getTransactionVersionCodec()],
662
- ["header", getMessageHeaderCodec()],
663
- [
664
- "staticAccounts",
665
- array(getAddressCodec(), {
666
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
667
- size: shortU16()
668
- })
669
- ],
670
- [
671
- "lifetimeToken",
672
- string({
673
- description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
674
- encoding: base58,
675
- size: 32
676
- })
677
- ],
678
- [
679
- "instructions",
680
- array(getInstructionCodec(), {
681
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
682
- size: shortU16()
683
- })
684
- ]
685
- ];
686
- }
687
- function getAddressTableLookupsSerializer() {
688
- return array(getAddressTableLookupCodec(), {
689
- ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
690
- size: shortU16()
691
- });
692
- }
693
- function getCompiledMessageEncoder() {
694
- return {
695
- ...BASE_CONFIG2,
696
- deserialize: getUnimplementedDecoder("CompiledMessage"),
697
- serialize: serialize2
698
- };
779
+ function convertSignatures(compiledTransaction) {
780
+ const {
781
+ compiledMessage: { staticAccounts },
782
+ signatures
783
+ } = compiledTransaction;
784
+ return signatures.reduce((acc, sig, index) => {
785
+ const allZeros = sig.every((byte) => byte === 0);
786
+ if (allZeros)
787
+ return acc;
788
+ const address = staticAccounts[index];
789
+ return { ...acc, [address]: sig };
790
+ }, {});
791
+ }
792
+ function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
793
+ const { compiledMessage } = compiledTransaction;
794
+ if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
795
+ throw new Error("Cannot convert transaction with addressTableLookups");
796
+ }
797
+ const feePayer = compiledMessage.staticAccounts[0];
798
+ if (!feePayer)
799
+ throw new Error("No fee payer set in CompiledTransaction");
800
+ const accountMetas = getAccountMetas(compiledMessage);
801
+ const instructions = compiledMessage.instructions.map(
802
+ (compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
803
+ );
804
+ const firstInstruction = instructions[0];
805
+ const lifetimeConstraint = getLifetimeConstraint(
806
+ compiledMessage.lifetimeToken,
807
+ firstInstruction,
808
+ lastValidBlockHeight
809
+ );
810
+ const signatures = convertSignatures(compiledTransaction);
811
+ return pipe(
812
+ createTransaction({ version: compiledMessage.version }),
813
+ (tx) => setTransactionFeePayer(feePayer, tx),
814
+ (tx) => instructions.reduce((acc, instruction) => {
815
+ return appendTransactionInstruction(instruction, acc);
816
+ }, tx),
817
+ (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
818
+ (tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
819
+ );
699
820
  }
700
821
 
701
822
  // src/serializers/transaction.ts
702
- var BASE_CONFIG3 = {
703
- description: __DEV__ ? "The wire format of a Solana transaction" : "",
704
- fixedSize: null,
705
- maxSize: null
706
- };
707
- function serialize3(transaction) {
708
- const compiledTransaction = getCompiledTransaction(transaction);
709
- return struct([
823
+ function getCompiledTransactionEncoder() {
824
+ return getStructEncoder([
825
+ ["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
826
+ ["compiledMessage", getCompiledMessageEncoder()]
827
+ ]);
828
+ }
829
+ function getCompiledTransactionDecoder() {
830
+ return getStructDecoder([
710
831
  [
711
832
  "signatures",
712
- array(bytes({ size: 64 }), {
713
- ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
714
- size: shortU16()
833
+ getArrayDecoder(getBytesDecoder({ size: 64 }), {
834
+ size: getShortU16Decoder()
715
835
  })
716
836
  ],
717
- ["compiledMessage", getCompiledMessageEncoder()]
718
- ]).serialize(compiledTransaction);
837
+ ["compiledMessage", getCompiledMessageDecoder()]
838
+ ]);
719
839
  }
720
840
  function getTransactionEncoder() {
721
- return {
722
- ...BASE_CONFIG3,
723
- deserialize: getUnimplementedDecoder("CompiledMessage"),
724
- serialize: serialize3
725
- };
841
+ return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
726
842
  }
727
- function assertIsTransactionSignature(putativeTransactionSignature) {
728
- try {
729
- if (
730
- // Lowest value (64 bytes of zeroes)
731
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
732
- putativeTransactionSignature.length > 88
733
- ) {
734
- throw new Error("Expected input string to decode to a byte array of length 64.");
735
- }
736
- const bytes3 = base58.serialize(putativeTransactionSignature);
737
- const numBytes = bytes3.byteLength;
738
- if (numBytes !== 64) {
739
- throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
740
- }
741
- } catch (e) {
742
- throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
743
- cause: e
744
- });
745
- }
746
- }
747
- function isTransactionSignature(putativeTransactionSignature) {
748
- if (
749
- // Lowest value (64 bytes of zeroes)
750
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
751
- putativeTransactionSignature.length > 88
752
- ) {
753
- return false;
754
- }
755
- const bytes3 = base58.serialize(putativeTransactionSignature);
756
- const numBytes = bytes3.byteLength;
757
- if (numBytes !== 64) {
758
- return false;
759
- }
760
- return true;
843
+ function getTransactionDecoder(lastValidBlockHeight) {
844
+ return mapDecoder(
845
+ getCompiledTransactionDecoder(),
846
+ (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
847
+ );
761
848
  }
762
- async function getCompiledMessageSignature(message, secretKey) {
763
- const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
764
- const signature = await signBytes(secretKey, wireMessageBytes);
765
- return signature;
849
+ function getTransactionCodec(lastValidBlockHeight) {
850
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
766
851
  }
852
+ var base58Decoder;
767
853
  function getSignatureFromTransaction(transaction) {
768
- const signature = transaction.signatures[transaction.feePayer];
769
- if (!signature) {
854
+ if (!base58Decoder)
855
+ base58Decoder = getBase58Decoder();
856
+ const signatureBytes = transaction.signatures[transaction.feePayer];
857
+ if (!signatureBytes) {
770
858
  throw new Error(
771
859
  "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
772
860
  );
773
861
  }
774
- return signature;
862
+ const transactionSignature = base58Decoder.decode(signatureBytes);
863
+ return transactionSignature;
775
864
  }
776
- async function signTransaction(keyPairs, transaction) {
865
+ async function partiallySignTransaction(keyPairs, transaction) {
777
866
  const compiledMessage = compileMessage(transaction);
778
867
  const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
868
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
779
869
  const publicKeySignaturePairs = await Promise.all(
780
870
  keyPairs.map(
781
- (keyPair) => Promise.all([
782
- getAddressFromPublicKey(keyPair.publicKey),
783
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
784
- ])
871
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
785
872
  )
786
873
  );
787
874
  for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
@@ -794,19 +881,26 @@ async function signTransaction(keyPairs, transaction) {
794
881
  Object.freeze(out);
795
882
  return out;
796
883
  }
797
- function transactionSignature(putativeTransactionSignature) {
798
- assertIsTransactionSignature(putativeTransactionSignature);
799
- return putativeTransactionSignature;
884
+ async function signTransaction(keyPairs, transaction) {
885
+ const out = await partiallySignTransaction(keyPairs, transaction);
886
+ assertTransactionIsFullySigned(out);
887
+ Object.freeze(out);
888
+ return out;
889
+ }
890
+ function assertTransactionIsFullySigned(transaction) {
891
+ const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
892
+ const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
893
+ requiredSigners.forEach((address) => {
894
+ if (!transaction.signatures[address]) {
895
+ throw new Error(`Transaction is missing signature for address \`${address}\``);
896
+ }
897
+ });
800
898
  }
801
-
802
- // src/wire-transaction.ts
803
899
  function getBase64EncodedWireTransaction(transaction) {
804
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
805
- {
806
- return btoa(String.fromCharCode(...wireTransactionBytes));
807
- }
900
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
901
+ return getBase64Decoder().decode(wireTransactionBytes);
808
902
  }
809
903
 
810
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionSignature, createTransaction, getBase64EncodedWireTransaction, getSignatureFromTransaction, getTransactionEncoder, isTransactionSignature, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction, transactionSignature };
904
+ export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionWithBlockhashLifetime, assertTransactionIsFullySigned, compileMessage, createTransaction, getBase64EncodedWireTransaction, getCompiledMessageCodec, getCompiledMessageDecoder, getCompiledMessageEncoder, getSignatureFromTransaction, getTransactionCodec, getTransactionDecoder, getTransactionEncoder, isAdvanceNonceAccountInstruction, partiallySignTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
811
905
  //# sourceMappingURL=out.js.map
812
906
  //# sourceMappingURL=index.browser.js.map