@solana/transactions 2.0.0-experimental.659134e → 2.0.0-experimental.69a8ad2

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 (48) hide show
  1. package/LICENSE +1 -1
  2. package/dist/index.browser.cjs +255 -245
  3. package/dist/index.browser.cjs.map +1 -1
  4. package/dist/index.browser.js +252 -250
  5. package/dist/index.browser.js.map +1 -1
  6. package/dist/index.development.js +769 -718
  7. package/dist/index.development.js.map +1 -1
  8. package/dist/index.native.js +252 -250
  9. package/dist/index.native.js.map +1 -1
  10. package/dist/index.node.cjs +255 -247
  11. package/dist/index.node.cjs.map +1 -1
  12. package/dist/index.node.js +252 -248
  13. package/dist/index.node.js.map +1 -1
  14. package/dist/index.production.min.js +17 -11
  15. package/dist/types/accounts.d.ts +1 -1
  16. package/dist/types/accounts.d.ts.map +1 -1
  17. package/dist/types/blockhash.d.ts +1 -1
  18. package/dist/types/blockhash.d.ts.map +1 -1
  19. package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
  20. package/dist/types/durable-nonce.d.ts +5 -3
  21. package/dist/types/durable-nonce.d.ts.map +1 -1
  22. package/dist/types/fee-payer.d.ts +2 -1
  23. package/dist/types/fee-payer.d.ts.map +1 -1
  24. package/dist/types/index.d.ts +1 -0
  25. package/dist/types/index.d.ts.map +1 -1
  26. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  27. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
  28. package/dist/types/serializers/header.d.ts +4 -2
  29. package/dist/types/serializers/header.d.ts.map +1 -1
  30. package/dist/types/serializers/index.d.ts +2 -0
  31. package/dist/types/serializers/index.d.ts.map +1 -0
  32. package/dist/types/serializers/instruction.d.ts +4 -2
  33. package/dist/types/serializers/instruction.d.ts.map +1 -1
  34. package/dist/types/serializers/message.d.ts +4 -4
  35. package/dist/types/serializers/message.d.ts.map +1 -1
  36. package/dist/types/serializers/transaction-version.d.ts +4 -4
  37. package/dist/types/serializers/transaction-version.d.ts.map +1 -1
  38. package/dist/types/serializers/transaction.d.ts +5 -4
  39. package/dist/types/serializers/transaction.d.ts.map +1 -1
  40. package/dist/types/signatures.d.ts +10 -2
  41. package/dist/types/signatures.d.ts.map +1 -1
  42. package/dist/types/types.d.ts +7 -0
  43. package/dist/types/types.d.ts.map +1 -1
  44. package/dist/types/wire-transaction.d.ts +2 -2
  45. package/dist/types/wire-transaction.d.ts.map +1 -1
  46. package/package.json +21 -15
  47. package/dist/types/serializers/unimplemented.d.ts +0 -3
  48. package/dist/types/serializers/unimplemented.d.ts.map +0 -1
package/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2018 Solana Labs, Inc
1
+ Copyright (c) 2023 Solana Labs, Inc
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
@@ -1,7 +1,11 @@
1
1
  'use strict';
2
2
 
3
3
  var umiSerializers = require('@metaplex-foundation/umi-serializers');
4
+ var codecsCore = require('@solana/codecs-core');
5
+ var codecsDataStructures = require('@solana/codecs-data-structures');
6
+ var codecsNumbers = require('@solana/codecs-numbers');
4
7
  var addresses = require('@solana/addresses');
8
+ var codecsStrings = require('@solana/codecs-strings');
5
9
  var keys = require('@solana/keys');
6
10
 
7
11
  // ../build-scripts/env-shim.ts
@@ -31,8 +35,8 @@ function assertIsBlockhash(putativeBlockhash) {
31
35
  ) {
32
36
  throw new Error("Expected input string to decode to a byte array of length 32.");
33
37
  }
34
- const bytes3 = umiSerializers.base58.serialize(putativeBlockhash);
35
- const numBytes = bytes3.byteLength;
38
+ const bytes = umiSerializers.base58.serialize(putativeBlockhash);
39
+ const numBytes = bytes.byteLength;
36
40
  if (numBytes !== 32) {
37
41
  throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
38
42
  }
