@solana/transactions 2.0.0-experimental.7da1908 → 2.0.0-experimental.819422a
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 +518 -285
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +510 -284
- package/dist/index.browser.js.map +1 -1
- package/dist/index.development.js +1103 -703
- package/dist/index.development.js.map +1 -1
- package/dist/index.native.js +510 -284
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +520 -285
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +510 -284
- package/dist/index.node.js.map +1 -1
- package/dist/index.production.min.js +22 -15
- 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 +6 -6
- package/dist/types/durable-nonce.d.ts.map +1 -1
- package/dist/types/fee-payer.d.ts +4 -4
- package/dist/types/fee-payer.d.ts.map +1 -1
- package/dist/types/index.d.ts +3 -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 +3 -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 +8 -12
- 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 +18 -14
- package/dist/types/serializers/unimplemented.d.ts +0 -3
- package/dist/types/serializers/unimplemented.d.ts.map +0 -1
package/dist/index.node.cjs
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var codecsStrings = require('@solana/codecs-strings');
|
|
4
4
|
var addresses = require('@solana/addresses');
|
|
5
|
+
var codecsCore = require('@solana/codecs-core');
|
|
6
|
+
var codecsDataStructures = require('@solana/codecs-data-structures');
|
|
7
|
+
var codecsNumbers = require('@solana/codecs-numbers');
|
|
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
|
|
257
|
+
(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
|
|
363
|
+
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 {
|
|
@@ -349,23 +373,22 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
349
373
|
return orderedAccounts;
|
|
350
374
|
}
|
|
351
375
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
352
|
-
var _a;
|
|
353
376
|
const index = {};
|
|
354
377
|
for (const account of orderedAccounts) {
|
|
355
378
|
if (!("lookupTableAddress" in account)) {
|
|
356
379
|
continue;
|
|
357
380
|
}
|
|
358
|
-
const entry = index[
|
|
381
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
359
382
|
readableIndices: [],
|
|
360
383
|
writableIndices: []
|
|
361
|
-
}
|
|
384
|
+
};
|
|
362
385
|
if (account.role === AccountRole.WRITABLE) {
|
|
363
386
|
entry.writableIndices.push(account.addressIndex);
|
|
364
387
|
} else {
|
|
365
388
|
entry.readableIndices.push(account.addressIndex);
|
|
366
389
|
}
|
|
367
390
|
}
|
|
368
|
-
return Object.keys(index).sort(addresses.
|
|
391
|
+
return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
|
|
369
392
|
lookupTableAddress,
|
|
370
393
|
...index[lookupTableAddress]
|
|
371
394
|
}));
|
|
@@ -444,151 +467,189 @@ function compileMessage(transaction) {
|
|
|
444
467
|
version: transaction.version
|
|
445
468
|
};
|
|
446
469
|
}
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
470
|
+
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
471
|
+
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
472
|
+
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
473
|
+
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";
|
|
474
|
+
var memoizedAddressTableLookupEncoder;
|
|
475
|
+
function getAddressTableLookupEncoder() {
|
|
476
|
+
if (!memoizedAddressTableLookupEncoder) {
|
|
477
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder(
|
|
450
478
|
[
|
|
451
|
-
"lookupTableAddress",
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
479
|
+
["lookupTableAddress", addresses.getAddressEncoder({ description: lookupTableAddressDescription })],
|
|
480
|
+
[
|
|
481
|
+
"writableIndices",
|
|
482
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
483
|
+
description: writableIndicesDescription,
|
|
484
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
485
|
+
})
|
|
486
|
+
],
|
|
487
|
+
[
|
|
488
|
+
"readableIndices",
|
|
489
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
490
|
+
description: readableIndicesDescription,
|
|
491
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
492
|
+
})
|
|
493
|
+
]
|
|
457
494
|
],
|
|
495
|
+
{ description: addressTableLookupDescription }
|
|
496
|
+
);
|
|
497
|
+
}
|
|
498
|
+
return memoizedAddressTableLookupEncoder;
|
|
499
|
+
}
|
|
500
|
+
var memoizedAddressTableLookupDecoder;
|
|
501
|
+
function getAddressTableLookupDecoder() {
|
|
502
|
+
if (!memoizedAddressTableLookupDecoder) {
|
|
503
|
+
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder(
|
|
458
504
|
[
|
|
459
|
-
"
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
505
|
+
["lookupTableAddress", addresses.getAddressDecoder({ description: lookupTableAddressDescription })],
|
|
506
|
+
[
|
|
507
|
+
"writableIndices",
|
|
508
|
+
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
509
|
+
description: writableIndicesDescription,
|
|
510
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
511
|
+
})
|
|
512
|
+
],
|
|
513
|
+
[
|
|
514
|
+
"readableIndices",
|
|
515
|
+
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
516
|
+
description: readableIndicesDescription,
|
|
517
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
518
|
+
})
|
|
519
|
+
]
|
|
466
520
|
],
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
521
|
+
{ description: addressTableLookupDescription }
|
|
522
|
+
);
|
|
523
|
+
}
|
|
524
|
+
return memoizedAddressTableLookupDecoder;
|
|
525
|
+
}
|
|
526
|
+
var memoizedU8Encoder;
|
|
527
|
+
function getMemoizedU8Encoder() {
|
|
528
|
+
if (!memoizedU8Encoder)
|
|
529
|
+
memoizedU8Encoder = codecsNumbers.getU8Encoder();
|
|
530
|
+
return memoizedU8Encoder;
|
|
531
|
+
}
|
|
532
|
+
function getMemoizedU8EncoderDescription(description) {
|
|
533
|
+
const encoder = getMemoizedU8Encoder();
|
|
534
|
+
return {
|
|
535
|
+
...encoder,
|
|
536
|
+
description: description ?? encoder.description
|
|
537
|
+
};
|
|
538
|
+
}
|
|
539
|
+
var memoizedU8Decoder;
|
|
540
|
+
function getMemoizedU8Decoder() {
|
|
541
|
+
if (!memoizedU8Decoder)
|
|
542
|
+
memoizedU8Decoder = codecsNumbers.getU8Decoder();
|
|
543
|
+
return memoizedU8Decoder;
|
|
544
|
+
}
|
|
545
|
+
function getMemoizedU8DecoderDescription(description) {
|
|
546
|
+
const decoder = getMemoizedU8Decoder();
|
|
547
|
+
return {
|
|
548
|
+
...decoder,
|
|
549
|
+
description: description ?? decoder.description
|
|
550
|
+
};
|
|
481
551
|
}
|
|
482
|
-
|
|
483
|
-
|
|
552
|
+
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;
|
|
553
|
+
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;
|
|
554
|
+
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
555
|
+
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
556
|
+
function getMessageHeaderEncoder() {
|
|
557
|
+
return codecsDataStructures.getStructEncoder(
|
|
484
558
|
[
|
|
485
|
-
[
|
|
486
|
-
|
|
487
|
-
|
|
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
|
-
]
|
|
559
|
+
["numSignerAccounts", getMemoizedU8EncoderDescription(numSignerAccountsDescription)],
|
|
560
|
+
["numReadonlySignerAccounts", getMemoizedU8EncoderDescription(numReadonlySignerAccountsDescription)],
|
|
561
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8EncoderDescription(numReadonlyNonSignerAccountsDescription)]
|
|
509
562
|
],
|
|
510
|
-
|
|
511
|
-
description:
|
|
512
|
-
}
|
|
563
|
+
{
|
|
564
|
+
description: messageHeaderDescription
|
|
565
|
+
}
|
|
513
566
|
);
|
|
514
567
|
}
|
|
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
|
-
};
|
|
568
|
+
function getMessageHeaderDecoder() {
|
|
569
|
+
return codecsDataStructures.getStructDecoder(
|
|
570
|
+
[
|
|
571
|
+
["numSignerAccounts", getMemoizedU8DecoderDescription(numSignerAccountsDescription)],
|
|
572
|
+
["numReadonlySignerAccounts", getMemoizedU8DecoderDescription(numReadonlySignerAccountsDescription)],
|
|
573
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8DecoderDescription(numReadonlyNonSignerAccountsDescription)]
|
|
574
|
+
],
|
|
575
|
+
{
|
|
576
|
+
description: messageHeaderDescription
|
|
566
577
|
}
|
|
567
578
|
);
|
|
568
579
|
}
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
)
|
|
580
|
+
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
581
|
+
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
582
|
+
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";
|
|
583
|
+
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
584
|
+
var memoizedGetInstructionEncoder;
|
|
585
|
+
function getInstructionEncoder() {
|
|
586
|
+
if (!memoizedGetInstructionEncoder) {
|
|
587
|
+
memoizedGetInstructionEncoder = codecsCore.mapEncoder(
|
|
588
|
+
codecsDataStructures.getStructEncoder([
|
|
589
|
+
["programAddressIndex", codecsNumbers.getU8Encoder({ description: programAddressIndexDescription })],
|
|
590
|
+
[
|
|
591
|
+
"accountIndices",
|
|
592
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder({ description: accountIndexDescription }), {
|
|
593
|
+
description: accountIndicesDescription,
|
|
594
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
595
|
+
})
|
|
596
|
+
],
|
|
597
|
+
["data", codecsDataStructures.getBytesEncoder({ description: dataDescription, size: codecsNumbers.getShortU16Encoder() })]
|
|
598
|
+
]),
|
|
599
|
+
// Convert an instruction to have all fields defined
|
|
600
|
+
(instruction) => {
|
|
601
|
+
if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
|
|
602
|
+
return instruction;
|
|
603
|
+
}
|
|
604
|
+
return {
|
|
605
|
+
...instruction,
|
|
606
|
+
accountIndices: instruction.accountIndices ?? [],
|
|
607
|
+
data: instruction.data ?? new Uint8Array(0)
|
|
608
|
+
};
|
|
609
|
+
}
|
|
610
|
+
);
|
|
611
|
+
}
|
|
612
|
+
return memoizedGetInstructionEncoder;
|
|
576
613
|
}
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
614
|
+
var memoizedGetInstructionDecoder;
|
|
615
|
+
function getInstructionDecoder() {
|
|
616
|
+
if (!memoizedGetInstructionDecoder) {
|
|
617
|
+
memoizedGetInstructionDecoder = codecsCore.mapDecoder(
|
|
618
|
+
codecsDataStructures.getStructDecoder([
|
|
619
|
+
["programAddressIndex", codecsNumbers.getU8Decoder({ description: programAddressIndexDescription })],
|
|
620
|
+
[
|
|
621
|
+
"accountIndices",
|
|
622
|
+
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder({ description: accountIndexDescription }), {
|
|
623
|
+
description: accountIndicesDescription,
|
|
624
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
625
|
+
})
|
|
626
|
+
],
|
|
627
|
+
["data", codecsDataStructures.getBytesDecoder({ description: dataDescription, size: codecsNumbers.getShortU16Decoder() })]
|
|
628
|
+
]),
|
|
629
|
+
// Convert an instruction to exclude optional fields if they are empty
|
|
630
|
+
(instruction) => {
|
|
631
|
+
if (instruction.accountIndices.length && instruction.data.byteLength) {
|
|
632
|
+
return instruction;
|
|
633
|
+
}
|
|
634
|
+
const { accountIndices, data, ...rest } = instruction;
|
|
635
|
+
return {
|
|
636
|
+
...rest,
|
|
637
|
+
...accountIndices.length ? { accountIndices } : null,
|
|
638
|
+
...data.byteLength ? { data } : null
|
|
639
|
+
};
|
|
640
|
+
}
|
|
641
|
+
);
|
|
642
|
+
}
|
|
643
|
+
return memoizedGetInstructionDecoder;
|
|
581
644
|
}
|
|
582
|
-
|
|
583
|
-
// src/serializers/transaction-version.ts
|
|
584
645
|
var VERSION_FLAG_MASK = 128;
|
|
585
646
|
var BASE_CONFIG = {
|
|
586
647
|
description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
|
|
587
648
|
fixedSize: null,
|
|
588
649
|
maxSize: 1
|
|
589
650
|
};
|
|
590
|
-
function
|
|
591
|
-
const firstByte =
|
|
651
|
+
function decode(bytes, offset = 0) {
|
|
652
|
+
const firstByte = bytes[offset];
|
|
592
653
|
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
593
654
|
return ["legacy", offset];
|
|
594
655
|
} else {
|
|
@@ -596,7 +657,7 @@ function deserialize(bytes3, offset = 0) {
|
|
|
596
657
|
return [version, offset + 1];
|
|
597
658
|
}
|
|
598
659
|
}
|
|
599
|
-
function
|
|
660
|
+
function encode(value) {
|
|
600
661
|
if (value === "legacy") {
|
|
601
662
|
return new Uint8Array();
|
|
602
663
|
}
|
|
@@ -605,142 +666,345 @@ function serialize(value) {
|
|
|
605
666
|
}
|
|
606
667
|
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
607
668
|
}
|
|
608
|
-
function
|
|
669
|
+
function getTransactionVersionDecoder() {
|
|
670
|
+
return {
|
|
671
|
+
...BASE_CONFIG,
|
|
672
|
+
decode
|
|
673
|
+
};
|
|
674
|
+
}
|
|
675
|
+
function getTransactionVersionEncoder() {
|
|
609
676
|
return {
|
|
610
677
|
...BASE_CONFIG,
|
|
611
|
-
|
|
612
|
-
serialize
|
|
678
|
+
encode
|
|
613
679
|
};
|
|
614
680
|
}
|
|
615
681
|
|
|
616
682
|
// 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
|
-
};
|
|
683
|
+
var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
|
|
684
|
+
var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
|
|
685
|
+
var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
|
|
686
|
+
var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
|
|
687
|
+
function getCompiledMessageLegacyEncoder() {
|
|
688
|
+
return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
|
|
689
|
+
}
|
|
690
|
+
function getCompiledMessageVersionedEncoder() {
|
|
691
|
+
return codecsCore.mapEncoder(
|
|
692
|
+
codecsDataStructures.getStructEncoder([
|
|
693
|
+
...getPreludeStructEncoderTuple(),
|
|
694
|
+
["addressTableLookups", getAddressTableLookupArrayEncoder()]
|
|
695
|
+
]),
|
|
696
|
+
(value) => {
|
|
697
|
+
if (value.version === "legacy") {
|
|
698
|
+
return value;
|
|
639
699
|
}
|
|
640
|
-
|
|
641
|
-
|
|
700
|
+
return {
|
|
701
|
+
...value,
|
|
702
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
703
|
+
};
|
|
704
|
+
}
|
|
705
|
+
);
|
|
642
706
|
}
|
|
643
|
-
function
|
|
707
|
+
function getPreludeStructEncoderTuple() {
|
|
644
708
|
return [
|
|
645
|
-
["version",
|
|
646
|
-
["header",
|
|
709
|
+
["version", getTransactionVersionEncoder()],
|
|
710
|
+
["header", getMessageHeaderEncoder()],
|
|
647
711
|
[
|
|
648
712
|
"staticAccounts",
|
|
649
|
-
|
|
650
|
-
description:
|
|
651
|
-
size:
|
|
713
|
+
codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), {
|
|
714
|
+
description: staticAccountsDescription,
|
|
715
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
652
716
|
})
|
|
653
717
|
],
|
|
654
718
|
[
|
|
655
719
|
"lifetimeToken",
|
|
656
|
-
|
|
657
|
-
description:
|
|
658
|
-
encoding:
|
|
720
|
+
codecsStrings.getStringEncoder({
|
|
721
|
+
description: lifetimeTokenDescription,
|
|
722
|
+
encoding: codecsStrings.getBase58Encoder(),
|
|
659
723
|
size: 32
|
|
660
724
|
})
|
|
661
725
|
],
|
|
662
726
|
[
|
|
663
727
|
"instructions",
|
|
664
|
-
|
|
665
|
-
description:
|
|
666
|
-
size:
|
|
728
|
+
codecsDataStructures.getArrayEncoder(getInstructionEncoder(), {
|
|
729
|
+
description: instructionsDescription,
|
|
730
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
667
731
|
})
|
|
668
732
|
]
|
|
669
733
|
];
|
|
670
734
|
}
|
|
671
|
-
function
|
|
672
|
-
return
|
|
673
|
-
|
|
674
|
-
|
|
735
|
+
function getPreludeStructDecoderTuple() {
|
|
736
|
+
return [
|
|
737
|
+
["version", getTransactionVersionDecoder()],
|
|
738
|
+
["header", getMessageHeaderDecoder()],
|
|
739
|
+
[
|
|
740
|
+
"staticAccounts",
|
|
741
|
+
codecsDataStructures.getArrayDecoder(addresses.getAddressDecoder(), {
|
|
742
|
+
description: staticAccountsDescription,
|
|
743
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
744
|
+
})
|
|
745
|
+
],
|
|
746
|
+
[
|
|
747
|
+
"lifetimeToken",
|
|
748
|
+
codecsStrings.getStringDecoder({
|
|
749
|
+
description: lifetimeTokenDescription,
|
|
750
|
+
encoding: codecsStrings.getBase58Decoder(),
|
|
751
|
+
size: 32
|
|
752
|
+
})
|
|
753
|
+
],
|
|
754
|
+
[
|
|
755
|
+
"instructions",
|
|
756
|
+
codecsDataStructures.getArrayDecoder(getInstructionDecoder(), {
|
|
757
|
+
description: instructionsDescription,
|
|
758
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
759
|
+
})
|
|
760
|
+
],
|
|
761
|
+
["addressTableLookups", getAddressTableLookupArrayDecoder()]
|
|
762
|
+
];
|
|
763
|
+
}
|
|
764
|
+
function getAddressTableLookupArrayEncoder() {
|
|
765
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), {
|
|
766
|
+
description: addressTableLookupsDescription,
|
|
767
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
768
|
+
});
|
|
769
|
+
}
|
|
770
|
+
function getAddressTableLookupArrayDecoder() {
|
|
771
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), {
|
|
772
|
+
description: addressTableLookupsDescription,
|
|
773
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
675
774
|
});
|
|
676
775
|
}
|
|
776
|
+
var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
|
|
677
777
|
function getCompiledMessageEncoder() {
|
|
678
778
|
return {
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
779
|
+
description: messageDescription,
|
|
780
|
+
encode: (compiledMessage) => {
|
|
781
|
+
if (compiledMessage.version === "legacy") {
|
|
782
|
+
return getCompiledMessageLegacyEncoder().encode(compiledMessage);
|
|
783
|
+
} else {
|
|
784
|
+
return getCompiledMessageVersionedEncoder().encode(compiledMessage);
|
|
785
|
+
}
|
|
786
|
+
},
|
|
787
|
+
fixedSize: null,
|
|
788
|
+
maxSize: null
|
|
682
789
|
};
|
|
683
790
|
}
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
791
|
+
function getCompiledMessageDecoder() {
|
|
792
|
+
return codecsCore.mapDecoder(
|
|
793
|
+
codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple(), {
|
|
794
|
+
description: messageDescription
|
|
795
|
+
}),
|
|
796
|
+
({ addressTableLookups, ...restOfMessage }) => {
|
|
797
|
+
if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
|
|
798
|
+
return restOfMessage;
|
|
799
|
+
}
|
|
800
|
+
return { ...restOfMessage, addressTableLookups };
|
|
694
801
|
}
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
802
|
+
);
|
|
803
|
+
}
|
|
804
|
+
function getCompiledMessageCodec() {
|
|
805
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
806
|
+
}
|
|
807
|
+
|
|
808
|
+
// src/compile-transaction.ts
|
|
809
|
+
function getCompiledTransaction(transaction) {
|
|
810
|
+
const compiledMessage = compileMessage(transaction);
|
|
811
|
+
let signatures;
|
|
812
|
+
if ("signatures" in transaction) {
|
|
813
|
+
signatures = [];
|
|
814
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
815
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
699
816
|
}
|
|
700
|
-
}
|
|
701
|
-
|
|
702
|
-
|
|
817
|
+
} else {
|
|
818
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
819
|
+
}
|
|
820
|
+
return {
|
|
821
|
+
compiledMessage,
|
|
822
|
+
signatures
|
|
823
|
+
};
|
|
824
|
+
}
|
|
825
|
+
function getAccountMetas(message) {
|
|
826
|
+
const { header } = message;
|
|
827
|
+
const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
|
|
828
|
+
const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
|
|
829
|
+
const accountMetas = [];
|
|
830
|
+
let accountIndex = 0;
|
|
831
|
+
for (let i = 0; i < numWritableSignerAccounts; i++) {
|
|
832
|
+
accountMetas.push({
|
|
833
|
+
address: message.staticAccounts[accountIndex],
|
|
834
|
+
role: AccountRole.WRITABLE_SIGNER
|
|
835
|
+
});
|
|
836
|
+
accountIndex++;
|
|
837
|
+
}
|
|
838
|
+
for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
|
|
839
|
+
accountMetas.push({
|
|
840
|
+
address: message.staticAccounts[accountIndex],
|
|
841
|
+
role: AccountRole.READONLY_SIGNER
|
|
842
|
+
});
|
|
843
|
+
accountIndex++;
|
|
844
|
+
}
|
|
845
|
+
for (let i = 0; i < numWritableNonSignerAccounts; i++) {
|
|
846
|
+
accountMetas.push({
|
|
847
|
+
address: message.staticAccounts[accountIndex],
|
|
848
|
+
role: AccountRole.WRITABLE
|
|
849
|
+
});
|
|
850
|
+
accountIndex++;
|
|
851
|
+
}
|
|
852
|
+
for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
|
|
853
|
+
accountMetas.push({
|
|
854
|
+
address: message.staticAccounts[accountIndex],
|
|
855
|
+
role: AccountRole.READONLY
|
|
703
856
|
});
|
|
857
|
+
accountIndex++;
|
|
704
858
|
}
|
|
859
|
+
return accountMetas;
|
|
705
860
|
}
|
|
706
|
-
function
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
putativeTransactionSignature.length > 88
|
|
711
|
-
) {
|
|
712
|
-
return false;
|
|
861
|
+
function convertInstruction(instruction, accountMetas) {
|
|
862
|
+
const programAddress = accountMetas[instruction.programAddressIndex]?.address;
|
|
863
|
+
if (!programAddress) {
|
|
864
|
+
throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
|
|
713
865
|
}
|
|
714
|
-
const
|
|
715
|
-
const
|
|
716
|
-
|
|
717
|
-
|
|
866
|
+
const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
|
|
867
|
+
const { data } = instruction;
|
|
868
|
+
return {
|
|
869
|
+
programAddress,
|
|
870
|
+
...accounts && accounts.length ? { accounts } : {},
|
|
871
|
+
...data && data.length ? { data } : {}
|
|
872
|
+
};
|
|
873
|
+
}
|
|
874
|
+
function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
|
|
875
|
+
if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
|
|
876
|
+
return {
|
|
877
|
+
blockhash: messageLifetimeToken,
|
|
878
|
+
lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
|
|
879
|
+
// U64 MAX
|
|
880
|
+
};
|
|
881
|
+
} else {
|
|
882
|
+
const nonceAccountAddress = firstInstruction.accounts[0].address;
|
|
883
|
+
addresses.assertIsAddress(nonceAccountAddress);
|
|
884
|
+
const nonceAuthorityAddress = firstInstruction.accounts[2].address;
|
|
885
|
+
addresses.assertIsAddress(nonceAuthorityAddress);
|
|
886
|
+
return {
|
|
887
|
+
nonce: messageLifetimeToken,
|
|
888
|
+
nonceAccountAddress,
|
|
889
|
+
nonceAuthorityAddress
|
|
890
|
+
};
|
|
718
891
|
}
|
|
719
|
-
return true;
|
|
720
892
|
}
|
|
721
|
-
|
|
722
|
-
const
|
|
723
|
-
|
|
724
|
-
|
|
893
|
+
function convertSignatures(compiledTransaction) {
|
|
894
|
+
const {
|
|
895
|
+
compiledMessage: { staticAccounts },
|
|
896
|
+
signatures
|
|
897
|
+
} = compiledTransaction;
|
|
898
|
+
return signatures.reduce((acc, sig, index) => {
|
|
899
|
+
const allZeros = sig.every((byte) => byte === 0);
|
|
900
|
+
if (allZeros)
|
|
901
|
+
return acc;
|
|
902
|
+
const address = staticAccounts[index];
|
|
903
|
+
return { ...acc, [address]: sig };
|
|
904
|
+
}, {});
|
|
905
|
+
}
|
|
906
|
+
function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
|
|
907
|
+
const { compiledMessage } = compiledTransaction;
|
|
908
|
+
if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
|
|
909
|
+
throw new Error("Cannot convert transaction with addressTableLookups");
|
|
910
|
+
}
|
|
911
|
+
const feePayer = compiledMessage.staticAccounts[0];
|
|
912
|
+
if (!feePayer)
|
|
913
|
+
throw new Error("No fee payer set in CompiledTransaction");
|
|
914
|
+
const accountMetas = getAccountMetas(compiledMessage);
|
|
915
|
+
const instructions = compiledMessage.instructions.map(
|
|
916
|
+
(compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
|
|
917
|
+
);
|
|
918
|
+
const firstInstruction = instructions[0];
|
|
919
|
+
const lifetimeConstraint = getLifetimeConstraint(
|
|
920
|
+
compiledMessage.lifetimeToken,
|
|
921
|
+
firstInstruction,
|
|
922
|
+
lastValidBlockHeight
|
|
923
|
+
);
|
|
924
|
+
const signatures = convertSignatures(compiledTransaction);
|
|
925
|
+
return functional.pipe(
|
|
926
|
+
createTransaction({ version: compiledMessage.version }),
|
|
927
|
+
(tx) => setTransactionFeePayer(feePayer, tx),
|
|
928
|
+
(tx) => instructions.reduce((acc, instruction) => {
|
|
929
|
+
return appendTransactionInstruction(instruction, acc);
|
|
930
|
+
}, tx),
|
|
931
|
+
(tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
|
|
932
|
+
(tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
|
|
933
|
+
);
|
|
725
934
|
}
|
|
935
|
+
|
|
936
|
+
// src/serializers/transaction.ts
|
|
937
|
+
var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
|
|
938
|
+
var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
|
|
939
|
+
function getCompiledTransactionEncoder() {
|
|
940
|
+
return codecsDataStructures.getStructEncoder(
|
|
941
|
+
[
|
|
942
|
+
[
|
|
943
|
+
"signatures",
|
|
944
|
+
codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), {
|
|
945
|
+
description: signaturesDescription,
|
|
946
|
+
size: codecsNumbers.getShortU16Encoder()
|
|
947
|
+
})
|
|
948
|
+
],
|
|
949
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
950
|
+
],
|
|
951
|
+
{
|
|
952
|
+
description: transactionDescription
|
|
953
|
+
}
|
|
954
|
+
);
|
|
955
|
+
}
|
|
956
|
+
function getSignatureDecoder() {
|
|
957
|
+
return codecsCore.mapDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), (bytes) => bytes);
|
|
958
|
+
}
|
|
959
|
+
function getCompiledTransactionDecoder() {
|
|
960
|
+
return codecsDataStructures.getStructDecoder(
|
|
961
|
+
[
|
|
962
|
+
[
|
|
963
|
+
"signatures",
|
|
964
|
+
codecsDataStructures.getArrayDecoder(getSignatureDecoder(), {
|
|
965
|
+
description: signaturesDescription,
|
|
966
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
967
|
+
})
|
|
968
|
+
],
|
|
969
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
970
|
+
],
|
|
971
|
+
{
|
|
972
|
+
description: transactionDescription
|
|
973
|
+
}
|
|
974
|
+
);
|
|
975
|
+
}
|
|
976
|
+
function getTransactionEncoder() {
|
|
977
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
978
|
+
}
|
|
979
|
+
function getTransactionDecoder(lastValidBlockHeight) {
|
|
980
|
+
return codecsCore.mapDecoder(
|
|
981
|
+
getCompiledTransactionDecoder(),
|
|
982
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
|
|
983
|
+
);
|
|
984
|
+
}
|
|
985
|
+
function getTransactionCodec(lastValidBlockHeight) {
|
|
986
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
|
|
987
|
+
}
|
|
988
|
+
var base58Decoder;
|
|
726
989
|
function getSignatureFromTransaction(transaction) {
|
|
727
|
-
|
|
728
|
-
|
|
990
|
+
if (!base58Decoder)
|
|
991
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
992
|
+
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
993
|
+
if (!signatureBytes) {
|
|
729
994
|
throw new Error(
|
|
730
995
|
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
731
996
|
);
|
|
732
997
|
}
|
|
733
|
-
|
|
998
|
+
const transactionSignature = base58Decoder.decode(signatureBytes)[0];
|
|
999
|
+
return transactionSignature;
|
|
734
1000
|
}
|
|
735
|
-
async function
|
|
1001
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
736
1002
|
const compiledMessage = compileMessage(transaction);
|
|
737
1003
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
1004
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
738
1005
|
const publicKeySignaturePairs = await Promise.all(
|
|
739
1006
|
keyPairs.map(
|
|
740
|
-
(keyPair) => Promise.all([
|
|
741
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
742
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
743
|
-
])
|
|
1007
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
744
1008
|
)
|
|
745
1009
|
);
|
|
746
1010
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -753,75 +1017,46 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
753
1017
|
Object.freeze(out);
|
|
754
1018
|
return out;
|
|
755
1019
|
}
|
|
756
|
-
function
|
|
757
|
-
|
|
758
|
-
|
|
1020
|
+
async function signTransaction(keyPairs, transaction) {
|
|
1021
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
1022
|
+
assertTransactionIsFullySigned(out);
|
|
1023
|
+
Object.freeze(out);
|
|
1024
|
+
return out;
|
|
759
1025
|
}
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
signatures = [];
|
|
767
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
768
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
1026
|
+
function assertTransactionIsFullySigned(transaction) {
|
|
1027
|
+
const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
|
|
1028
|
+
const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
|
|
1029
|
+
requiredSigners.forEach((address) => {
|
|
1030
|
+
if (!transaction.signatures[address]) {
|
|
1031
|
+
throw new Error(`Transaction is missing signature for address \`${address}\``);
|
|
769
1032
|
}
|
|
770
|
-
}
|
|
771
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
772
|
-
}
|
|
773
|
-
return {
|
|
774
|
-
compiledMessage,
|
|
775
|
-
signatures
|
|
776
|
-
};
|
|
777
|
-
}
|
|
778
|
-
|
|
779
|
-
// src/serializers/transaction.ts
|
|
780
|
-
var BASE_CONFIG3 = {
|
|
781
|
-
description: __DEV__ ? "The wire format of a Solana transaction" : "",
|
|
782
|
-
fixedSize: null,
|
|
783
|
-
maxSize: null
|
|
784
|
-
};
|
|
785
|
-
function serialize3(transaction) {
|
|
786
|
-
const compiledTransaction = getCompiledTransaction(transaction);
|
|
787
|
-
return umiSerializers.struct([
|
|
788
|
-
[
|
|
789
|
-
"signatures",
|
|
790
|
-
umiSerializers.array(umiSerializers.bytes({ size: 64 }), {
|
|
791
|
-
...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
|
|
792
|
-
size: umiSerializers.shortU16()
|
|
793
|
-
})
|
|
794
|
-
],
|
|
795
|
-
["compiledMessage", getCompiledMessageEncoder()]
|
|
796
|
-
]).serialize(compiledTransaction);
|
|
797
|
-
}
|
|
798
|
-
function getTransactionEncoder() {
|
|
799
|
-
return {
|
|
800
|
-
...BASE_CONFIG3,
|
|
801
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
802
|
-
serialize: serialize3
|
|
803
|
-
};
|
|
1033
|
+
});
|
|
804
1034
|
}
|
|
805
|
-
|
|
806
|
-
// src/wire-transaction.ts
|
|
807
1035
|
function getBase64EncodedWireTransaction(transaction) {
|
|
808
|
-
const wireTransactionBytes = getTransactionEncoder().
|
|
809
|
-
|
|
810
|
-
return Buffer.from(wireTransactionBytes).toString("base64");
|
|
811
|
-
}
|
|
1036
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
1037
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes)[0];
|
|
812
1038
|
}
|
|
813
1039
|
|
|
814
1040
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
815
1041
|
exports.assertIsBlockhash = assertIsBlockhash;
|
|
816
1042
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
817
|
-
exports.
|
|
1043
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
1044
|
+
exports.compileMessage = compileMessage;
|
|
818
1045
|
exports.createTransaction = createTransaction;
|
|
819
1046
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
1047
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
1048
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
1049
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
820
1050
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
821
|
-
exports.
|
|
1051
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
1052
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
1053
|
+
exports.getTransactionEncoder = getTransactionEncoder;
|
|
1054
|
+
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
1055
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
822
1056
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
823
1057
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
824
1058
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
825
1059
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
826
1060
|
exports.signTransaction = signTransaction;
|
|
827
|
-
|
|
1061
|
+
//# sourceMappingURL=out.js.map
|
|
1062
|
+
//# sourceMappingURL=index.node.cjs.map
|