@solana/transactions 2.0.0-experimental.fcae73c → 2.0.0-experimental.fe07532

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 (59) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +314 -5
  3. package/dist/index.browser.cjs +571 -244
  4. package/dist/index.browser.cjs.map +1 -1
  5. package/dist/index.browser.js +564 -246
  6. package/dist/index.browser.js.map +1 -1
  7. package/dist/index.development.js +1111 -660
  8. package/dist/index.development.js.map +1 -1
  9. package/dist/index.native.js +564 -246
  10. package/dist/index.native.js.map +1 -1
  11. package/dist/index.node.cjs +571 -244
  12. package/dist/index.node.cjs.map +1 -1
  13. package/dist/index.node.js +566 -246
  14. package/dist/index.node.js.map +1 -1
  15. package/dist/index.production.min.js +20 -11
  16. package/dist/types/accounts.d.ts +1 -1
  17. package/dist/types/blockhash.d.ts +1 -1
  18. package/dist/types/compile-instructions.d.ts +1 -1
  19. package/dist/types/decompile-transaction.d.ts +7 -0
  20. package/dist/types/durable-nonce.d.ts +7 -6
  21. package/dist/types/fee-payer.d.ts +2 -1
  22. package/dist/types/index.d.ts +1 -0
  23. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  24. package/dist/types/serializers/header.d.ts +4 -2
  25. package/dist/types/serializers/index.d.ts +2 -0
  26. package/dist/types/serializers/instruction.d.ts +4 -2
  27. package/dist/types/serializers/message.d.ts +4 -4
  28. package/dist/types/serializers/transaction-version.d.ts +4 -4
  29. package/dist/types/serializers/transaction.d.ts +7 -4
  30. package/dist/types/signatures.d.ts +11 -2
  31. package/dist/types/types.d.ts +7 -0
  32. package/dist/types/wire-transaction.d.ts +2 -2
  33. package/package.json +22 -16
  34. package/dist/types/accounts.d.ts.map +0 -1
  35. package/dist/types/blockhash.d.ts.map +0 -1
  36. package/dist/types/compile-address-table-lookups.d.ts.map +0 -1
  37. package/dist/types/compile-header.d.ts.map +0 -1
  38. package/dist/types/compile-instructions.d.ts.map +0 -1
  39. package/dist/types/compile-lifetime-token.d.ts.map +0 -1
  40. package/dist/types/compile-static-accounts.d.ts.map +0 -1
  41. package/dist/types/compile-transaction.d.ts.map +0 -1
  42. package/dist/types/create-transaction.d.ts.map +0 -1
  43. package/dist/types/durable-nonce.d.ts.map +0 -1
  44. package/dist/types/fee-payer.d.ts.map +0 -1
  45. package/dist/types/index.d.ts.map +0 -1
  46. package/dist/types/instructions.d.ts.map +0 -1
  47. package/dist/types/message.d.ts.map +0 -1
  48. package/dist/types/serializers/address-table-lookup.d.ts.map +0 -1
  49. package/dist/types/serializers/header.d.ts.map +0 -1
  50. package/dist/types/serializers/instruction.d.ts.map +0 -1
  51. package/dist/types/serializers/message.d.ts.map +0 -1
  52. package/dist/types/serializers/transaction-version.d.ts.map +0 -1
  53. package/dist/types/serializers/transaction.d.ts.map +0 -1
  54. package/dist/types/serializers/unimplemented.d.ts +0 -3
  55. package/dist/types/serializers/unimplemented.d.ts.map +0 -1
  56. package/dist/types/signatures.d.ts.map +0 -1
  57. package/dist/types/types.d.ts.map +0 -1
  58. package/dist/types/unsigned-transaction.d.ts.map +0 -1
  59. package/dist/types/wire-transaction.d.ts.map +0 -1