@@ -230,7 +234,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
230
234
  const shouldReplaceEntry = (
231
235
  // Consider using the new LOOKUP_TABLE if its address is different...
232
236
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
233
- (addressComparator || (addressComparator = addresses.getBase58EncodedAddressComparator()))(
237
+ (addressComparator || (addressComparator = addresses.getAddressComparator()))(
234
238
  accountMeta.lookupTableAddress,
235
239
  entry.lookupTableAddress
236
240
  ) < 0
@@ -336,7 +340,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
336
340
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
337
341
  return leftIsWritable ? -1 : 1;
338
342
  }
339
- addressComparator || (addressComparator = addresses.getBase58EncodedAddressComparator());
343
+ addressComparator || (addressComparator = addresses.getAddressComparator());
340
344
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
341
345
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
342
346
  } else {
@@ -365,7 +369,7 @@ function getCompiledAddressTableLookups(orderedAccounts) {
365
369
  entry.readableIndices.push(account.addressIndex);
366
370
  }
367
371
  }
368
- return Object.keys(index).sort(addresses.getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
372
+ return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
369
373
  lookupTableAddress,
370
374
  ...index[lookupTableAddress]
371
375
  }));
@@ -444,159 +448,124 @@ function compileMessage(transaction) {
444
448
  version: transaction.version
445
449
  };
446
450
  }
447
- function getAddressTableLookupCodec() {
448
- return umiSerializers.struct(
449
- [
450
- [
451
- "lookupTableAddress",
452
- addresses.getBase58EncodedAddressCodec(
453
- __DEV__ ? {
454
- description: "The address of the address lookup table account from which instruction addresses should be looked up"
455
- } : void 0
456
- )
457
- ],
451
+
452
+ // src/compile-transaction.ts
453
+ function getCompiledTransaction(transaction) {
454
+ const compiledMessage = compileMessage(transaction);
455
+ let signatures;
456
+ if ("signatures" in transaction) {
457
+ signatures = [];
458
+ for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
459
+ signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
460
+ }
461
+ } else {
462
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
463
+ }
464
+ return {
465
+ compiledMessage,
466
+ signatures
467
+ };
468
+ }
469
+ var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
470
+ var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
471
+ var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
472
+ 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";
473
+ var memoizedAddressTableLookupEncoder;
474
+ function getAddressTableLookupEncoder() {
475
+ if (!memoizedAddressTableLookupEncoder) {
476
+ memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder(
458
477
  [
459
- "writableIndices",
460
- umiSerializers.array(umiSerializers.u8(), {
461
- ...__DEV__ ? {
462
- description: "The indices of the accounts in the lookup table that should be loaded as writeable"
463
- } : null,
464
- size: umiSerializers.shortU16()
465
- })
478
+ ["lookupTableAddress", addresses.getAddressEncoder({ description: lookupTableAddressDescription })],
479
+ [
480
+ "writableIndices",
481
+ codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
482
+ description: writableIndicesDescription,
483
+ size: codecsNumbers.getShortU16Encoder()
484
+ })
485
+ ],
486
+ [
487
+ "readableIndices",
488
+ codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
489
+ description: readableIndicesDescription,
490
+ size: codecsNumbers.getShortU16Encoder()
491
+ })
492
+ ]
466
493
  ],
467
- [
468
- "readableIndices",
469
- umiSerializers.array(umiSerializers.u8(), {
470
- ...__DEV__ ? {
471
- description: "The indices of the accounts in the lookup table that should be loaded as read-only"
472
- } : void 0,
473
- size: umiSerializers.shortU16()
474
- })
475
- ]
476
- ],
477
- __DEV__ ? {
478
- 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"
479
- } : void 0
480
- );
494
+ { description: addressTableLookupDescription }
495
+ );
496
+ }
497
+ return memoizedAddressTableLookupEncoder;
498
+ }
499
+ var memoizedU8Encoder;
500
+ function getMemoizedU8Encoder() {
501
+ if (!memoizedU8Encoder)
502
+ memoizedU8Encoder = codecsNumbers.getU8Encoder();
503
+ return memoizedU8Encoder;
481
504
  }
