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