@solana/transactions 2.0.0-experimental.fcae73c → 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 (61) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +272 -5
  3. package/dist/index.browser.cjs +434 -276
  4. package/dist/index.browser.cjs.map +1 -1
  5. package/dist/index.browser.js +422 -280
  6. package/dist/index.browser.js.map +1 -1
  7. package/dist/index.development.js +1015 -714
  8. package/dist/index.development.js.map +1 -1
  9. package/dist/index.native.js +422 -278
  10. package/dist/index.native.js.map +1 -1
  11. package/dist/index.node.cjs +432 -276
  12. package/dist/index.node.cjs.map +1 -1
  13. package/dist/index.node.js +424 -278
  14. package/dist/index.node.js.map +1 -1
  15. package/dist/index.production.min.js +23 -11
  16. package/dist/types/accounts.d.ts +3 -3
  17. package/dist/types/accounts.d.ts.map +1 -1
  18. package/dist/types/blockhash.d.ts +2 -1
  19. package/dist/types/blockhash.d.ts.map +1 -1
  20. package/dist/types/compilable-transaction.d.ts +7 -0
  21. package/dist/types/compilable-transaction.d.ts.map +1 -0
  22. package/dist/types/compile-address-table-lookups.d.ts +2 -2
  23. package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
  24. package/dist/types/compile-instructions.d.ts +1 -1
  25. package/dist/types/compile-static-accounts.d.ts +2 -2
  26. package/dist/types/compile-static-accounts.d.ts.map +1 -1
  27. package/dist/types/compile-transaction.d.ts +5 -6
  28. package/dist/types/compile-transaction.d.ts.map +1 -1
  29. package/dist/types/decompile-transaction.d.ts +5 -0
  30. package/dist/types/decompile-transaction.d.ts.map +1 -0
  31. package/dist/types/durable-nonce.d.ts +10 -9
  32. package/dist/types/durable-nonce.d.ts.map +1 -1
  33. package/dist/types/fee-payer.d.ts +4 -3
  34. package/dist/types/fee-payer.d.ts.map +1 -1
  35. package/dist/types/index.d.ts +3 -0
  36. package/dist/types/index.d.ts.map +1 -1
  37. package/dist/types/message.d.ts +1 -5
  38. package/dist/types/message.d.ts.map +1 -1
  39. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  40. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
  41. package/dist/types/serializers/header.d.ts +4 -2
  42. package/dist/types/serializers/header.d.ts.map +1 -1
  43. package/dist/types/serializers/index.d.ts +3 -0
  44. package/dist/types/serializers/index.d.ts.map +1 -0
  45. package/dist/types/serializers/instruction.d.ts +4 -2
  46. package/dist/types/serializers/instruction.d.ts.map +1 -1
  47. package/dist/types/serializers/message.d.ts +4 -4
  48. package/dist/types/serializers/message.d.ts.map +1 -1
  49. package/dist/types/serializers/transaction-version.d.ts +4 -4
  50. package/dist/types/serializers/transaction-version.d.ts.map +1 -1
  51. package/dist/types/serializers/transaction.d.ts +6 -5
  52. package/dist/types/serializers/transaction.d.ts.map +1 -1
  53. package/dist/types/signatures.d.ts +10 -6
  54. package/dist/types/signatures.d.ts.map +1 -1
  55. package/dist/types/types.d.ts +13 -13
  56. package/dist/types/types.d.ts.map +1 -1
  57. package/dist/types/wire-transaction.d.ts +2 -2
  58. package/dist/types/wire-transaction.d.ts.map +1 -1
  59. package/package.json +22 -16
  60. package/dist/types/serializers/unimplemented.d.ts +0 -3
  61. package/dist/types/serializers/unimplemented.d.ts.map +0 -1