482
- function getMessageHeaderCodec() {
483
- return umiSerializers.struct(
505
+ function getMemoizedU8EncoderDescription(description) {
506
+ const encoder = getMemoizedU8Encoder();
507
+ return {
508
+ ...encoder,
509
+ description: description ?? encoder.description
510
+ };
511
+ }
512
+ 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;
513
+ 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;
514
+ var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
515
+ var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
516
+ function getMessageHeaderEncoder() {
517
+ return codecsDataStructures.getStructEncoder(
484
518
  [
485
- [
486
- "numSignerAccounts",
487
- umiSerializers.u8(
488
- __DEV__ ? {
489
- description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
490
- } : void 0
491
- )
492
- ],
493
- [
494
- "numReadonlySignerAccounts",
495
- umiSerializers.u8(
496
- __DEV__ ? {
497
- 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"
498
- } : void 0
499
- )
500
- ],
501
- [
502
- "numReadonlyNonSignerAccounts",
503
- umiSerializers.u8(
504
- __DEV__ ? {
505
- description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
506
- } : void 0
507
- )
508
- ]
519
+ ["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
520
+ ["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
521
+ ["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
509
522
  ],
510
- __DEV__ ? {
511
- description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
512
- } : void 0
513
- );
514
- }
515
- function getInstructionCodec() {
516
- return umiSerializers.mapSerializer(
517
- umiSerializers.struct([
518
- [
519
- "programAddressIndex",
520
- umiSerializers.u8(
521
- __DEV__ ? {
522
- description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
523
- } : void 0
524
- )
525
- ],
526
- [
527
- "accountIndices",
528
- umiSerializers.array(
529
- umiSerializers.u8({
530
- description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
531
- }),
532
- {
533
- 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" : "",
534
- size: umiSerializers.shortU16()
535
- }
536
- )
537
- ],
538
- [
539
- "data",
540
- umiSerializers.bytes({
541
- description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
542
- size: umiSerializers.shortU16()
543
- })
544
- ]
545
- ]),
546
- (value) => {
547
- if (value.accountIndices !== void 0 && value.data !== void 0) {
548
- return value;
549
- }
550
- return {
551
- ...value,
552
- accountIndices: value.accountIndices ?? [],
553
- data: value.data ?? new Uint8Array(0)
554
- };
555
- },
556
- (value) => {
557
- if (value.accountIndices.length && value.data.byteLength) {
558
- return value;
559
- }
560
- const { accountIndices, data, ...rest } = value;
561
- return {
562
- ...rest,
563
- ...accountIndices.length ? { accountIndices } : null,
564
- ...data.byteLength ? { data } : null
565
- };
523
+ {
524
+ description: messageHeaderDescription
566
525
  }
567
526
  );
568
527
  }
569
-
570
- // src/serializers/unimplemented.ts
571
- function getError(type, name) {
572
- const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
573
- return new Error(
574
- `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}`
575
- );
576
- }
577
- function getUnimplementedDecoder(name) {
578
- return () => {
579
- throw getError("decoder", name);
580
- };
528
+ var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
529
+ var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
530
+ 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";
531
+ var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
532
+ var memoizedGetInstructionEncoder;
533
+ function getInstructionEncoder() {
534
+ if (!memoizedGetInstructionEncoder) {
535
+ memoizedGetInstructionEncoder = codecsCore.mapEncoder(
536
+ codecsDataStructures.getStructEncoder([
537
+ ["programAddressIndex", codecsNumbers.getU8Encoder({ description: programAddressIndexDescription })],
538
+ [
539
+ "accountIndices",
540
+ codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder({ description: accountIndexDescription }), {
541
+ description: accountIndicesDescription,
542
+ size: codecsNumbers.getShortU16Encoder()
543
+ })
544
+ ],
545
+ ["data", codecsDataStructures.getBytesEncoder({ description: dataDescription, size: codecsNumbers.getShortU16Encoder() })]
546
+ ]),
547
+ // Convert an instruction to have all fields defined
548
+ (instruction) => {
549
+ if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
550
+ return instruction;
551
+ }
552
+ return {
553
+ ...instruction,
554
+ accountIndices: instruction.accountIndices ?? [],
555
+ data: instruction.data ?? new Uint8Array(0)
556
+ };
557
+ }
558
+ );
559
+ }
560
+ return memoizedGetInstructionEncoder;
581
561
  }
582
-
583
- // src/serializers/transaction-version.ts
584
562
  var VERSION_FLAG_MASK = 128;
585
563
  var BASE_CONFIG = {
586
564
  description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
587
565
  fixedSize: null,
588
566
  maxSize: 1
589
567
  };
590
- function deserialize(bytes3, offset = 0) {
591
- const firstByte = bytes3[offset];
592
- if ((firstByte & VERSION_FLAG_MASK) === 0) {
593
- return ["legacy", offset];
594
- } else {
595
- const version = firstByte ^ VERSION_FLAG_MASK;
596
- return [version, offset + 1];
597
- }
598
- }
599
- function serialize(value) {
568
+ function encode(value) {
600
569
  if (value === "legacy") {
601
570
  return new Uint8Array();
602
571
  }
@@ -605,99 +574,175 @@ function serialize(value) {
605
574
  }
606
575
  return new Uint8Array([value | VERSION_FLAG_MASK]);
607
576
  }
608
- function getTransactionVersionCodec() {
577
+ function getTransactionVersionEncoder() {
609
578
  return {
610
579
  ...BASE_CONFIG,
611
- deserialize,
612
- serialize
580
+ encode
613
581
  };
614
582
  }
615
583
 
616
584
  // src/serializers/message.ts
617
- var BASE_CONFIG2 = {
618
- description: __DEV__ ? "The wire format of a Solana transaction message" : "",
619
- fixedSize: null,
620
- maxSize: null
621
- };
622
- function serialize2(compiledMessage) {
623
- if (compiledMessage.version === "legacy") {
624
- return umiSerializers.struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
625
- } else {
626
- return umiSerializers.mapSerializer(
627
- umiSerializers.struct([
628
- ...getPreludeStructSerializerTuple(),
629
- ["addressTableLookups", getAddressTableLookupsSerializer()]
630
- ]),
631
- (value) => {
632
- if (value.version === "legacy") {
633
- return value;
634
- }
635
- return {
636
- ...value,
637
- addressTableLookups: value.addressTableLookups ?? []
638
- };
585
+ var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
586
+ var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
587
+ var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
588
+ var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
589
+ function getCompiledMessageLegacyEncoder() {
590
+ return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
591
+ }
592
+ function getCompiledMessageVersionedEncoder() {
593
+ return codecsCore.mapEncoder(
594
+ codecsDataStructures.getStructEncoder([
595
+ ...getPreludeStructEncoderTuple(),
596
+ ["addressTableLookups", getAddressTableLookupArrayEncoder()]
597
+ ]),
598
+ (value) => {
599
+ if (value.version === "legacy") {
600
+ return value;
639
601
  }
640
- ).serialize(compiledMessage);
641
- }
602
+ return {
603
+ ...value,
604
+ addressTableLookups: value.addressTableLookups ?? []
605
+ };
606
+ }
607
+ );
642
608
  }
643
- function getPreludeStructSerializerTuple() {
609
+ function getPreludeStructEncoderTuple() {
644
610
  return [
645
- ["version", getTransactionVersionCodec()],
646
- ["header", getMessageHeaderCodec()],
611
+ ["version", getTransactionVersionEncoder()],
612
+ ["header", getMessageHeaderEncoder()],
647
613
  [
648
614
  "staticAccounts",
649
- umiSerializers.array(addresses.getBase58EncodedAddressCodec(), {
650
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
651
- size: umiSerializers.shortU16()
615
+ codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), {
616
+ description: staticAccountsDescription,
617
+ size: codecsNumbers.getShortU16Encoder()
652
618
  })
653
619
  ],
654
620
  [
655
621
  "lifetimeToken",
656
- umiSerializers.string({
657
- description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
658
- encoding: umiSerializers.base58,
622
+ codecsStrings.getStringEncoder({
623
+ description: lifetimeTokenDescription,
624
+ encoding: codecsStrings.getBase58Encoder(),
659
625
  size: 32
660
626
  })
661
627
  ],
662
628
  [
663
629
  "instructions",
664
- umiSerializers.array(getInstructionCodec(), {
665
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
666
- size: umiSerializers.shortU16()
630
+ codecsDataStructures.getArrayEncoder(getInstructionEncoder(), {
631
+ description: instructionsDescription,
632
+ size: codecsNumbers.getShortU16Encoder()
667
633
  })
668
634
  ]
669
635
  ];
670
636
  }
671
- function getAddressTableLookupsSerializer() {
672
- return umiSerializers.array(getAddressTableLookupCodec(), {
673
- ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
674
- size: umiSerializers.shortU16()
637
+ function getAddressTableLookupArrayEncoder() {
638
+ return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), {
639
+ description: addressTableLookupsDescription,
640
+ size: codecsNumbers.getShortU16Encoder()
675
641
  });
676
642
  }
643
+ var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
677
644
  function getCompiledMessageEncoder() {
678
645
  return {
679
- ...BASE_CONFIG2,
680
- deserialize: getUnimplementedDecoder("CompiledMessage"),
681
- serialize: serialize2
646
+ description: messageDescription,
647
+ encode: (compiledMessage) => {
648
+ if (compiledMessage.version === "legacy") {
649
+ return getCompiledMessageLegacyEncoder().encode(compiledMessage);
650
+ } else {
651
+ return getCompiledMessageVersionedEncoder().encode(compiledMessage);
652
+ }
653
+ },
654
+ fixedSize: null,
655
+ maxSize: null
682
656
  };
683
657
  }
684
658
 
685
- // src/signatures.ts
659
+ // src/serializers/transaction.ts
660
+ var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
661
+ var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
662
+ function getCompiledTransactionEncoder() {
663
+ return codecsDataStructures.getStructEncoder(
664
+ [
665
+ [
666
+ "signatures",
667
+ codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), {
668
+ description: signaturesDescription,
669
+ size: codecsNumbers.getShortU16Encoder()
670
+ })
671
+ ],
672
+ ["compiledMessage", getCompiledMessageEncoder()]
673
+ ],
674
+ {
675
+ description: transactionDescription
676
+ }
677
+ );
678
+ }
679
+ function getTransactionEncoder() {
680
+ return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
681
+ }
682
+ function assertIsTransactionSignature(putativeTransactionSignature) {
683
+ try {
684
+ if (
685
+ // Lowest value (64 bytes of zeroes)
686
+ putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
687
+ putativeTransactionSignature.length > 88
688
+ ) {
689
+ throw new Error("Expected input string to decode to a byte array of length 64.");
690
+ }
691
+ const bytes = umiSerializers.base58.serialize(putativeTransactionSignature);
692
+ const numBytes = bytes.byteLength;
693
+ if (numBytes !== 64) {
694
+ throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
695
+ }
696
+ } catch (e) {
697
+ throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
698
+ cause: e
699
+ });
700
+ }
701
+ }
702
+ function isTransactionSignature(putativeTransactionSignature) {
703
+ if (
704
+ // Lowest value (64 bytes of zeroes)
705
+ putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
706
+ putativeTransactionSignature.length > 88
707
+ ) {
708
+ return false;
709
+ }
710
+ const bytes = umiSerializers.base58.serialize(putativeTransactionSignature);
711
+ const numBytes = bytes.byteLength;
712
+ if (numBytes !== 64) {
713
+ return false;
714
+ }
715
+ return true;
716
+ }
686
717
  async function getCompiledMessageSignature(message, secretKey) {
687
- const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
718
+ const wireMessageBytes = getCompiledMessageEncoder().encode(message);
688
719
  const signature = await keys.signBytes(secretKey, wireMessageBytes);
689
720
  return signature;
690
721
  }
691
- async function signTransaction(keyPair, transaction) {
722
+ function getSignatureFromTransaction(transaction) {
723
+ const signatureBytes = transaction.signatures[transaction.feePayer];
724
+ if (!signatureBytes) {
725
+ throw new Error(
726
+ "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
727
+ );
728
+ }
729
+ const transactionSignature2 = umiSerializers.base58.deserialize(signatureBytes)[0];
730
+ return transactionSignature2;
731
+ }
732
+ async function signTransaction(keyPairs, transaction) {
692
733
  const compiledMessage = compileMessage(transaction);
693
- const [signerPublicKey, signature] = await Promise.all([
694
- addresses.getBase58EncodedAddressFromPublicKey(keyPair.publicKey),
695
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
696
- ]);
697
- const nextSignatures = {
698
- ..."signatures" in transaction ? transaction.signatures : null,
699
- ...{ [signerPublicKey]: signature }
700
- };
734
+ const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
735
+ const publicKeySignaturePairs = await Promise.all(
736
+ keyPairs.map(
737
+ (keyPair) => Promise.all([
738
+ addresses.getAddressFromPublicKey(keyPair.publicKey),
739
+ getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
740
+ ])
741
+ )
742
+ );
743
+ for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
744
+ nextSignatures[signerPublicKey] = signature;
745
+ }
701
746
  const out = {
702
747
  ...transaction,
703
748
  signatures: nextSignatures
@@ -705,55 +750,14 @@ async function signTransaction(keyPair, transaction) {
705
750
  Object.freeze(out);
706
751
  return out;
707
752
  }
708
-
709
- // src/compile-transaction.ts
710
- function getCompiledTransaction(transaction) {
711
- const compiledMessage = compileMessage(transaction);
712
- let signatures;
713
- if ("signatures" in transaction) {
714
- signatures = [];
715
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
716
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
717
- }
718
- } else {
719
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
720
- }
721
- return {
722
- compiledMessage,
723
- signatures
724
- };
725
- }
726
-
727
- // src/serializers/transaction.ts
728
- var BASE_CONFIG3 = {
729
- description: __DEV__ ? "The wire format of a Solana transaction" : "",
730
- fixedSize: null,
731
- maxSize: null
732
- };
733
- function serialize3(transaction) {
734
- const compiledTransaction = getCompiledTransaction(transaction);
735
- return umiSerializers.struct([
736
- [
737
- "signatures",
738
- umiSerializers.array(umiSerializers.bytes({ size: 64 }), {
739
- ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
740
- size: umiSerializers.shortU16()
741
- })
742
- ],
743
- ["compiledMessage", getCompiledMessageEncoder()]
744
- ]).serialize(compiledTransaction);
745
- }
746
- function getTransactionEncoder() {
747
- return {
748
- ...BASE_CONFIG3,
749
- deserialize: getUnimplementedDecoder("CompiledMessage"),
750
- serialize: serialize3
751
- };
753
+ function transactionSignature(putativeTransactionSignature) {
754
+ assertIsTransactionSignature(putativeTransactionSignature);
755
+ return putativeTransactionSignature;
752
756
  }
753
757
 
754
758
  // src/wire-transaction.ts
755
759
  function getBase64EncodedWireTransaction(transaction) {
756
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
760
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
757
761
  {
758
762
  return btoa(String.fromCharCode(...wireTransactionBytes));
759
763
  }
@@ -762,10 +766,16 @@ function getBase64EncodedWireTransaction(transaction) {
762
766
  exports.appendTransactionInstruction = appendTransactionInstruction;
763
767
  exports.assertIsBlockhash = assertIsBlockhash;
764
768
  exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
769
+ exports.assertIsTransactionSignature = assertIsTransactionSignature;
765
770
  exports.createTransaction = createTransaction;
766
771
  exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
772
+ exports.getSignatureFromTransaction = getSignatureFromTransaction;
773
+ exports.getTransactionEncoder = getTransactionEncoder;
774
+ exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
775
+ exports.isTransactionSignature = isTransactionSignature;
767
776
  exports.prependTransactionInstruction = prependTransactionInstruction;
768
777
  exports.setTransactionFeePayer = setTransactionFeePayer;
769
778
  exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
770
779
  exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
771
780
  exports.signTransaction = signTransaction;
781
+ exports.transactionSignature = transactionSignature;