@@ -1,5 +1,9 @@
1
- import { base58, struct, array, bytes, shortU16, mapSerializer, string, u8 } from '@metaplex-foundation/umi-serializers';
2
- import { getBase58EncodedAddressFromPublicKey, getBase58EncodedAddressComparator, getBase58EncodedAddressCodec } from '@solana/addresses';
1
+ import { getBase58Encoder, getBase58Decoder, getStringEncoder, getStringDecoder } from '@solana/codecs-strings';
2
+ import { mapEncoder, mapDecoder, combineCodec } from '@solana/codecs-core';
3
+ import { getStructEncoder, getArrayEncoder, getBytesEncoder, getStructDecoder, getArrayDecoder, getBytesDecoder } from '@solana/codecs-data-structures';
4
+ import { getShortU16Encoder, getShortU16Decoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
5
+ import { getAddressFromPublicKey, getAddressComparator, assertIsAddress, getAddressEncoder, getAddressDecoder } from '@solana/addresses';
6
+ import { pipe } from '@solana/functional';
3
7
  import { signBytes } from '@solana/keys';
4
8
 
5
9
  // ../build-scripts/env-shim.ts
@@ -20,7 +24,10 @@ function getUnsignedTransaction(transaction) {
20
24
  }
21
25
 
22
26
  // src/blockhash.ts
27
+ var base58Encoder;
23
28
  function assertIsBlockhash(putativeBlockhash) {
29
+ if (!base58Encoder)
30
+ base58Encoder = getBase58Encoder();
24
31
  try {
25
32
  if (
26
33
  // Lowest value (32 bytes of zeroes)
@@ -29,8 +36,8 @@ function assertIsBlockhash(putativeBlockhash) {
29
36
  ) {
30
37
  throw new Error("Expected input string to decode to a byte array of length 32.");
31
38
  }
32
- const bytes3 = base58.serialize(putativeBlockhash);
33
- const numBytes = bytes3.byteLength;
39
+ const bytes = base58Encoder.encode(putativeBlockhash);
40
+ const numBytes = bytes.byteLength;
34
41
  if (numBytes !== 32) {
35
42
  throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
36
43
  }
@@ -115,7 +122,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
115
122
  instruction.accounts?.length === 3 && // First account is nonce account address
116
123
  instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
117
124
  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;
125
+ instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
119
126
  }
120
127
  function isAdvanceNonceAccountInstructionData(data) {
121
128
  return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -123,21 +130,38 @@ function isAdvanceNonceAccountInstructionData(data) {
123
130
  function isDurableNonceTransaction(transaction) {
124
131
  return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
125
132
  }
133
+ function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
134
+ return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
135
+ }
126
136
  function setTransactionLifetimeUsingDurableNonce({
127
137
  nonce,
128
138
  nonceAccountAddress,
129
139
  nonceAuthorityAddress
130
140
  }, 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;
141
+ let newInstructions;
142
+ const firstInstruction = transaction.instructions[0];
143
+ if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
144
+ if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
145
+ if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
146
+ return transaction;
147
+ } else {
148
+ newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
149
+ }
150
+ } else {
151
+ newInstructions = [
152
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
153
+ ...transaction.instructions.slice(1)
154
+ ];
155
+ }
156
+ } else {
157
+ newInstructions = [
158
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
159
+ ...transaction.instructions
160
+ ];
134
161
  }
135
162
  const out = {
136
163
  ...getUnsignedTransaction(transaction),
137
- instructions: [
138
- createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
139
- ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
140
- ],
164
+ instructions: newInstructions,
141
165
  lifetimeConstraint: {
142
166
  nonce
143
167
  }
@@ -228,7 +252,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
228
252
  const shouldReplaceEntry = (
229
253
  // Consider using the new LOOKUP_TABLE if its address is different...
230
254
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
231
- (addressComparator || (addressComparator = getBase58EncodedAddressComparator()))(
255
+ (addressComparator || (addressComparator = getAddressComparator()))(
232
256
  accountMeta.lookupTableAddress,
233
257
  entry.lookupTableAddress
234
258
  ) < 0
@@ -334,7 +358,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
334
358
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
335
359
  return leftIsWritable ? -1 : 1;
336
360
  }
337
- addressComparator || (addressComparator = getBase58EncodedAddressComparator());
361
+ addressComparator || (addressComparator = getAddressComparator());
338
362
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
339
363
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
340
364
  } else {
@@ -363,7 +387,7 @@ function getCompiledAddressTableLookups(orderedAccounts) {
363
387
  entry.readableIndices.push(account.addressIndex);
364
388
  }
365
389
  }
366
- return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
390
+ return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
367
391
  lookupTableAddress,
368
392
  ...index[lookupTableAddress]
369
393
  }));
@@ -442,151 +466,317 @@ function compileMessage(transaction) {
442
466
  version: transaction.version
443
467
  };
444
468
  }