@@ -1,9 +1,12 @@
1
- import { base58, struct, array, bytes, shortU16, mapSerializer, string, u8 } from '@metaplex-foundation/umi-serializers';
2
- import { getBase58EncodedAddressFromPublicKey, getBase58EncodedAddressComparator, getBase58EncodedAddressCodec } from '@solana/addresses';
1
+ import { getBase58Encoder, getBase58Decoder, getBase64Decoder, getStringEncoder, getStringDecoder } from '@solana/codecs-strings';
2
+ import { getAddressFromPublicKey, getAddressComparator, getAddressEncoder, getAddressDecoder, assertIsAddress } from '@solana/addresses';
3
+ import { createEncoder, mapDecoder, combineCodec, mapEncoder, createDecoder } from '@solana/codecs-core';
4
+ import { getStructDecoder, getStructEncoder, getArrayEncoder, getArrayDecoder, getBytesEncoder, getBytesDecoder } from '@solana/codecs-data-structures';
5
+ import { getShortU16Encoder, getShortU16Decoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
6
+ import { pipe } from '@solana/functional';
3
7
  import { signBytes } from '@solana/keys';
4
8
 
5
- // ../build-scripts/env-shim.ts
6
- var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
9
+ // src/blockhash.ts
7
10
 
8
11
  // src/unsigned-transaction.ts
9
12
  function getUnsignedTransaction(transaction) {
@@ -20,7 +23,10 @@ function getUnsignedTransaction(transaction) {
20
23
  }
21
24
 
22
25
  // src/blockhash.ts
26
+ var base58Encoder;
23
27
  function assertIsBlockhash(putativeBlockhash) {
28
+ if (!base58Encoder)
29
+ base58Encoder = getBase58Encoder();
24
30
  try {
25
31
  if (
26
32
  // Lowest value (32 bytes of zeroes)
@@ -29,8 +35,8 @@ function assertIsBlockhash(putativeBlockhash) {
29
35
  ) {
30
36
  throw new Error("Expected input string to decode to a byte array of length 32.");
31
37
  }
32
- const bytes3 = base58.serialize(putativeBlockhash);
33
- const numBytes = bytes3.byteLength;
38
+ const bytes = base58Encoder.encode(putativeBlockhash);
39
+ const numBytes = bytes.byteLength;
34
40
  if (numBytes !== 32) {
35
41
  throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
36
42
  }
@@ -40,6 +46,22 @@ function assertIsBlockhash(putativeBlockhash) {
40
46
  });
41
47
  }
42
48
  }
49
+ function isTransactionWithBlockhashLifetime(transaction) {
50
+ const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
51
+ if (!lifetimeConstraintShapeMatches)
52
+ return false;
53
+ try {
54
+ assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
55
+ return true;
56
+ } catch {
57
+ return false;
58
+ }
59
+ }
60
+ function assertIsTransactionWithBlockhashLifetime(transaction) {
61
+ if (!isTransactionWithBlockhashLifetime(transaction)) {
62
+ throw new Error("Transaction does not have a blockhash lifetime");
63
+ }
64
+ }
43
65
  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
44
66
  if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
45
67
  return transaction;
@@ -115,7 +137,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
115
137
  instruction.accounts?.length === 3 && // First account is nonce account address
116
138
  instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
117
139
  instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
118
- instruction.accounts[2].address != null && instruction.accounts[2].role === AccountRole.READONLY_SIGNER;
140
+ instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
119
141
  }
120
142
  function isAdvanceNonceAccountInstructionData(data) {
121
143
  return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -123,21 +145,38 @@ function isAdvanceNonceAccountInstructionData(data) {
123
145
  function isDurableNonceTransaction(transaction) {
124
146
  return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
125
147
  }
148
+ function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
149
+ return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
150
+ }
126
151
  function setTransactionLifetimeUsingDurableNonce({
127
152
  nonce,
128
153
  nonceAccountAddress,
129
154
  nonceAuthorityAddress
130
155
  }, transaction) {
131
- const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
132
- if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
133
- return transaction;
156
+ let newInstructions;
157
+ const firstInstruction = transaction.instructions[0];
158
+ if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
159
+ if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
160
+ if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
161
+ return transaction;
162
+ } else {
163
+ newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
164
+ }
165
+ } else {
166
+ newInstructions = [
167
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
168
+ ...transaction.instructions.slice(1)
169
+ ];
170
+ }
171
+ } else {
172
+ newInstructions = [
173
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
174
+ ...transaction.instructions
175
+ ];
134
176
  }
