@solana/transactions 2.0.0-experimental.fc4e943 → 2.0.0-experimental.fcff844

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