445
- function getAddressTableLookupCodec() {
446
- return struct(
447
- [
448
- [
449
- "lookupTableAddress",
450
- getBase58EncodedAddressCodec(
451
- __DEV__ ? {
452
- description: "The address of the address lookup table account from which instruction addresses should be looked up"
453
- } : void 0
454
- )
455
- ],
456
- [
457
- "writableIndices",
458
- array(u8(), {
459
- ...__DEV__ ? {
460
- description: "The indices of the accounts in the lookup table that should be loaded as writeable"
461
- } : null,
462
- size: shortU16()
463
- })
464
- ],
465
- [
466
- "readableIndices",
467
- array(u8(), {
468
- ...__DEV__ ? {
469
- description: "The indices of the accounts in the lookup table that should be loaded as read-only"
470
- } : void 0,
471
- size: shortU16()
472
- })
473
- ]
474
- ],
475
- __DEV__ ? {
476
- 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"
477
- } : void 0
469
+
470
+ // src/compile-transaction.ts
471
+ function getCompiledTransaction(transaction) {
472
+ const compiledMessage = compileMessage(transaction);
473
+ let signatures;
474
+ if ("signatures" in transaction) {
475
+ signatures = [];
476
+ for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
477
+ signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
478
+ }
479
+ } else {
480
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
481
+ }
482
+ return {
483
+ compiledMessage,
484
+ signatures
485
+ };
486
+ }
487
+ function getAccountMetas(message) {
488
+ const { header } = message;
489
+ const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
490
+ const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
491
+ const accountMetas = [];
492
+ let accountIndex = 0;
493
+ for (let i = 0; i < numWritableSignerAccounts; i++) {
494
+ accountMetas.push({
495
+ address: message.staticAccounts[accountIndex],
496
+ role: AccountRole.WRITABLE_SIGNER
497
+ });
498
+ accountIndex++;
499
+ }
500
+ for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
501
+ accountMetas.push({
502
+ address: message.staticAccounts[accountIndex],
503
+ role: AccountRole.READONLY_SIGNER
504
+ });
505
+ accountIndex++;
506
+ }
507
+ for (let i = 0; i < numWritableNonSignerAccounts; i++) {
508
+ accountMetas.push({
509
+ address: message.staticAccounts[accountIndex],
510
+ role: AccountRole.WRITABLE
511
+ });
512
+ accountIndex++;
513
+ }
514
+ for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
515
+ accountMetas.push({
516
+ address: message.staticAccounts[accountIndex],
517
+ role: AccountRole.READONLY
518
+ });
519
+ accountIndex++;
520
+ }
521
+ return accountMetas;
522
+ }
523
+ function convertInstruction(instruction, accountMetas) {
524
+ const programAddress = accountMetas[instruction.programAddressIndex]?.address;
525
+ if (!programAddress) {
526
+ throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
527
+ }
528
+ const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
529
+ const { data } = instruction;
530
+ return {
531
+ programAddress,
532
+ ...accounts && accounts.length ? { accounts } : {},
533
+ ...data && data.length ? { data } : {}
534
+ };
535
+ }
536
+ function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
537
+ if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
538
+ return {
539
+ blockhash: messageLifetimeToken,
540
+ lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
541
+ // U64 MAX
542
+ };
543
+ } else {
544
+ const nonceAccountAddress = firstInstruction.accounts[0].address;
545
+ assertIsAddress(nonceAccountAddress);
546
+ const nonceAuthorityAddress = firstInstruction.accounts[2].address;
547
+ assertIsAddress(nonceAuthorityAddress);
548
+ return {
549
+ nonce: messageLifetimeToken,
550
+ nonceAccountAddress,
551
+ nonceAuthorityAddress
552
+ };
553
+ }
554
+ }
555
+ function convertSignatures(compiledTransaction) {
556
+ const {
557
+ compiledMessage: { staticAccounts },
558
+ signatures
559
+ } = compiledTransaction;
560
+ return signatures.reduce((acc, sig, index) => {
561
+ const allZeros = sig.every((byte) => byte === 0);
562
+ if (allZeros)
563
+ return acc;
564
+ const address = staticAccounts[index];
565
+ return { ...acc, [address]: sig };
566
+ }, {});
567
+ }
568
+ function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
569
+ const { compiledMessage } = compiledTransaction;
570
+ if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
571
+ throw new Error("Cannot convert transaction with addressTableLookups");
572
+ }
573
+ const feePayer = compiledMessage.staticAccounts[0];
574
+ if (!feePayer)
575
+ throw new Error("No fee payer set in CompiledTransaction");
576
+ const accountMetas = getAccountMetas(compiledMessage);
577
+ const instructions = compiledMessage.instructions.map(
578
+ (compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
579
+ );
580
+ const firstInstruction = instructions[0];
581
+ const lifetimeConstraint = getLifetimeConstraint(
582
+ compiledMessage.lifetimeToken,
583
+ firstInstruction,
584
+ lastValidBlockHeight
585
+ );
586
+ const signatures = convertSignatures(compiledTransaction);
587
+ return pipe(
588
+ createTransaction({ version: compiledMessage.version }),
589
+ (tx) => setTransactionFeePayer(feePayer, tx),
590
+ (tx) => instructions.reduce((acc, instruction) => {
591
+ return appendTransactionInstruction(instruction, acc);
592
+ }, tx),
593
+ (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
594
+ (tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
478
595
  );
479
596
  }
480
- function getMessageHeaderCodec() {
481
- return struct(
482
- [
597
+ var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
598
+ var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
599
+ var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
600
+ 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";
601
+ var memoizedAddressTableLookupEncoder;
602
+ function getAddressTableLookupEncoder() {
603
+ if (!memoizedAddressTableLookupEncoder) {
604
+ memoizedAddressTableLookupEncoder = getStructEncoder(
483
605
  [
484
- "numSignerAccounts",
485
- u8(
486
- __DEV__ ? {
487
- description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
488
- } : void 0
489
- )
606
+ ["lookupTableAddress", getAddressEncoder({ description: lookupTableAddressDescription })],
607
+ [
608
+ "writableIndices",
609
+ getArrayEncoder(getU8Encoder(), {
610
+ description: writableIndicesDescription,
611
+ size: getShortU16Encoder()
612
+ })
613
+ ],
614
+ [
615
+ "readableIndices",
616
+ getArrayEncoder(getU8Encoder(), {
617
+ description: readableIndicesDescription,
618
+ size: getShortU16Encoder()
619
+ })
620
+ ]
490
621
  ],
622
+ { description: addressTableLookupDescription }
623
+ );
624
+ }
625
+ return memoizedAddressTableLookupEncoder;
626
+ }
627
+ var memoizedAddressTableLookupDecoder;
628
+ function getAddressTableLookupDecoder() {
629
+ if (!memoizedAddressTableLookupDecoder) {
630
+ memoizedAddressTableLookupDecoder = getStructDecoder(
491
631
  [
492
- "numReadonlySignerAccounts",
493
- u8(
494
- __DEV__ ? {
495
- 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"
496
- } : void 0
497
- )
632
+ ["lookupTableAddress", getAddressDecoder({ description: lookupTableAddressDescription })],
633
+ [
634
+ "writableIndices",
635
+ getArrayDecoder(getU8Decoder(), {
636
+ description: writableIndicesDescription,
637
+ size: getShortU16Decoder()
638
+ })
639
+ ],
640
+ [
641
+ "readableIndices",
642
+ getArrayDecoder(getU8Decoder(), {
643
+ description: readableIndicesDescription,
644
+ size: getShortU16Decoder()
645
+ })
646
+ ]
498
647
  ],
499
- [
500
- "numReadonlyNonSignerAccounts",
501
- u8(
502
- __DEV__ ? {
503
- description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
504
- } : void 0
505
- )
506
- ]
648
+ { description: addressTableLookupDescription }
649
+ );
650
+ }
651
+ return memoizedAddressTableLookupDecoder;
652
+ }
653
+ var memoizedU8Encoder;
654
+ function getMemoizedU8Encoder() {
655
+ if (!memoizedU8Encoder)
656
+ memoizedU8Encoder = getU8Encoder();
657
+ return memoizedU8Encoder;
658
+ }
659
+ function getMemoizedU8EncoderDescription(description) {
660
+ const encoder = getMemoizedU8Encoder();
661
+ return {
662
+ ...encoder,
663
+ description: description ?? encoder.description
664
+ };
665
+ }
666
+ var memoizedU8Decoder;
667
+ function getMemoizedU8Decoder() {
668
+ if (!memoizedU8Decoder)
669
+ memoizedU8Decoder = getU8Decoder();
670
+ return memoizedU8Decoder;
671
+ }
672
+ function getMemoizedU8DecoderDescription(description) {
673
+ const decoder = getMemoizedU8Decoder();
674
+ return {
675
+ ...decoder,
676
+ description: description ?? decoder.description
677
+ };
678
+ }
679
+ 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;
680
+ 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;
681
+ var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
682
+ var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
683
+ function getMessageHeaderEncoder() {
684
+ return getStructEncoder(
685
+ [
686
+ ["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
687
+ ["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
688
+ ["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
507
689
  ],
508
- __DEV__ ? {
509
- description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
510
- } : void 0
690
+ {
691
+ description: messageHeaderDescription
692
+ }
511
693
  );
512
694
  }
513
- function getInstructionCodec() {
514
- return mapSerializer(
515
- struct([
516
- [
517
- "programAddressIndex",
518
- u8(
519
- __DEV__ ? {
520
- description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
521
- } : void 0
522
- )
523
- ],
524
- [
525
- "addressIndices",
526
- array(
527
- u8({
528
- description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
529
- }),
530
- {
531
- 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" : "",
532
- size: shortU16()
533
- }
534
- )
535
- ],
536
- [
537
- "data",
538
- bytes({
539
- description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
540
- size: shortU16()
541
- })
542
- ]
543
- ]),
544
- (value) => {
545
- if (value.addressIndices !== void 0 && value.data !== void 0) {
546
- return value;
547
- }
548
- return {
549
- ...value,
550
- addressIndices: value.addressIndices ?? [],
551
- data: value.data ?? new Uint8Array(0)
552
- };
553
- },
554
- (value) => {
555
- if (value.addressIndices.length && value.data.byteLength) {
556
- return value;
557
- }
558
- const { addressIndices, data, ...rest } = value;
559
- return {
560
- ...rest,
561
- ...addressIndices.length ? { addressIndices } : null,
562
- ...data.byteLength ? { data } : null
563
- };
695
+ function getMessageHeaderDecoder() {
696
+ return getStructDecoder(
697
+ [
698
+ ["numSignerAccounts", getMemoizedU8DecoderDescription(numSignerAccountsDescription)],
699
+ ["numReadonlySignerAccounts", getMemoizedU8DecoderDescription(numReadonlySignerAccountsDescription)],
700
+ ["numReadonlyNonSignerAccounts", getMemoizedU8DecoderDescription(numReadonlyNonSignerAccountsDescription)]
701
+ ],
702
+ {
703
+ description: messageHeaderDescription
564
704
  }
565
705
  );
566
706
  }
567
-
568
- // src/serializers/unimplemented.ts
569
- function getError(type, name) {
570
- const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
571
- return new Error(
572
- `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}`
573
- );
707
+ var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
708
+ var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
709
+ 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";
710
+ var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
711
+ var memoizedGetInstructionEncoder;
712
+ function getInstructionEncoder() {
713
+ if (!memoizedGetInstructionEncoder) {
714
+ memoizedGetInstructionEncoder = mapEncoder(
715
+ getStructEncoder([
716
+ ["programAddressIndex", getU8Encoder({ description: programAddressIndexDescription })],
717
+ [
718
+ "accountIndices",
719
+ getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
720
+ description: accountIndicesDescription,
721
+ size: getShortU16Encoder()
722
+ })
723
+ ],
724
+ ["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
725
+ ]),
726
+ // Convert an instruction to have all fields defined
727
+ (instruction) => {
728
+ if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
729
+ return instruction;
730
+ }
731
+ return {
732
+ ...instruction,
733
+ accountIndices: instruction.accountIndices ?? [],
734
+ data: instruction.data ?? new Uint8Array(0)
735
+ };
736
+ }
737
+ );
738
+ }
739
+ return memoizedGetInstructionEncoder;
574
740
  }
575
- function getUnimplementedDecoder(name) {
576
- return () => {
577
- throw getError("decoder", name);
578
- };
741
+ var memoizedGetInstructionDecoder;
742
+ function getInstructionDecoder() {
743
+ if (!memoizedGetInstructionDecoder) {
744
+ memoizedGetInstructionDecoder = mapDecoder(
745
+ getStructDecoder([
746
+ ["programAddressIndex", getU8Decoder({ description: programAddressIndexDescription })],
747
+ [
748
+ "accountIndices",
749
+ getArrayDecoder(getU8Decoder({ description: accountIndexDescription }), {
750
+ description: accountIndicesDescription,
751
+ size: getShortU16Decoder()
752
+ })
753
+ ],
754
+ ["data", getBytesDecoder({ description: dataDescription, size: getShortU16Decoder() })]
755
+ ]),
756
+ // Convert an instruction to exclude optional fields if they are empty
757
+ (instruction) => {
758
+ if (instruction.accountIndices.length && instruction.data.byteLength) {
759
+ return instruction;
760
+ }
761
+ const { accountIndices, data, ...rest } = instruction;
762
+ return {
763
+ ...rest,
764
+ ...accountIndices.length ? { accountIndices } : null,
765
+ ...data.byteLength ? { data } : null
766
+ };
767
+ }
768
+ );
769
+ }
770
+ return memoizedGetInstructionDecoder;
579
771
  }
580
-
581
- // src/serializers/transaction-version.ts
582
772
  var VERSION_FLAG_MASK = 128;
583
773
  var BASE_CONFIG = {
584
774
  description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
585
775
  fixedSize: null,
586
776
  maxSize: 1
587
777
  };
588
- function deserialize(bytes3, offset = 0) {
589
- const firstByte = bytes3[offset];
778
+ function decode(bytes, offset = 0) {
779
+ const firstByte = bytes[offset];
590
780
  if ((firstByte & VERSION_FLAG_MASK) === 0) {
591
781
  return ["legacy", offset];
592
782
  } else {
@@ -594,7 +784,7 @@ function deserialize(bytes3, offset = 0) {
594
784
  return [version, offset + 1];
595
785
  }
596
786
  }
597
- function serialize(value) {
787
+ function encode(value) {
598
788
  if (value === "legacy") {
599
789
  return new Uint8Array();
600
790
  }
@@ -603,99 +793,259 @@ function serialize(value) {
603
793
  }
604
794
  return new Uint8Array([value | VERSION_FLAG_MASK]);
605
795
  }
606
- function getTransactionVersionCodec() {
796
+ function getTransactionVersionDecoder() {
607
797
  return {
608
798
  ...BASE_CONFIG,
609
- deserialize,
610
- serialize
799
+ decode
800
+ };
801
+ }
802
+ function getTransactionVersionEncoder() {
803
+ return {
804
+ ...BASE_CONFIG,
805
+ encode
611
806
  };
612
807
  }
613
808
 
614
809
  // src/serializers/message.ts
615
- var BASE_CONFIG2 = {
616
- description: __DEV__ ? "The wire format of a Solana transaction message" : "",
617
- fixedSize: null,
618
- maxSize: null
619
- };
620
- function serialize2(compiledMessage) {
621
- if (compiledMessage.version === "legacy") {
622
- return struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
623
- } else {
624
- return mapSerializer(
625
- struct([
626
- ...getPreludeStructSerializerTuple(),
627
- ["addressTableLookups", getAddressTableLookupsSerializer()]
628
- ]),
629
- (value) => {
630
- if (value.version === "legacy") {
631
- return value;
632
- }
633
- return {
634
- ...value,
635
- addressTableLookups: value.addressTableLookups ?? []
636
- };
810
+ var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
811
+ var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
812
+ var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
813
+ var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
814
+ function getCompiledMessageLegacyEncoder() {
815
+ return getStructEncoder(getPreludeStructEncoderTuple());
816
+ }
817
+ function getCompiledMessageVersionedEncoder() {
818
+ return mapEncoder(
819
+ getStructEncoder([
820
+ ...getPreludeStructEncoderTuple(),
821
+ ["addressTableLookups", getAddressTableLookupArrayEncoder()]
822
+ ]),
823
+ (value) => {
824
+ if (value.version === "legacy") {
825
+ return value;
637
826
  }
638
- ).serialize(compiledMessage);
639
- }
827
+ return {
828
+ ...value,
829
+ addressTableLookups: value.addressTableLookups ?? []
830
+ };
831
+ }
832
+ );
640
833
  }
641
- function getPreludeStructSerializerTuple() {
834
+ function getPreludeStructEncoderTuple() {
642
835
  return [
643
- ["version", getTransactionVersionCodec()],
644
- ["header", getMessageHeaderCodec()],
836
+ ["version", getTransactionVersionEncoder()],
837
+ ["header", getMessageHeaderEncoder()],
645
838
  [
646
839
  "staticAccounts",
647
- array(getBase58EncodedAddressCodec(), {
648
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
649
- size: shortU16()
840
+ getArrayEncoder(getAddressEncoder(), {
841
+ description: staticAccountsDescription,
842
+ size: getShortU16Encoder()
650
843
  })
651
844
  ],
652
845
  [
653
846
  "lifetimeToken",
654
- string({
655
- description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
656
- encoding: base58,
847
+ getStringEncoder({
848
+ description: lifetimeTokenDescription,
849
+ encoding: getBase58Encoder(),
657
850
  size: 32
658
851
  })
659
852
  ],
660
853
  [
661
854
  "instructions",
662
- array(getInstructionCodec(), {
663
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
664
- size: shortU16()
855
+ getArrayEncoder(getInstructionEncoder(), {
856
+ description: instructionsDescription,
857
+ size: getShortU16Encoder()
665
858
  })
666
859
  ]
667
860
  ];
668
861
  }
669
- function getAddressTableLookupsSerializer() {
670
- return array(getAddressTableLookupCodec(), {
671
- ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
672
- size: shortU16()
862
+ function getPreludeStructDecoderTuple() {
863
+ return [
864
+ ["version", getTransactionVersionDecoder()],
865
+ ["header", getMessageHeaderDecoder()],
866
+ [
867
+ "staticAccounts",
868
+ getArrayDecoder(getAddressDecoder(), {
869
+ description: staticAccountsDescription,
870
+ size: getShortU16Decoder()
871
+ })
872
+ ],
873
+ [
874
+ "lifetimeToken",
875
+ getStringDecoder({
876
+ description: lifetimeTokenDescription,
877
+ encoding: getBase58Decoder(),
878
+ size: 32
879
+ })
880
+ ],
881
+ [
882
+ "instructions",
883
+ getArrayDecoder(getInstructionDecoder(), {
884
+ description: instructionsDescription,
885
+ size: getShortU16Decoder()
886
+ })
887
+ ],
888
+ ["addressTableLookups", getAddressTableLookupArrayDecoder()]
889
+ ];
890
+ }
891
+ function getAddressTableLookupArrayEncoder() {
892
+ return getArrayEncoder(getAddressTableLookupEncoder(), {
893
+ description: addressTableLookupsDescription,
894
+ size: getShortU16Encoder()
673
895
  });
674
896
  }
897
+ function getAddressTableLookupArrayDecoder() {
898
+ return getArrayDecoder(getAddressTableLookupDecoder(), {
899
+ description: addressTableLookupsDescription,
900
+ size: getShortU16Decoder()
901
+ });
902
+ }
903
+ var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
675
904
  function getCompiledMessageEncoder() {
676
905
  return {
677
- ...BASE_CONFIG2,
678
- deserialize: getUnimplementedDecoder("CompiledMessage"),
679
- serialize: serialize2
906
+ description: messageDescription,
907
+ encode: (compiledMessage) => {
908
+ if (compiledMessage.version === "legacy") {
909
+ return getCompiledMessageLegacyEncoder().encode(compiledMessage);
910
+ } else {
911
+ return getCompiledMessageVersionedEncoder().encode(compiledMessage);
912
+ }
913
+ },
914
+ fixedSize: null,
915
+ maxSize: null
680
916
  };
681
917
  }
918
+ function getCompiledMessageDecoder() {
919
+ return mapDecoder(
920
+ getStructDecoder(getPreludeStructDecoderTuple(), {
921
+ description: messageDescription
922
+ }),
923
+ ({ addressTableLookups, ...restOfMessage }) => {
924
+ if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
925
+ return restOfMessage;
926
+ }
927
+ return { ...restOfMessage, addressTableLookups };
928
+ }
929
+ );
930
+ }
682
931
 
683
- // src/signatures.ts
684
- async function getCompiledMessageSignature(message, secretKey) {
685
- const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
686
- const signature = await signBytes(secretKey, wireMessageBytes);
687
- return signature;
932
+ // src/serializers/transaction.ts
933
+ var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
934
+ var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
935
+ function getCompiledTransactionEncoder() {
936
+ return getStructEncoder(
937
+ [
938
+ [
939
+ "signatures",
940
+ getArrayEncoder(getBytesEncoder({ size: 64 }), {
941
+ description: signaturesDescription,
942
+ size: getShortU16Encoder()
943
+ })
944
+ ],
945
+ ["compiledMessage", getCompiledMessageEncoder()]
946
+ ],
947
+ {
948
+ description: transactionDescription
949
+ }
950
+ );
688
951
  }
689
- async function signTransaction(keyPair, transaction) {
952
+ function getSignatureDecoder() {
953
+ return mapDecoder(getBytesDecoder({ size: 64 }), (bytes) => bytes);
954
+ }
955
+ function getCompiledTransactionDecoder() {
956
+ return getStructDecoder(
957
+ [
958
+ [
959
+ "signatures",
960
+ getArrayDecoder(getSignatureDecoder(), {
961
+ description: signaturesDescription,
962
+ size: getShortU16Decoder()
963
+ })
964
+ ],
965
+ ["compiledMessage", getCompiledMessageDecoder()]
966
+ ],
967
+ {
968
+ description: transactionDescription
969
+ }
970
+ );
971
+ }
972
+ function getTransactionEncoder() {
973
+ return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
974
+ }
975
+ function getTransactionDecoder(lastValidBlockHeight) {
976
+ return mapDecoder(
977
+ getCompiledTransactionDecoder(),
978
+ (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
979
+ );
980
+ }
981
+ function getTransactionCodec(lastValidBlockHeight) {
982
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
983
+ }
984
+ var base58Encoder2;
985
+ var base58Decoder;
986
+ function assertIsTransactionSignature(putativeTransactionSignature) {
987
+ if (!base58Encoder2)
988
+ base58Encoder2 = getBase58Encoder();
989
+ try {
990
+ if (
991
+ // Lowest value (64 bytes of zeroes)
992
+ putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
993
+ putativeTransactionSignature.length > 88
994
+ ) {
995
+ throw new Error("Expected input string to decode to a byte array of length 64.");
996
+ }
997
+ const bytes = base58Encoder2.encode(putativeTransactionSignature);
998
+ const numBytes = bytes.byteLength;
999
+ if (numBytes !== 64) {
1000
+ throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
1001
+ }
1002
+ } catch (e) {
1003
+ throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
1004
+ cause: e
1005
+ });
1006
+ }
1007
+ }
1008
+ function isTransactionSignature(putativeTransactionSignature) {
1009
+ if (!base58Encoder2)
1010
+ base58Encoder2 = getBase58Encoder();
1011
+ if (
1012
+ // Lowest value (64 bytes of zeroes)
1013
+ putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
1014
+ putativeTransactionSignature.length > 88
1015
+ ) {
1016
+ return false;
1017
+ }
1018
+ const bytes = base58Encoder2.encode(putativeTransactionSignature);
1019
+ const numBytes = bytes.byteLength;
1020
+ if (numBytes !== 64) {
1021
+ return false;
1022
+ }
1023
+ return true;
1024
+ }
1025
+ function getSignatureFromTransaction(transaction) {
1026
+ if (!base58Decoder)
1027
+ base58Decoder = getBase58Decoder();
1028
+ const signatureBytes = transaction.signatures[transaction.feePayer];
1029
+ if (!signatureBytes) {
1030
+ throw new Error(
1031
+ "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
1032
+ );
1033
+ }
1034
+ const transactionSignature2 = base58Decoder.decode(signatureBytes)[0];
1035
+ return transactionSignature2;
1036
+ }
1037
+ async function signTransaction(keyPairs, transaction) {
690
1038
  const compiledMessage = compileMessage(transaction);
691
- const [signerPublicKey, signature] = await Promise.all([
692
- getBase58EncodedAddressFromPublicKey(keyPair.publicKey),
693
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
694
- ]);
695
- const nextSignatures = {
696
- ..."signatures" in transaction ? transaction.signatures : null,
697
- ...{ [signerPublicKey]: signature }
698
- };
1039
+ const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
1040
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
1041
+ const publicKeySignaturePairs = await Promise.all(
1042
+ keyPairs.map(
1043
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
1044
+ )
1045
+ );
1046
+ for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
1047
+ nextSignatures[signerPublicKey] = signature;
1048
+ }
699
1049
  const out = {
700
1050
  ...transaction,
701
1051
  signatures: nextSignatures
@@ -703,60 +1053,28 @@ async function signTransaction(keyPair, transaction) {
703
1053
  Object.freeze(out);
704
1054
  return out;
705
1055
  }
706
-
707
- // src/compile-transaction.ts
708
- function getCompiledTransaction(transaction) {
709
- const compiledMessage = compileMessage(transaction);
710
- let signatures;
711
- if ("signatures" in transaction) {
712
- signatures = [];
713
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
714
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
715
- }
716
- } else {
717
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
718
- }
719
- return {
720
- compiledMessage,
721
- signatures
722
- };
723
- }
724
-
725
- // 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 serialize3(transaction) {
732
- const compiledTransaction = getCompiledTransaction(transaction);
733
- return struct([
734
- [
735
- "signatures",
736
- array(bytes({ size: 64 }), {
737
- ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
738
- size: shortU16()
739
- })
740
- ],
741
- ["compiledMessage", getCompiledMessageEncoder()]
742
- ]).serialize(compiledTransaction);
1056
+ function transactionSignature(putativeTransactionSignature) {
1057
+ assertIsTransactionSignature(putativeTransactionSignature);
1058
+ return putativeTransactionSignature;
743
1059
  }
744
- function getTransactionEncoder() {
745
- return {
746
- ...BASE_CONFIG3,
747
- deserialize: getUnimplementedDecoder("CompiledMessage"),
748
- serialize: serialize3
749
- };
1060
+ function assertTransactionIsFullySigned(transaction) {
1061
+ const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
1062
+ const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
1063
+ requiredSigners.forEach((address) => {
1064
+ if (!transaction.signatures[address]) {
1065
+ throw new Error(`Transaction is missing signature for address \`${address}\``);
1066
+ }
1067
+ });
750
1068
  }
751
1069
 
752
1070
  // src/wire-transaction.ts
753
1071
  function getBase64EncodedWireTransaction(transaction) {
754
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
1072
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
755
1073
  {
756
1074
  return btoa(String.fromCharCode(...wireTransactionBytes));
757
1075
  }
758
1076
  }
759
1077
 
760
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, createTransaction, getBase64EncodedWireTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
1078
+ export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionSignature, assertTransactionIsFullySigned, createTransaction, getBase64EncodedWireTransaction, getSignatureFromTransaction, getTransactionCodec, getTransactionDecoder, getTransactionEncoder, isAdvanceNonceAccountInstruction, isTransactionSignature, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction, transactionSignature };
761
1079
  //# sourceMappingURL=out.js.map
762
1080
  //# sourceMappingURL=index.native.js.map