135
177
  const out = {
136
178
  ...getUnsignedTransaction(transaction),
137
- instructions: [
138
- createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
139
- ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
140
- ],
179
+ instructions: newInstructions,
141
180
  lifetimeConstraint: {
142
181
  nonce
143
182
  }
@@ -228,7 +267,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
228
267
  const shouldReplaceEntry = (
229
268
  // Consider using the new LOOKUP_TABLE if its address is different...
230
269
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
231
- (addressComparator || (addressComparator = getBase58EncodedAddressComparator()))(
270
+ (addressComparator ||= getAddressComparator())(
232
271
  accountMeta.lookupTableAddress,
233
272
  entry.lookupTableAddress
234
273
  ) < 0
@@ -334,7 +373,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
334
373
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
335
374
  return leftIsWritable ? -1 : 1;
336
375
  }
337
- addressComparator || (addressComparator = getBase58EncodedAddressComparator());
376
+ addressComparator ||= getAddressComparator();
338
377
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
339
378
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
340
379
  } else {
@@ -347,23 +386,22 @@ function getOrderedAccountsFromAddressMap(addressMap) {
347
386
  return orderedAccounts;
348
387
  }
349
388
  function getCompiledAddressTableLookups(orderedAccounts) {
350
- var _a;
351
389
  const index = {};
352
390
  for (const account of orderedAccounts) {
353
391
  if (!("lookupTableAddress" in account)) {
354
392
  continue;
355
393
  }
356
- const entry = index[_a = account.lookupTableAddress] || (index[_a] = {
394
+ const entry = index[account.lookupTableAddress] ||= {
357
395
  readableIndices: [],
358
396
  writableIndices: []
359
- });
397
+ };
360
398
  if (account.role === AccountRole.WRITABLE) {
361
399
  entry.writableIndices.push(account.addressIndex);
362
400
  } else {
363
401
  entry.readableIndices.push(account.addressIndex);
364
402
  }
365
403
  }
366
- return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
404
+ return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
367
405
  lookupTableAddress,
368
406
  ...index[lookupTableAddress]
369
407
  }));
@@ -442,266 +480,215 @@ function compileMessage(transaction) {
442
480
  version: transaction.version
443
481
  };
444
482
  }
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
- ],
483
+ var memoizedAddressTableLookupEncoder;
484
+ function getAddressTableLookupEncoder() {
485
+ if (!memoizedAddressTableLookupEncoder) {
486
+ memoizedAddressTableLookupEncoder = getStructEncoder([
487
+ ["lookupTableAddress", getAddressEncoder()],
456
488
  [
457
489
  "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
- })
490
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
464
491
  ],
465
492
  [
466
493
  "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
- })
494
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
473
495
  ]
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
478
- );
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
+ ]);
479
529
  }
480
- function getMessageHeaderCodec() {
481
- return struct(
482
- [
483
- [
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
- )
490
- ],
491
- [
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
- )
498
- ],
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
- ]
507
- ],
508
- __DEV__ ? {
509
- description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
510
- } : void 0
511
- );
530
+ function getMessageHeaderDecoder() {
531
+ return getStructDecoder([
532
+ ["numSignerAccounts", getMemoizedU8Decoder()],
533
+ ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
534
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
535
+ ]);
512
536
  }
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
- ]
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;
585
+ }
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
+ });
602
+ }
603
+ function getTransactionVersionDecoder() {
604
+ return createDecoder({
605
+ maxSize: 1,
606
+ read: (bytes, offset) => {
607
+ const firstByte = bytes[offset];
608
+ if ((firstByte & VERSION_FLAG_MASK) === 0) {
609
+ return ["legacy", offset];
610
+ } else {
611
+ const version = firstByte ^ VERSION_FLAG_MASK;
612
+ return [version, offset + 1];
613
+ }
614
+ }
615
+ });
616
+ }
617
+
618
+ // src/serializers/message.ts
619
+ function getCompiledMessageLegacyEncoder() {
620
+ return getStructEncoder(getPreludeStructEncoderTuple());
621
+ }
622
+ function getCompiledMessageVersionedEncoder() {
623
+ return mapEncoder(
624
+ getStructEncoder([
625
+ ...getPreludeStructEncoderTuple(),
626
+ ["addressTableLookups", getAddressTableLookupArrayEncoder()]
543
627
  ]),
544
628
  (value) => {
545
- if (value.addressIndices !== void 0 && value.data !== void 0) {
629
+ if (value.version === "legacy") {
546
630
  return value;
547
631
  }
548
632
  return {
549
633
  ...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
634
+ addressTableLookups: value.addressTableLookups ?? []
563
635
  };
564
636
  }
565
637
  );
566
638
  }
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
- );
574
- }
575
- function getUnimplementedDecoder(name) {
576
- return () => {
577
- throw getError("decoder", name);
578
- };
579
- }
580
-
581
- // src/serializers/transaction-version.ts
582
- var VERSION_FLAG_MASK = 128;
583
- var BASE_CONFIG = {
584
- description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
585
- fixedSize: null,
586
- maxSize: 1
587
- };
588
- function deserialize(bytes3, offset = 0) {
589
- const firstByte = bytes3[offset];
590
- if ((firstByte & VERSION_FLAG_MASK) === 0) {
591
- return ["legacy", offset];
592
- } else {
593
- const version = firstByte ^ VERSION_FLAG_MASK;
594
- return [version, offset + 1];
595
- }
596
- }
597
- function serialize(value) {
598
- if (value === "legacy") {
599
- return new Uint8Array();
600
- }
601
- if (value < 0 || value > 127) {
602
- throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
603
- }
604
- return new Uint8Array([value | VERSION_FLAG_MASK]);
605
- }
606
- function getTransactionVersionCodec() {
607
- return {
608
- ...BASE_CONFIG,
609
- deserialize,
610
- serialize
611
- };
612
- }
613
-
614
- // 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
- };
637
- }
638
- ).serialize(compiledMessage);
639
- }
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
+ ];
640
647
  }
