@solana/transactions 2.0.0-experimental.2a97655 → 2.0.0-experimental.2e4b8c7

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