@solana/transactions 2.0.0-experimental.ab8b149 → 2.0.0-experimental.b153bb7
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 +272 -5
- package/dist/index.browser.cjs +531 -244
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +528 -246
- package/dist/index.browser.js.map +1 -1
- package/dist/index.development.js +1075 -664
- package/dist/index.development.js.map +1 -1
- package/dist/index.native.js +526 -246
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +531 -244
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +526 -246
- package/dist/index.node.js.map +1 -1
- package/dist/index.production.min.js +18 -11
- package/dist/types/accounts.d.ts +2 -2
- package/dist/types/accounts.d.ts.map +1 -1
- package/dist/types/blockhash.d.ts.map +1 -1
- package/dist/types/compilable-transaction.d.ts +7 -0
- package/dist/types/compilable-transaction.d.ts.map +1 -0
- package/dist/types/compile-address-table-lookups.d.ts +2 -2
- package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
- package/dist/types/compile-static-accounts.d.ts +2 -2
- package/dist/types/compile-static-accounts.d.ts.map +1 -1
- package/dist/types/compile-transaction.d.ts +5 -6
- package/dist/types/compile-transaction.d.ts.map +1 -1
- package/dist/types/decompile-transaction.d.ts +5 -0
- package/dist/types/decompile-transaction.d.ts.map +1 -0
- package/dist/types/durable-nonce.d.ts +8 -7
- package/dist/types/durable-nonce.d.ts.map +1 -1
- package/dist/types/fee-payer.d.ts +4 -3
- package/dist/types/fee-payer.d.ts.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/message.d.ts +1 -5
- package/dist/types/message.d.ts.map +1 -1
- package/dist/types/serializers/address-table-lookup.d.ts +5 -3
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
- package/dist/types/serializers/header.d.ts +4 -2
- package/dist/types/serializers/header.d.ts.map +1 -1
- package/dist/types/serializers/index.d.ts +2 -0
- package/dist/types/serializers/index.d.ts.map +1 -0
- package/dist/types/serializers/instruction.d.ts +4 -2
- package/dist/types/serializers/instruction.d.ts.map +1 -1
- package/dist/types/serializers/message.d.ts +4 -4
- package/dist/types/serializers/message.d.ts.map +1 -1
- package/dist/types/serializers/transaction-version.d.ts +4 -4
- package/dist/types/serializers/transaction-version.d.ts.map +1 -1
- package/dist/types/serializers/transaction.d.ts +6 -5
- package/dist/types/serializers/transaction.d.ts.map +1 -1
- package/dist/types/signatures.d.ts +9 -5
- package/dist/types/signatures.d.ts.map +1 -1
- package/dist/types/types.d.ts +6 -13
- package/dist/types/types.d.ts.map +1 -1
- package/dist/types/wire-transaction.d.ts +1 -1
- package/dist/types/wire-transaction.d.ts.map +1 -1
- package/package.json +19 -13
- package/dist/types/serializers/unimplemented.d.ts +0 -3
- package/dist/types/serializers/unimplemented.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
|
}
|
|
@@ -230,7 +254,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
230
254
|
const shouldReplaceEntry = (
|
|
231
255
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
232
256
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
233
|
-
(addressComparator || (addressComparator = addresses.
|
|
257
|
+
(addressComparator || (addressComparator = addresses.getAddressComparator()))(
|
|
234
258
|
accountMeta.lookupTableAddress,
|
|
235
259
|
entry.lookupTableAddress
|
|
236
260
|
) < 0
|
|
@@ -336,7 +360,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
336
360
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
337
361
|
return leftIsWritable ? -1 : 1;
|
|
338
362
|
}
|
|
339
|
-
addressComparator || (addressComparator = addresses.
|
|
363
|
+
addressComparator || (addressComparator = addresses.getAddressComparator());
|
|
340
364
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
341
365
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
342
366
|
} else {
|
|
@@ -365,7 +389,7 @@ function getCompiledAddressTableLookups(orderedAccounts) {
|
|
|
365
389
|
entry.readableIndices.push(account.addressIndex);
|
|
366
390
|
}
|
|
367
391
|
}
|
|
368
|
-
return Object.keys(index).sort(addresses.
|
|
392
|
+
return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
|
|
369
393
|
lookupTableAddress,
|
|
370
394
|
...index[lookupTableAddress]
|
|
371
395
|
}));
|
|
@@ -444,151 +468,317 @@ function compileMessage(transaction) {
|
|
|
444
468
|
version: transaction.version
|
|
445
469
|
};
|
|
446
470
|
}
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
471
|
+
|
|
472
|
+
// src/compile-transaction.ts
|
|
473
|
+
function getCompiledTransaction(transaction) {
|
|
474
|
+
const compiledMessage = compileMessage(transaction);
|
|
475
|
+
let signatures;
|
|
476
|
+
if ("signatures" in transaction) {
|
|
477
|
+
signatures = [];
|
|
478
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
479
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
480
|
+
}
|
|
481
|
+
} else {
|
|
482
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
483
|
+
}
|
|
484
|
+
return {
|
|
485
|
+
compiledMessage,
|
|
486
|
+
signatures
|
|
487
|
+
};
|
|
488
|
+
}
|
|
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
|
|
480
597
|
);
|
|
481
598
|
}
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
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(
|
|
485
607
|
[
|
|
486
|
-
"
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
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
|
+
]
|
|
492
623
|
],
|
|
624
|
+
{ description: addressTableLookupDescription }
|
|
625
|
+
);
|
|
626
|
+
}
|
|
627
|
+
return memoizedAddressTableLookupEncoder;
|
|
628
|
+
}
|
|
629
|
+
var memoizedAddressTableLookupDecoder;
|
|
630
|
+
function getAddressTableLookupDecoder() {
|
|
631
|
+
if (!memoizedAddressTableLookupDecoder) {
|
|
632
|
+
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder(
|
|
493
633
|
[
|
|
494
|
-
"
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
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
|
+
]
|
|
500
649
|
],
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
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)]
|
|
509
691
|
],
|
|
510
|
-
|
|
511
|
-
description:
|
|
512
|
-
}
|
|
692
|
+
{
|
|
693
|
+
description: messageHeaderDescription
|
|
694
|
+
}
|
|
513
695
|
);
|
|
514
696
|
}
|
|
515
|
-
function
|
|
516
|
-
return
|
|
517
|
-
|
|
518
|
-
[
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
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
|
-
};
|
|
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
|
|
566
706
|
}
|
|
567
707
|
);
|
|
568
708
|
}
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
)
|
|
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;
|
|
576
742
|
}
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
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;
|
|
581
773
|
}
|
|
582
|
-
|
|
583
|
-
// src/serializers/transaction-version.ts
|
|
584
774
|
var VERSION_FLAG_MASK = 128;
|
|
585
775
|
var BASE_CONFIG = {
|
|
586
776
|
description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
|
|
587
777
|
fixedSize: null,
|
|
588
778
|
maxSize: 1
|
|
589
779
|
};
|
|
590
|
-
function
|
|
591
|
-
const firstByte =
|
|
780
|
+
function decode(bytes, offset = 0) {
|
|
781
|
+
const firstByte = bytes[offset];
|
|
592
782
|
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
593
783
|
return ["legacy", offset];
|
|
594
784
|
} else {
|
|
@@ -596,7 +786,7 @@ function deserialize(bytes3, offset = 0) {
|
|
|
596
786
|
return [version, offset + 1];
|
|
597
787
|
}
|
|
598
788
|
}
|
|
599
|
-
function
|
|
789
|
+
function encode(value) {
|
|
600
790
|
if (value === "legacy") {
|
|
601
791
|
return new Uint8Array();
|
|
602
792
|
}
|
|
@@ -605,99 +795,219 @@ function serialize(value) {
|
|
|
605
795
|
}
|
|
606
796
|
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
607
797
|
}
|
|
608
|
-
function
|
|
798
|
+
function getTransactionVersionDecoder() {
|
|
799
|
+
return {
|
|
800
|
+
...BASE_CONFIG,
|
|
801
|
+
decode
|
|
802
|
+
};
|
|
803
|
+
}
|
|
804
|
+
function getTransactionVersionEncoder() {
|
|
609
805
|
return {
|
|
610
806
|
...BASE_CONFIG,
|
|
611
|
-
|
|
612
|
-
serialize
|
|
807
|
+
encode
|
|
613
808
|
};
|
|
614
809
|
}
|
|
615
810
|
|
|
616
811
|
// src/serializers/message.ts
|
|
617
|
-
var
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
(value)
|
|
632
|
-
|
|
633
|
-
return value;
|
|
634
|
-
}
|
|
635
|
-
return {
|
|
636
|
-
...value,
|
|
637
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
638
|
-
};
|
|
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;
|
|
639
828
|
}
|
|
640
|
-
|
|
641
|
-
|
|
829
|
+
return {
|
|
830
|
+
...value,
|
|
831
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
832
|
+
};
|
|
833
|
+
}
|
|
834
|
+
);
|
|
642
835
|
}
|
|
643
|
-
function
|
|
836
|
+
function getPreludeStructEncoderTuple() {
|
|
644
837
|
return [
|
|
645
|
-
["version",
|
|
646
|
-
["header",
|
|
838
|
+
["version", getTransactionVersionEncoder()],
|
|
839
|
+
["header", getMessageHeaderEncoder()],
|
|
647
840
|
[
|
|
648
841
|
"staticAccounts",
|
|
649
|
-
|
|
650
|
-
description:
|
|
651
|
-
size:
|
|
842
|
+
codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), {
|
|
843
|
+
description: staticAccountsDescription,
|
|
844
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
652
845
|
})
|
|
653
846
|
],
|
|
654
847
|
[
|
|
655
848
|
"lifetimeToken",
|
|
656
|
-
|
|
657
|
-
description:
|
|
658
|
-
encoding:
|
|
849
|
+
codecsStrings.getStringEncoder({
|
|
850
|
+
description: lifetimeTokenDescription,
|
|
851
|
+
encoding: codecsStrings.getBase58Encoder(),
|
|
659
852
|
size: 32
|
|
660
853
|
})
|
|
661
854
|
],
|
|
662
855
|
[
|
|
663
856
|
"instructions",
|
|
664
|
-
|
|
665
|
-
description:
|
|
666
|
-
size:
|
|
857
|
+
codecsDataStructures.getArrayEncoder(getInstructionEncoder(), {
|
|
858
|
+
description: instructionsDescription,
|
|
859
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
667
860
|
})
|
|
668
861
|
]
|
|
669
862
|
];
|
|
670
863
|
}
|
|
671
|
-
function
|
|
672
|
-
return
|
|
673
|
-
|
|
674
|
-
|
|
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()
|
|
675
897
|
});
|
|
676
898
|
}
|
|
899
|
+
function getAddressTableLookupArrayDecoder() {
|
|
900
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), {
|
|
901
|
+
description: addressTableLookupsDescription,
|
|
902
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
903
|
+
});
|
|
904
|
+
}
|
|
905
|
+
var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
|
|
677
906
|
function getCompiledMessageEncoder() {
|
|
678
907
|
return {
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
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
|
|
682
918
|
};
|
|
683
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
|
+
}
|
|
684
933
|
|
|
685
|
-
// src/
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
return
|
|
934
|
+
// src/serializers/transaction.ts
|
|
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(
|
|
939
|
+
[
|
|
940
|
+
[
|
|
941
|
+
"signatures",
|
|
942
|
+
codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), {
|
|
943
|
+
description: signaturesDescription,
|
|
944
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
945
|
+
})
|
|
946
|
+
],
|
|
947
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
948
|
+
],
|
|
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
|
+
);
|
|
973
|
+
}
|
|
974
|
+
function getTransactionEncoder() {
|
|
975
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
690
976
|
}
|
|
691
|
-
|
|
977
|
+
function getTransactionDecoder(lastValidBlockHeight) {
|
|
978
|
+
return codecsCore.mapDecoder(
|
|
979
|
+
getCompiledTransactionDecoder(),
|
|
980
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
|
|
981
|
+
);
|
|
982
|
+
}
|
|
983
|
+
function getTransactionCodec(lastValidBlockHeight) {
|
|
984
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
|
|
985
|
+
}
|
|
986
|
+
var base58Decoder;
|
|
987
|
+
function getSignatureFromTransaction(transaction) {
|
|
988
|
+
if (!base58Decoder)
|
|
989
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
990
|
+
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
991
|
+
if (!signatureBytes) {
|
|
992
|
+
throw new Error(
|
|
993
|
+
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
994
|
+
);
|
|
995
|
+
}
|
|
996
|
+
const transactionSignature = base58Decoder.decode(signatureBytes)[0];
|
|
997
|
+
return transactionSignature;
|
|
998
|
+
}
|
|
999
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
692
1000
|
const compiledMessage = compileMessage(transaction);
|
|
693
|
-
const
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
1001
|
+
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
1002
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
1003
|
+
const publicKeySignaturePairs = await Promise.all(
|
|
1004
|
+
keyPairs.map(
|
|
1005
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
1006
|
+
)
|
|
1007
|
+
);
|
|
1008
|
+
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
1009
|
+
nextSignatures[signerPublicKey] = signature;
|
|
1010
|
+
}
|
|
701
1011
|
const out = {
|
|
702
1012
|
...transaction,
|
|
703
1013
|
signatures: nextSignatures
|
|
@@ -705,55 +1015,25 @@ async function signTransaction(keyPair, transaction) {
|
|
|
705
1015
|
Object.freeze(out);
|
|
706
1016
|
return out;
|
|
707
1017
|
}
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
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);
|
|
1018
|
+
async function signTransaction(keyPairs, transaction) {
|
|
1019
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
1020
|
+
assertTransactionIsFullySigned(out);
|
|
1021
|
+
Object.freeze(out);
|
|
1022
|
+
return out;
|
|
745
1023
|
}
|
|
746
|
-
function
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
1024
|
+
function assertTransactionIsFullySigned(transaction) {
|
|
1025
|
+
const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
|
|
1026
|
+
const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
|
|
1027
|
+
requiredSigners.forEach((address) => {
|
|
1028
|
+
if (!transaction.signatures[address]) {
|
|
1029
|
+
throw new Error(`Transaction is missing signature for address \`${address}\``);
|
|
1030
|
+
}
|
|
1031
|
+
});
|
|
752
1032
|
}
|
|
753
1033
|
|
|
754
1034
|
// src/wire-transaction.ts
|
|
755
1035
|
function getBase64EncodedWireTransaction(transaction) {
|
|
756
|
-
const wireTransactionBytes = getTransactionEncoder().
|
|
1036
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
757
1037
|
{
|
|
758
1038
|
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
759
1039
|
}
|
|
@@ -762,8 +1042,15 @@ function getBase64EncodedWireTransaction(transaction) {
|
|
|
762
1042
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
763
1043
|
exports.assertIsBlockhash = assertIsBlockhash;
|
|
764
1044
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
1045
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
765
1046
|
exports.createTransaction = createTransaction;
|
|
766
1047
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
1048
|
+
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
1049
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
1050
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
1051
|
+
exports.getTransactionEncoder = getTransactionEncoder;
|
|
1052
|
+
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
1053
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
767
1054
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
768
1055
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
769
1056
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|