641
- function getPreludeStructSerializerTuple() {
648
+ function getPreludeStructDecoderTuple() {
642
649
  return [
643
- ["version", getTransactionVersionCodec()],
644
- ["header", getMessageHeaderCodec()],
645
- [
646
- "staticAccounts",
647
- array(getBase58EncodedAddressCodec(), {
648
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
649
- size: shortU16()
650
- })
651
- ],
652
- [
653
- "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,
657
- size: 32
658
- })
659
- ],
660
- [
661
- "instructions",
662
- array(getInstructionCodec(), {
663
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
664
- size: shortU16()
665
- })
666
- ]
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()]
667
656
  ];
668
657
  }
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()
673
- });
658
+ function getAddressTableLookupArrayEncoder() {
659
+ return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
660
+ }
661
+ function getAddressTableLookupArrayDecoder() {
662
+ return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
674
663
  }
675
664
  function getCompiledMessageEncoder() {
676
- return {
677
- ...BASE_CONFIG2,
678
- deserialize: getUnimplementedDecoder("CompiledMessage"),
679
- serialize: serialize2
680
- };
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
+ });
681
681
  }
682
-
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;
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
+ });
688
689
  }
689
- async function signTransaction(keyPair, transaction) {
690
- 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
- };
699
- const out = {
700
- ...transaction,
701
- signatures: nextSignatures
702
- };
703
- Object.freeze(out);
704
- return out;
690
+ function getCompiledMessageCodec() {
691
+ return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
705
692
  }
706
693
 
707
694
  // src/compile-transaction.ts
@@ -721,42 +708,197 @@ function getCompiledTransaction(transaction) {
721
708
  signatures
722
709
  };
723
710
  }
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;
746
+ }
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;
754
+ return {
755
+ programAddress,
756
+ ...accounts && accounts.length ? { accounts } : {},
757
+ ...data && data.length ? { data } : {}
758
+ };
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 serialize3(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: serialize3
841
+ return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
842
+ }
843
+ function getTransactionDecoder(lastValidBlockHeight) {
844
+ return mapDecoder(
845
+ getCompiledTransactionDecoder(),
846
+ (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
847
+ );
848
+ }
849
+ function getTransactionCodec(lastValidBlockHeight) {
850
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
851
+ }
852
+ var base58Decoder;
853
+ function getSignatureFromTransaction(transaction) {
854
+ if (!base58Decoder)
855
+ base58Decoder = getBase58Decoder();
856
+ const signatureBytes = transaction.signatures[transaction.feePayer];
857
+ if (!signatureBytes) {
858
+ throw new Error(
859
+ "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
860
+ );
861
+ }
862
+ const transactionSignature = base58Decoder.decode(signatureBytes);
863
+ return transactionSignature;
864
+ }
865
+ async function partiallySignTransaction(keyPairs, transaction) {
866
+ const compiledMessage = compileMessage(transaction);
867
+ const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
868
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
869
+ const publicKeySignaturePairs = await Promise.all(
870
+ keyPairs.map(
871
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
872
+ )
873
+ );
874
+ for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
875
+ nextSignatures[signerPublicKey] = signature;
876
+ }
877
+ const out = {
878
+ ...transaction,
879
+ signatures: nextSignatures
749
880
  };
881
+ Object.freeze(out);
882
+ return out;
883
+ }
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
+ });
750
898
  }
751
-
752
- // src/wire-transaction.ts
753
899
  function getBase64EncodedWireTransaction(transaction) {
754
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
755
- {
756
- return btoa(String.fromCharCode(...wireTransactionBytes));
757
- }
900
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
901
+ return getBase64Decoder().decode(wireTransactionBytes);
758
902
  }
759
903
 
760
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, createTransaction, getBase64EncodedWireTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
761
- //# sourceMappingURL=out.js.map
762
- //# 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 };