@solana/transactions 2.0.0-experimental.fc4e943 → 2.0.0-experimental.fcff844
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +272 -5
- package/dist/index.browser.cjs +411 -334
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +405 -337
- package/dist/index.browser.js.map +1 -1
- package/dist/index.development.js +941 -1142
- package/dist/index.development.js.map +1 -1
- package/dist/index.native.js +405 -335
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +411 -336
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +405 -335
- package/dist/index.node.js.map +1 -1
- package/dist/index.production.min.js +23 -16
- package/dist/types/accounts.d.ts +2 -2
- package/dist/types/accounts.d.ts.map +1 -0
- package/dist/types/blockhash.d.ts +1 -0
- package/dist/types/blockhash.d.ts.map +1 -0
- 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 -0
- package/dist/types/compile-header.d.ts.map +1 -0
- package/dist/types/compile-instructions.d.ts.map +1 -0
- package/dist/types/compile-lifetime-token.d.ts.map +1 -0
- package/dist/types/compile-static-accounts.d.ts +2 -2
- package/dist/types/compile-static-accounts.d.ts.map +1 -0
- package/dist/types/compile-transaction.d.ts +5 -6
- package/dist/types/compile-transaction.d.ts.map +1 -0
- package/dist/types/create-transaction.d.ts.map +1 -0
- 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 -0
- package/dist/types/fee-payer.d.ts +4 -4
- package/dist/types/fee-payer.d.ts.map +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -0
- package/dist/types/instructions.d.ts.map +1 -0
- package/dist/types/message.d.ts +1 -5
- package/dist/types/message.d.ts.map +1 -0
- package/dist/types/serializers/address-table-lookup.d.ts +5 -3
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -0
- package/dist/types/serializers/header.d.ts +4 -4
- package/dist/types/serializers/header.d.ts.map +1 -0
- package/dist/types/serializers/index.d.ts +1 -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 -0
- package/dist/types/serializers/message.d.ts +4 -4
- package/dist/types/serializers/message.d.ts.map +1 -0
- package/dist/types/serializers/transaction-version.d.ts +4 -4
- package/dist/types/serializers/transaction-version.d.ts.map +1 -0
- package/dist/types/serializers/transaction.d.ts +6 -5
- package/dist/types/serializers/transaction.d.ts.map +1 -0
- package/dist/types/signatures.d.ts +8 -12
- package/dist/types/signatures.d.ts.map +1 -0
- package/dist/types/types.d.ts +6 -13
- package/dist/types/types.d.ts.map +1 -0
- package/dist/types/unsigned-transaction.d.ts.map +1 -0
- package/dist/types/wire-transaction.d.ts +1 -1
- package/dist/types/wire-transaction.d.ts.map +1 -0
- package/package.json +15 -14
- package/dist/types/serializers/unimplemented.d.ts +0 -3
package/dist/index.browser.cjs
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
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');
|
|
5
6
|
var codecsDataStructures = require('@solana/codecs-data-structures');
|
|
6
7
|
var codecsNumbers = require('@solana/codecs-numbers');
|
|
7
|
-
var
|
|
8
|
+
var functional = require('@solana/functional');
|
|
8
9
|
var keys = require('@solana/keys');
|
|
9
10
|
|
|
10
|
-
//
|
|
11
|
-
var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
|
|
11
|
+
// src/blockhash.ts
|
|
12
12
|
|
|
13
13
|
// src/unsigned-transaction.ts
|
|
14
14
|
function getUnsignedTransaction(transaction) {
|
|
@@ -25,7 +25,10 @@ function getUnsignedTransaction(transaction) {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
// src/blockhash.ts
|
|
28
|
+
var base58Encoder;
|
|
28
29
|
function assertIsBlockhash(putativeBlockhash) {
|
|
30
|
+
if (!base58Encoder)
|
|
31
|
+
base58Encoder = codecsStrings.getBase58Encoder();
|
|
29
32
|
try {
|
|
30
33
|
if (
|
|
31
34
|
// Lowest value (32 bytes of zeroes)
|
|
@@ -34,8 +37,8 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
34
37
|
) {
|
|
35
38
|
throw new Error("Expected input string to decode to a byte array of length 32.");
|
|
36
39
|
}
|
|
37
|
-
const
|
|
38
|
-
const numBytes =
|
|
40
|
+
const bytes = base58Encoder.encode(putativeBlockhash);
|
|
41
|
+
const numBytes = bytes.byteLength;
|
|
39
42
|
if (numBytes !== 32) {
|
|
40
43
|
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
41
44
|
}
|
|
@@ -45,6 +48,22 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
45
48
|
});
|
|
46
49
|
}
|
|
47
50
|
}
|
|
51
|
+
function isTransactionWithBlockhashLifetime(transaction) {
|
|
52
|
+
const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
|
|
53
|
+
if (!lifetimeConstraintShapeMatches)
|
|
54
|
+
return false;
|
|
55
|
+
try {
|
|
56
|
+
assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
|
|
57
|
+
return true;
|
|
58
|
+
} catch {
|
|
59
|
+
return false;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
function assertIsTransactionWithBlockhashLifetime(transaction) {
|
|
63
|
+
if (!isTransactionWithBlockhashLifetime(transaction)) {
|
|
64
|
+
throw new Error("Transaction does not have a blockhash lifetime");
|
|
65
|
+
}
|
|
66
|
+
}
|
|
48
67
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
49
68
|
if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
|
|
50
69
|
return transaction;
|
|
@@ -120,7 +139,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
120
139
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
121
140
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
122
141
|
instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
|
|
123
|
-
instruction.accounts[2].address != null && instruction.accounts[2].role
|
|
142
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
124
143
|
}
|
|
125
144
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
126
145
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -128,21 +147,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
128
147
|
function isDurableNonceTransaction(transaction) {
|
|
129
148
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
130
149
|
}
|
|
150
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
151
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
152
|
+
}
|
|
131
153
|
function setTransactionLifetimeUsingDurableNonce({
|
|
132
154
|
nonce,
|
|
133
155
|
nonceAccountAddress,
|
|
134
156
|
nonceAuthorityAddress
|
|
135
157
|
}, transaction) {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
158
|
+
let newInstructions;
|
|
159
|
+
const firstInstruction = transaction.instructions[0];
|
|
160
|
+
if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
|
|
161
|
+
if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
|
|
162
|
+
if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
|
|
163
|
+
return transaction;
|
|
164
|
+
} else {
|
|
165
|
+
newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
|
|
166
|
+
}
|
|
167
|
+
} else {
|
|
168
|
+
newInstructions = [
|
|
169
|
+
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
170
|
+
...transaction.instructions.slice(1)
|
|
171
|
+
];
|
|
172
|
+
}
|
|
173
|
+
} else {
|
|
174
|
+
newInstructions = [
|
|
175
|
+
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
176
|
+
...transaction.instructions
|
|
177
|
+
];
|
|
139
178
|
}
|
|
140
179
|
const out = {
|
|
141
180
|
...getUnsignedTransaction(transaction),
|
|
142
|
-
instructions:
|
|
143
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
144
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
145
|
-
],
|
|
181
|
+
instructions: newInstructions,
|
|
146
182
|
lifetimeConstraint: {
|
|
147
183
|
nonce
|
|
148
184
|
}
|
|
@@ -233,7 +269,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
233
269
|
const shouldReplaceEntry = (
|
|
234
270
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
235
271
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
236
|
-
(addressComparator
|
|
272
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
237
273
|
accountMeta.lookupTableAddress,
|
|
238
274
|
entry.lookupTableAddress
|
|
239
275
|
) < 0
|
|
@@ -339,7 +375,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
339
375
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
340
376
|
return leftIsWritable ? -1 : 1;
|
|
341
377
|
}
|
|
342
|
-
addressComparator
|
|
378
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
343
379
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
344
380
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
345
381
|
} else {
|
|
@@ -352,16 +388,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
352
388
|
return orderedAccounts;
|
|
353
389
|
}
|
|
354
390
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
355
|
-
var _a;
|
|
356
391
|
const index = {};
|
|
357
392
|
for (const account of orderedAccounts) {
|
|
358
393
|
if (!("lookupTableAddress" in account)) {
|
|
359
394
|
continue;
|
|
360
395
|
}
|
|
361
|
-
const entry = index[
|
|
396
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
362
397
|
readableIndices: [],
|
|
363
398
|
writableIndices: []
|
|
364
|
-
}
|
|
399
|
+
};
|
|
365
400
|
if (account.role === AccountRole.WRITABLE) {
|
|
366
401
|
entry.writableIndices.push(account.addressIndex);
|
|
367
402
|
} else {
|
|
@@ -447,367 +482,395 @@ function compileMessage(transaction) {
|
|
|
447
482
|
version: transaction.version
|
|
448
483
|
};
|
|
449
484
|
}
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
if ("signatures" in transaction) {
|
|
456
|
-
signatures = [];
|
|
457
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
458
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
459
|
-
}
|
|
460
|
-
} else {
|
|
461
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
462
|
-
}
|
|
463
|
-
return {
|
|
464
|
-
compiledMessage,
|
|
465
|
-
signatures
|
|
466
|
-
};
|
|
467
|
-
}
|
|
468
|
-
function addressSerializerCompat(compat) {
|
|
469
|
-
const codec = addresses.getAddressCodec();
|
|
470
|
-
return {
|
|
471
|
-
description: compat?.description ?? codec.description,
|
|
472
|
-
deserialize: codec.decode,
|
|
473
|
-
fixedSize: codec.fixedSize,
|
|
474
|
-
maxSize: codec.maxSize,
|
|
475
|
-
serialize: codec.encode
|
|
476
|
-
};
|
|
477
|
-
}
|
|
478
|
-
function getAddressTableLookupCodec() {
|
|
479
|
-
return umiSerializers.struct(
|
|
480
|
-
[
|
|
481
|
-
[
|
|
482
|
-
"lookupTableAddress",
|
|
483
|
-
addressSerializerCompat(
|
|
484
|
-
__DEV__ ? {
|
|
485
|
-
description: "The address of the address lookup table account from which instruction addresses should be looked up"
|
|
486
|
-
} : void 0
|
|
487
|
-
)
|
|
488
|
-
],
|
|
485
|
+
var memoizedAddressTableLookupEncoder;
|
|
486
|
+
function getAddressTableLookupEncoder() {
|
|
487
|
+
if (!memoizedAddressTableLookupEncoder) {
|
|
488
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
489
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
489
490
|
[
|
|
490
491
|
"writableIndices",
|
|
491
|
-
|
|
492
|
-
...__DEV__ ? {
|
|
493
|
-
description: "The indices of the accounts in the lookup table that should be loaded as writeable"
|
|
494
|
-
} : null,
|
|
495
|
-
size: umiSerializers.shortU16()
|
|
496
|
-
})
|
|
492
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
497
493
|
],
|
|
498
494
|
[
|
|
499
495
|
"readableIndices",
|
|
500
|
-
|
|
501
|
-
...__DEV__ ? {
|
|
502
|
-
description: "The indices of the accounts in the lookup table that should be loaded as read-only"
|
|
503
|
-
} : void 0,
|
|
504
|
-
size: umiSerializers.shortU16()
|
|
505
|
-
})
|
|
496
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
506
497
|
]
|
|
507
|
-
]
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
498
|
+
]);
|
|
499
|
+
}
|
|
500
|
+
return memoizedAddressTableLookupEncoder;
|
|
501
|
+
}
|
|
502
|
+
var memoizedAddressTableLookupDecoder;
|
|
503
|
+
function getAddressTableLookupDecoder() {
|
|
504
|
+
if (!memoizedAddressTableLookupDecoder) {
|
|
505
|
+
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder([
|
|
506
|
+
["lookupTableAddress", addresses.getAddressDecoder()],
|
|
507
|
+
["writableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
508
|
+
["readableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })]
|
|
509
|
+
]);
|
|
510
|
+
}
|
|
511
|
+
return memoizedAddressTableLookupDecoder;
|
|
512
|
+
}
|
|
513
|
+
var memoizedU8Encoder;
|
|
514
|
+
function getMemoizedU8Encoder() {
|
|
515
|
+
if (!memoizedU8Encoder)
|
|
516
|
+
memoizedU8Encoder = codecsNumbers.getU8Encoder();
|
|
517
|
+
return memoizedU8Encoder;
|
|
518
|
+
}
|
|
519
|
+
var memoizedU8Decoder;
|
|
520
|
+
function getMemoizedU8Decoder() {
|
|
521
|
+
if (!memoizedU8Decoder)
|
|
522
|
+
memoizedU8Decoder = codecsNumbers.getU8Decoder();
|
|
523
|
+
return memoizedU8Decoder;
|
|
524
|
+
}
|
|
525
|
+
function getMessageHeaderEncoder() {
|
|
526
|
+
return codecsDataStructures.getStructEncoder([
|
|
527
|
+
["numSignerAccounts", getMemoizedU8Encoder()],
|
|
528
|
+
["numReadonlySignerAccounts", getMemoizedU8Encoder()],
|
|
529
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
|
|
530
|
+
]);
|
|
531
|
+
}
|
|
532
|
+
function getMessageHeaderDecoder() {
|
|
533
|
+
return codecsDataStructures.getStructDecoder([
|
|
534
|
+
["numSignerAccounts", getMemoizedU8Decoder()],
|
|
535
|
+
["numReadonlySignerAccounts", getMemoizedU8Decoder()],
|
|
536
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
|
|
537
|
+
]);
|
|
538
|
+
}
|
|
539
|
+
var memoizedGetInstructionEncoder;
|
|
540
|
+
function getInstructionEncoder() {
|
|
541
|
+
if (!memoizedGetInstructionEncoder) {
|
|
542
|
+
memoizedGetInstructionEncoder = codecsCore.mapEncoder(
|
|
543
|
+
codecsDataStructures.getStructEncoder([
|
|
544
|
+
["programAddressIndex", codecsNumbers.getU8Encoder()],
|
|
545
|
+
["accountIndices", codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
546
|
+
["data", codecsDataStructures.getBytesEncoder({ size: codecsNumbers.getShortU16Encoder() })]
|
|
547
|
+
]),
|
|
548
|
+
// Convert an instruction to have all fields defined
|
|
549
|
+
(instruction) => {
|
|
550
|
+
if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
|
|
551
|
+
return instruction;
|
|
552
|
+
}
|
|
553
|
+
return {
|
|
554
|
+
...instruction,
|
|
555
|
+
accountIndices: instruction.accountIndices ?? [],
|
|
556
|
+
data: instruction.data ?? new Uint8Array(0)
|
|
557
|
+
};
|
|
558
|
+
}
|
|
559
|
+
);
|
|
560
|
+
}
|
|
561
|
+
return memoizedGetInstructionEncoder;
|
|
562
|
+
}
|
|
563
|
+
var memoizedGetInstructionDecoder;
|
|
564
|
+
function getInstructionDecoder() {
|
|
565
|
+
if (!memoizedGetInstructionDecoder) {
|
|
566
|
+
memoizedGetInstructionDecoder = codecsCore.mapDecoder(
|
|
567
|
+
codecsDataStructures.getStructDecoder([
|
|
568
|
+
["programAddressIndex", codecsNumbers.getU8Decoder()],
|
|
569
|
+
["accountIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
570
|
+
["data", codecsDataStructures.getBytesDecoder({ size: codecsNumbers.getShortU16Decoder() })]
|
|
571
|
+
]),
|
|
572
|
+
// Convert an instruction to exclude optional fields if they are empty
|
|
573
|
+
(instruction) => {
|
|
574
|
+
if (instruction.accountIndices.length && instruction.data.byteLength) {
|
|
575
|
+
return instruction;
|
|
576
|
+
}
|
|
577
|
+
const { accountIndices, data, ...rest } = instruction;
|
|
578
|
+
return {
|
|
579
|
+
...rest,
|
|
580
|
+
...accountIndices.length ? { accountIndices } : null,
|
|
581
|
+
...data.byteLength ? { data } : null
|
|
582
|
+
};
|
|
583
|
+
}
|
|
584
|
+
);
|
|
585
|
+
}
|
|
586
|
+
return memoizedGetInstructionDecoder;
|
|
518
587
|
}
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
return {
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
588
|
+
var VERSION_FLAG_MASK = 128;
|
|
589
|
+
function getTransactionVersionEncoder() {
|
|
590
|
+
return codecsCore.createEncoder({
|
|
591
|
+
getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
|
|
592
|
+
maxSize: 1,
|
|
593
|
+
write: (value, bytes, offset) => {
|
|
594
|
+
if (value === "legacy") {
|
|
595
|
+
return offset;
|
|
596
|
+
}
|
|
597
|
+
if (value < 0 || value > 127) {
|
|
598
|
+
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
599
|
+
}
|
|
600
|
+
bytes.set([value | VERSION_FLAG_MASK], offset);
|
|
601
|
+
return offset + 1;
|
|
602
|
+
}
|
|
603
|
+
});
|
|
525
604
|
}
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
{
|
|
538
|
-
description: messageHeaderDescription
|
|
605
|
+
function getTransactionVersionDecoder() {
|
|
606
|
+
return codecsCore.createDecoder({
|
|
607
|
+
maxSize: 1,
|
|
608
|
+
read: (bytes, offset) => {
|
|
609
|
+
const firstByte = bytes[offset];
|
|
610
|
+
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
611
|
+
return ["legacy", offset];
|
|
612
|
+
} else {
|
|
613
|
+
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
614
|
+
return [version, offset + 1];
|
|
615
|
+
}
|
|
539
616
|
}
|
|
540
|
-
);
|
|
617
|
+
});
|
|
541
618
|
}
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
],
|
|
553
|
-
[
|
|
554
|
-
"accountIndices",
|
|
555
|
-
umiSerializers.array(
|
|
556
|
-
umiSerializers.u8({
|
|
557
|
-
description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
|
|
558
|
-
}),
|
|
559
|
-
{
|
|
560
|
-
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" : "",
|
|
561
|
-
size: umiSerializers.shortU16()
|
|
562
|
-
}
|
|
563
|
-
)
|
|
564
|
-
],
|
|
565
|
-
[
|
|
566
|
-
"data",
|
|
567
|
-
umiSerializers.bytes({
|
|
568
|
-
description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
|
|
569
|
-
size: umiSerializers.shortU16()
|
|
570
|
-
})
|
|
571
|
-
]
|
|
619
|
+
|
|
620
|
+
// src/serializers/message.ts
|
|
621
|
+
function getCompiledMessageLegacyEncoder() {
|
|
622
|
+
return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
|
|
623
|
+
}
|
|
624
|
+
function getCompiledMessageVersionedEncoder() {
|
|
625
|
+
return codecsCore.mapEncoder(
|
|
626
|
+
codecsDataStructures.getStructEncoder([
|
|
627
|
+
...getPreludeStructEncoderTuple(),
|
|
628
|
+
["addressTableLookups", getAddressTableLookupArrayEncoder()]
|
|
572
629
|
]),
|
|
573
630
|
(value) => {
|
|
574
|
-
if (value.
|
|
631
|
+
if (value.version === "legacy") {
|
|
575
632
|
return value;
|
|
576
633
|
}
|
|
577
634
|
return {
|
|
578
635
|
...value,
|
|
579
|
-
|
|
580
|
-
data: value.data ?? new Uint8Array(0)
|
|
581
|
-
};
|
|
582
|
-
},
|
|
583
|
-
(value) => {
|
|
584
|
-
if (value.accountIndices.length && value.data.byteLength) {
|
|
585
|
-
return value;
|
|
586
|
-
}
|
|
587
|
-
const { accountIndices, data, ...rest } = value;
|
|
588
|
-
return {
|
|
589
|
-
...rest,
|
|
590
|
-
...accountIndices.length ? { accountIndices } : null,
|
|
591
|
-
...data.byteLength ? { data } : null
|
|
636
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
592
637
|
};
|
|
593
638
|
}
|
|
594
639
|
);
|
|
595
640
|
}
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
}
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
605
|
-
return ["legacy", offset];
|
|
606
|
-
} else {
|
|
607
|
-
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
608
|
-
return [version, offset + 1];
|
|
609
|
-
}
|
|
641
|
+
function getPreludeStructEncoderTuple() {
|
|
642
|
+
return [
|
|
643
|
+
["version", getTransactionVersionEncoder()],
|
|
644
|
+
["header", getMessageHeaderEncoder()],
|
|
645
|
+
["staticAccounts", codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
646
|
+
["lifetimeToken", codecsStrings.getStringEncoder({ encoding: codecsStrings.getBase58Encoder(), size: 32 })],
|
|
647
|
+
["instructions", codecsDataStructures.getArrayEncoder(getInstructionEncoder(), { size: codecsNumbers.getShortU16Encoder() })]
|
|
648
|
+
];
|
|
610
649
|
}
|
|
611
|
-
function
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
650
|
+
function getPreludeStructDecoderTuple() {
|
|
651
|
+
return [
|
|
652
|
+
["version", getTransactionVersionDecoder()],
|
|
653
|
+
["header", getMessageHeaderDecoder()],
|
|
654
|
+
["staticAccounts", codecsDataStructures.getArrayDecoder(addresses.getAddressDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
655
|
+
["lifetimeToken", codecsStrings.getStringDecoder({ encoding: codecsStrings.getBase58Decoder(), size: 32 })],
|
|
656
|
+
["instructions", codecsDataStructures.getArrayDecoder(getInstructionDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
657
|
+
["addressTableLookups", getAddressTableLookupArrayDecoder()]
|
|
658
|
+
];
|
|
619
659
|
}
|
|
620
|
-
function
|
|
621
|
-
return {
|
|
622
|
-
...BASE_CONFIG,
|
|
623
|
-
decode
|
|
624
|
-
};
|
|
660
|
+
function getAddressTableLookupArrayEncoder() {
|
|
661
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
625
662
|
}
|
|
626
|
-
function
|
|
627
|
-
return {
|
|
628
|
-
...BASE_CONFIG,
|
|
629
|
-
encode
|
|
630
|
-
};
|
|
663
|
+
function getAddressTableLookupArrayDecoder() {
|
|
664
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
631
665
|
}
|
|
632
|
-
function
|
|
633
|
-
return codecsCore.
|
|
666
|
+
function getCompiledMessageEncoder() {
|
|
667
|
+
return codecsCore.createEncoder({
|
|
668
|
+
getSizeFromValue: (compiledMessage) => {
|
|
669
|
+
if (compiledMessage.version === "legacy") {
|
|
670
|
+
return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
|
|
671
|
+
} else {
|
|
672
|
+
return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
|
|
673
|
+
}
|
|
674
|
+
},
|
|
675
|
+
write: (compiledMessage, bytes, offset) => {
|
|
676
|
+
if (compiledMessage.version === "legacy") {
|
|
677
|
+
return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
|
|
678
|
+
} else {
|
|
679
|
+
return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
|
|
680
|
+
}
|
|
681
|
+
}
|
|
682
|
+
});
|
|
634
683
|
}
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
);
|
|
684
|
+
function getCompiledMessageDecoder() {
|
|
685
|
+
return codecsCore.mapDecoder(codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
|
|
686
|
+
if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
|
|
687
|
+
return restOfMessage;
|
|
688
|
+
}
|
|
689
|
+
return { ...restOfMessage, addressTableLookups };
|
|
690
|
+
});
|
|
642
691
|
}
|
|
643
|
-
function
|
|
644
|
-
return ()
|
|
645
|
-
throw getError("decoder", name);
|
|
646
|
-
};
|
|
692
|
+
function getCompiledMessageCodec() {
|
|
693
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
647
694
|
}
|
|
648
695
|
|
|
649
|
-
// src/
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
696
|
+
// src/compile-transaction.ts
|
|
697
|
+
function getCompiledTransaction(transaction) {
|
|
698
|
+
const compiledMessage = compileMessage(transaction);
|
|
699
|
+
let signatures;
|
|
700
|
+
if ("signatures" in transaction) {
|
|
701
|
+
signatures = [];
|
|
702
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
703
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
704
|
+
}
|
|
658
705
|
} else {
|
|
659
|
-
|
|
660
|
-
umiSerializers.struct([
|
|
661
|
-
...getPreludeStructSerializerTuple(),
|
|
662
|
-
["addressTableLookups", getAddressTableLookupsSerializer()]
|
|
663
|
-
]),
|
|
664
|
-
(value) => {
|
|
665
|
-
if (value.version === "legacy") {
|
|
666
|
-
return value;
|
|
667
|
-
}
|
|
668
|
-
return {
|
|
669
|
-
...value,
|
|
670
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
671
|
-
};
|
|
672
|
-
}
|
|
673
|
-
).serialize(compiledMessage);
|
|
706
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
674
707
|
}
|
|
675
|
-
}
|
|
676
|
-
function toSerializer(codec) {
|
|
677
708
|
return {
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
fixedSize: codec.fixedSize,
|
|
681
|
-
maxSize: codec.maxSize,
|
|
682
|
-
serialize: codec.encode
|
|
709
|
+
compiledMessage,
|
|
710
|
+
signatures
|
|
683
711
|
};
|
|
684
712
|
}
|
|
685
|
-
function
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
713
|
+
function getAccountMetas(message) {
|
|
714
|
+
const { header } = message;
|
|
715
|
+
const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
|
|
716
|
+
const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
|
|
717
|
+
const accountMetas = [];
|
|
718
|
+
let accountIndex = 0;
|
|
719
|
+
for (let i = 0; i < numWritableSignerAccounts; i++) {
|
|
720
|
+
accountMetas.push({
|
|
721
|
+
address: message.staticAccounts[accountIndex],
|
|
722
|
+
role: AccountRole.WRITABLE_SIGNER
|
|
723
|
+
});
|
|
724
|
+
accountIndex++;
|
|
725
|
+
}
|
|
726
|
+
for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
|
|
727
|
+
accountMetas.push({
|
|
728
|
+
address: message.staticAccounts[accountIndex],
|
|
729
|
+
role: AccountRole.READONLY_SIGNER
|
|
730
|
+
});
|
|
731
|
+
accountIndex++;
|
|
732
|
+
}
|
|
733
|
+
for (let i = 0; i < numWritableNonSignerAccounts; i++) {
|
|
734
|
+
accountMetas.push({
|
|
735
|
+
address: message.staticAccounts[accountIndex],
|
|
736
|
+
role: AccountRole.WRITABLE
|
|
737
|
+
});
|
|
738
|
+
accountIndex++;
|
|
739
|
+
}
|
|
740
|
+
for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
|
|
741
|
+
accountMetas.push({
|
|
742
|
+
address: message.staticAccounts[accountIndex],
|
|
743
|
+
role: AccountRole.READONLY
|
|
744
|
+
});
|
|
745
|
+
accountIndex++;
|
|
746
|
+
}
|
|
747
|
+
return accountMetas;
|
|
718
748
|
}
|
|
719
|
-
function
|
|
749
|
+
function convertInstruction(instruction, accountMetas) {
|
|
750
|
+
const programAddress = accountMetas[instruction.programAddressIndex]?.address;
|
|
751
|
+
if (!programAddress) {
|
|
752
|
+
throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
|
|
753
|
+
}
|
|
754
|
+
const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
|
|
755
|
+
const { data } = instruction;
|
|
720
756
|
return {
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
757
|
+
programAddress,
|
|
758
|
+
...accounts && accounts.length ? { accounts } : {},
|
|
759
|
+
...data && data.length ? { data } : {}
|
|
724
760
|
};
|
|
725
761
|
}
|
|
762
|
+
function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
|
|
763
|
+
if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
|
|
764
|
+
return {
|
|
765
|
+
blockhash: messageLifetimeToken,
|
|
766
|
+
lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
|
|
767
|
+
// U64 MAX
|
|
768
|
+
};
|
|
769
|
+
} else {
|
|
770
|
+
const nonceAccountAddress = firstInstruction.accounts[0].address;
|
|
771
|
+
addresses.assertIsAddress(nonceAccountAddress);
|
|
772
|
+
const nonceAuthorityAddress = firstInstruction.accounts[2].address;
|
|
773
|
+
addresses.assertIsAddress(nonceAuthorityAddress);
|
|
774
|
+
return {
|
|
775
|
+
nonce: messageLifetimeToken,
|
|
776
|
+
nonceAccountAddress,
|
|
777
|
+
nonceAuthorityAddress
|
|
778
|
+
};
|
|
779
|
+
}
|
|
780
|
+
}
|
|
781
|
+
function convertSignatures(compiledTransaction) {
|
|
782
|
+
const {
|
|
783
|
+
compiledMessage: { staticAccounts },
|
|
784
|
+
signatures
|
|
785
|
+
} = compiledTransaction;
|
|
786
|
+
return signatures.reduce((acc, sig, index) => {
|
|
787
|
+
const allZeros = sig.every((byte) => byte === 0);
|
|
788
|
+
if (allZeros)
|
|
789
|
+
return acc;
|
|
790
|
+
const address = staticAccounts[index];
|
|
791
|
+
return { ...acc, [address]: sig };
|
|
792
|
+
}, {});
|
|
793
|
+
}
|
|
794
|
+
function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
|
|
795
|
+
const { compiledMessage } = compiledTransaction;
|
|
796
|
+
if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
|
|
797
|
+
throw new Error("Cannot convert transaction with addressTableLookups");
|
|
798
|
+
}
|
|
799
|
+
const feePayer = compiledMessage.staticAccounts[0];
|
|
800
|
+
if (!feePayer)
|
|
801
|
+
throw new Error("No fee payer set in CompiledTransaction");
|
|
802
|
+
const accountMetas = getAccountMetas(compiledMessage);
|
|
803
|
+
const instructions = compiledMessage.instructions.map(
|
|
804
|
+
(compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
|
|
805
|
+
);
|
|
806
|
+
const firstInstruction = instructions[0];
|
|
807
|
+
const lifetimeConstraint = getLifetimeConstraint(
|
|
808
|
+
compiledMessage.lifetimeToken,
|
|
809
|
+
firstInstruction,
|
|
810
|
+
lastValidBlockHeight
|
|
811
|
+
);
|
|
812
|
+
const signatures = convertSignatures(compiledTransaction);
|
|
813
|
+
return functional.pipe(
|
|
814
|
+
createTransaction({ version: compiledMessage.version }),
|
|
815
|
+
(tx) => setTransactionFeePayer(feePayer, tx),
|
|
816
|
+
(tx) => instructions.reduce((acc, instruction) => {
|
|
817
|
+
return appendTransactionInstruction(instruction, acc);
|
|
818
|
+
}, tx),
|
|
819
|
+
(tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
|
|
820
|
+
(tx) => compiledTransaction.signatures.length ? { ...tx, signatures } : tx
|
|
821
|
+
);
|
|
822
|
+
}
|
|
726
823
|
|
|
727
824
|
// src/serializers/transaction.ts
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
return
|
|
825
|
+
function getCompiledTransactionEncoder() {
|
|
826
|
+
return codecsDataStructures.getStructEncoder([
|
|
827
|
+
["signatures", codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), { size: codecsNumbers.getShortU16Encoder() })],
|
|
828
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
829
|
+
]);
|
|
830
|
+
}
|
|
831
|
+
function getCompiledTransactionDecoder() {
|
|
832
|
+
return codecsDataStructures.getStructDecoder([
|
|
736
833
|
[
|
|
737
834
|
"signatures",
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
size: umiSerializers.shortU16()
|
|
835
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
836
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
741
837
|
})
|
|
742
838
|
],
|
|
743
|
-
["compiledMessage",
|
|
744
|
-
])
|
|
839
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
840
|
+
]);
|
|
745
841
|
}
|
|
746
842
|
function getTransactionEncoder() {
|
|
747
|
-
return
|
|
748
|
-
...BASE_CONFIG3,
|
|
749
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
750
|
-
serialize: serialize2
|
|
751
|
-
};
|
|
843
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
752
844
|
}
|
|
753
|
-
function
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
putativeTransactionSignature.length > 88
|
|
759
|
-
) {
|
|
760
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
761
|
-
}
|
|
762
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
763
|
-
const numBytes = bytes3.byteLength;
|
|
764
|
-
if (numBytes !== 64) {
|
|
765
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
766
|
-
}
|
|
767
|
-
} catch (e) {
|
|
768
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
769
|
-
cause: e
|
|
770
|
-
});
|
|
771
|
-
}
|
|
772
|
-
}
|
|
773
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
774
|
-
if (
|
|
775
|
-
// Lowest value (64 bytes of zeroes)
|
|
776
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
777
|
-
putativeTransactionSignature.length > 88
|
|
778
|
-
) {
|
|
779
|
-
return false;
|
|
780
|
-
}
|
|
781
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
782
|
-
const numBytes = bytes3.byteLength;
|
|
783
|
-
if (numBytes !== 64) {
|
|
784
|
-
return false;
|
|
785
|
-
}
|
|
786
|
-
return true;
|
|
845
|
+
function getTransactionDecoder(lastValidBlockHeight) {
|
|
846
|
+
return codecsCore.mapDecoder(
|
|
847
|
+
getCompiledTransactionDecoder(),
|
|
848
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
|
|
849
|
+
);
|
|
787
850
|
}
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
791
|
-
return signature;
|
|
851
|
+
function getTransactionCodec(lastValidBlockHeight) {
|
|
852
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
|
|
792
853
|
}
|
|
854
|
+
var base58Decoder;
|
|
793
855
|
function getSignatureFromTransaction(transaction) {
|
|
794
|
-
|
|
795
|
-
|
|
856
|
+
if (!base58Decoder)
|
|
857
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
858
|
+
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
859
|
+
if (!signatureBytes) {
|
|
796
860
|
throw new Error(
|
|
797
861
|
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
798
862
|
);
|
|
799
863
|
}
|
|
800
|
-
|
|
864
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
865
|
+
return transactionSignature;
|
|
801
866
|
}
|
|
802
|
-
async function
|
|
867
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
803
868
|
const compiledMessage = compileMessage(transaction);
|
|
804
869
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
870
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
805
871
|
const publicKeySignaturePairs = await Promise.all(
|
|
806
872
|
keyPairs.map(
|
|
807
|
-
(keyPair) => Promise.all([
|
|
808
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
809
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
810
|
-
])
|
|
873
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
811
874
|
)
|
|
812
875
|
);
|
|
813
876
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -820,33 +883,47 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
820
883
|
Object.freeze(out);
|
|
821
884
|
return out;
|
|
822
885
|
}
|
|
823
|
-
function
|
|
824
|
-
|
|
825
|
-
|
|
886
|
+
async function signTransaction(keyPairs, transaction) {
|
|
887
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
888
|
+
assertTransactionIsFullySigned(out);
|
|
889
|
+
Object.freeze(out);
|
|
890
|
+
return out;
|
|
891
|
+
}
|
|
892
|
+
function assertTransactionIsFullySigned(transaction) {
|
|
893
|
+
const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
|
|
894
|
+
const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
|
|
895
|
+
requiredSigners.forEach((address) => {
|
|
896
|
+
if (!transaction.signatures[address]) {
|
|
897
|
+
throw new Error(`Transaction is missing signature for address \`${address}\``);
|
|
898
|
+
}
|
|
899
|
+
});
|
|
826
900
|
}
|
|
827
|
-
|
|
828
|
-
// src/wire-transaction.ts
|
|
829
901
|
function getBase64EncodedWireTransaction(transaction) {
|
|
830
|
-
const wireTransactionBytes = getTransactionEncoder().
|
|
831
|
-
|
|
832
|
-
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
833
|
-
}
|
|
902
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
903
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
834
904
|
}
|
|
835
905
|
|
|
836
906
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
837
907
|
exports.assertIsBlockhash = assertIsBlockhash;
|
|
838
908
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
839
|
-
exports.
|
|
909
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
910
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
911
|
+
exports.compileMessage = compileMessage;
|
|
840
912
|
exports.createTransaction = createTransaction;
|
|
841
913
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
914
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
915
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
916
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
842
917
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
918
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
919
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
843
920
|
exports.getTransactionEncoder = getTransactionEncoder;
|
|
844
|
-
exports.
|
|
921
|
+
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
922
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
845
923
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
846
924
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
847
925
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
848
926
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
849
927
|
exports.signTransaction = signTransaction;
|
|
850
|
-
exports.transactionSignature = transactionSignature;
|
|
851
928
|
//# sourceMappingURL=out.js.map
|
|
852
929
|
//# sourceMappingURL=index.browser.cjs.map
|