@solana/transactions 2.0.0-experimental.f57da91 → 2.0.0-experimental.f5d64e6
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 +415 -314
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +407 -313
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +407 -313
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +415 -314
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +407 -313
- package/dist/index.node.js.map +1 -1
- package/dist/types/accounts.d.ts +2 -2
- package/dist/types/accounts.d.ts.map +1 -1
- package/dist/types/blockhash.d.ts +4 -3
- 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 +3 -3
- package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
- package/dist/types/compile-header.d.ts +1 -1
- package/dist/types/compile-instructions.d.ts +1 -1
- package/dist/types/compile-lifetime-token.d.ts +1 -1
- package/dist/types/compile-static-accounts.d.ts +3 -3
- package/dist/types/compile-static-accounts.d.ts.map +1 -1
- package/dist/types/compile-transaction.d.ts +6 -7
- package/dist/types/compile-transaction.d.ts.map +1 -1
- package/dist/types/create-transaction.d.ts +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 -8
- package/dist/types/durable-nonce.d.ts.map +1 -1
- package/dist/types/fee-payer.d.ts +6 -6
- package/dist/types/fee-payer.d.ts.map +1 -1
- package/dist/types/index.d.ts +11 -9
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/instructions.d.ts +2 -2
- package/dist/types/message.d.ts +6 -10
- 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 +5 -3
- package/dist/types/serializers/header.d.ts.map +1 -1
- package/dist/types/serializers/index.d.ts +2 -1
- package/dist/types/serializers/index.d.ts.map +1 -1
- package/dist/types/serializers/instruction.d.ts +5 -3
- package/dist/types/serializers/instruction.d.ts.map +1 -1
- package/dist/types/serializers/message.d.ts +5 -5
- package/dist/types/serializers/message.d.ts.map +1 -1
- package/dist/types/serializers/transaction-version.d.ts +5 -5
- 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 -13
- 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/unsigned-transaction.d.ts +1 -1
- package/dist/types/wire-transaction.d.ts +2 -2
- package/dist/types/wire-transaction.d.ts.map +1 -1
- package/package.json +19 -15
- package/dist/index.development.js +0 -1384
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -25
- 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,11 +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');
|
|
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
|
-
//
|
|
8
|
-
var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
|
|
11
|
+
// src/blockhash.ts
|
|
9
12
|
|
|
10
13
|
// src/unsigned-transaction.ts
|
|
11
14
|
function getUnsignedTransaction(transaction) {
|
|
@@ -22,7 +25,10 @@ function getUnsignedTransaction(transaction) {
|
|
|
22
25
|
}
|
|
23
26
|
|
|
24
27
|
// src/blockhash.ts
|
|
28
|
+
var base58Encoder;
|
|
25
29
|
function assertIsBlockhash(putativeBlockhash) {
|
|
30
|
+
if (!base58Encoder)
|
|
31
|
+
base58Encoder = codecsStrings.getBase58Encoder();
|
|
26
32
|
try {
|
|
27
33
|
if (
|
|
28
34
|
// Lowest value (32 bytes of zeroes)
|
|
@@ -31,8 +37,8 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
31
37
|
) {
|
|
32
38
|
throw new Error("Expected input string to decode to a byte array of length 32.");
|
|
33
39
|
}
|
|
34
|
-
const
|
|
35
|
-
const numBytes =
|
|
40
|
+
const bytes = base58Encoder.encode(putativeBlockhash);
|
|
41
|
+
const numBytes = bytes.byteLength;
|
|
36
42
|
if (numBytes !== 32) {
|
|
37
43
|
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
38
44
|
}
|
|
@@ -42,6 +48,22 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
42
48
|
});
|
|
43
49
|
}
|
|
44
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
|
+
}
|
|
45
67
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
46
68
|
if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
|
|
47
69
|
return transaction;
|
|
@@ -117,7 +139,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
117
139
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
118
140
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
119
141
|
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
|
|
142
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
121
143
|
}
|
|
122
144
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
123
145
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -125,21 +147,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
125
147
|
function isDurableNonceTransaction(transaction) {
|
|
126
148
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
127
149
|
}
|
|
150
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
151
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
152
|
+
}
|
|
128
153
|
function setTransactionLifetimeUsingDurableNonce({
|
|
129
154
|
nonce,
|
|
130
155
|
nonceAccountAddress,
|
|
131
156
|
nonceAuthorityAddress
|
|
132
157
|
}, transaction) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
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
|
+
];
|
|
136
178
|
}
|
|
137
179
|
const out = {
|
|
138
180
|
...getUnsignedTransaction(transaction),
|
|
139
|
-
instructions:
|
|
140
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
141
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
142
|
-
],
|
|
181
|
+
instructions: newInstructions,
|
|
143
182
|
lifetimeConstraint: {
|
|
144
183
|
nonce
|
|
145
184
|
}
|
|
@@ -230,7 +269,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
230
269
|
const shouldReplaceEntry = (
|
|
231
270
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
232
271
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
233
|
-
(addressComparator
|
|
272
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
234
273
|
accountMeta.lookupTableAddress,
|
|
235
274
|
entry.lookupTableAddress
|
|
236
275
|
) < 0
|
|
@@ -336,7 +375,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
336
375
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
337
376
|
return leftIsWritable ? -1 : 1;
|
|
338
377
|
}
|
|
339
|
-
addressComparator
|
|
378
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
340
379
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
341
380
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
342
381
|
} else {
|
|
@@ -349,16 +388,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
349
388
|
return orderedAccounts;
|
|
350
389
|
}
|
|
351
390
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
352
|
-
var _a;
|
|
353
391
|
const index = {};
|
|
354
392
|
for (const account of orderedAccounts) {
|
|
355
393
|
if (!("lookupTableAddress" in account)) {
|
|
356
394
|
continue;
|
|
357
395
|
}
|
|
358
|
-
const entry = index[
|
|
396
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
359
397
|
readableIndices: [],
|
|
360
398
|
writableIndices: []
|
|
361
|
-
}
|
|
399
|
+
};
|
|
362
400
|
if (account.role === AccountRole.WRITABLE) {
|
|
363
401
|
entry.writableIndices.push(account.addressIndex);
|
|
364
402
|
} else {
|
|
@@ -444,346 +482,395 @@ function compileMessage(transaction) {
|
|
|
444
482
|
version: transaction.version
|
|
445
483
|
};
|
|
446
484
|
}
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
if ("signatures" in transaction) {
|
|
453
|
-
signatures = [];
|
|
454
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
455
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
456
|
-
}
|
|
457
|
-
} else {
|
|
458
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
459
|
-
}
|
|
460
|
-
return {
|
|
461
|
-
compiledMessage,
|
|
462
|
-
signatures
|
|
463
|
-
};
|
|
464
|
-
}
|
|
465
|
-
function getAddressTableLookupCodec() {
|
|
466
|
-
return umiSerializers.struct(
|
|
467
|
-
[
|
|
468
|
-
[
|
|
469
|
-
"lookupTableAddress",
|
|
470
|
-
addresses.getAddressCodec(
|
|
471
|
-
__DEV__ ? {
|
|
472
|
-
description: "The address of the address lookup table account from which instruction addresses should be looked up"
|
|
473
|
-
} : void 0
|
|
474
|
-
)
|
|
475
|
-
],
|
|
485
|
+
var memoizedAddressTableLookupEncoder;
|
|
486
|
+
function getAddressTableLookupEncoder() {
|
|
487
|
+
if (!memoizedAddressTableLookupEncoder) {
|
|
488
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
489
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
476
490
|
[
|
|
477
491
|
"writableIndices",
|
|
478
|
-
|
|
479
|
-
...__DEV__ ? {
|
|
480
|
-
description: "The indices of the accounts in the lookup table that should be loaded as writeable"
|
|
481
|
-
} : null,
|
|
482
|
-
size: umiSerializers.shortU16()
|
|
483
|
-
})
|
|
492
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
484
493
|
],
|
|
485
494
|
[
|
|
486
495
|
"readableIndices",
|
|
487
|
-
|
|
488
|
-
...__DEV__ ? {
|
|
489
|
-
description: "The indices of the accounts in the lookup table that should be loaded as read-only"
|
|
490
|
-
} : void 0,
|
|
491
|
-
size: umiSerializers.shortU16()
|
|
492
|
-
})
|
|
496
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
493
497
|
]
|
|
494
|
-
]
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
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;
|
|
499
587
|
}
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
} : void 0
|
|
517
|
-
)
|
|
518
|
-
],
|
|
519
|
-
[
|
|
520
|
-
"numReadonlyNonSignerAccounts",
|
|
521
|
-
umiSerializers.u8(
|
|
522
|
-
__DEV__ ? {
|
|
523
|
-
description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
|
|
524
|
-
} : void 0
|
|
525
|
-
)
|
|
526
|
-
]
|
|
527
|
-
],
|
|
528
|
-
__DEV__ ? {
|
|
529
|
-
description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
|
|
530
|
-
} : void 0
|
|
531
|
-
);
|
|
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
|
+
});
|
|
532
604
|
}
|
|
533
|
-
function
|
|
534
|
-
return
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
[
|
|
557
|
-
"data",
|
|
558
|
-
umiSerializers.bytes({
|
|
559
|
-
description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
|
|
560
|
-
size: umiSerializers.shortU16()
|
|
561
|
-
})
|
|
562
|
-
]
|
|
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
|
+
}
|
|
616
|
+
}
|
|
617
|
+
});
|
|
618
|
+
}
|
|
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()]
|
|
563
629
|
]),
|
|
564
630
|
(value) => {
|
|
565
|
-
if (value.
|
|
631
|
+
if (value.version === "legacy") {
|
|
566
632
|
return value;
|
|
567
633
|
}
|
|
568
634
|
return {
|
|
569
635
|
...value,
|
|
570
|
-
|
|
571
|
-
data: value.data ?? new Uint8Array(0)
|
|
636
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
572
637
|
};
|
|
638
|
+
}
|
|
639
|
+
);
|
|
640
|
+
}
|
|
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
|
+
];
|
|
649
|
+
}
|
|
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
|
+
];
|
|
659
|
+
}
|
|
660
|
+
function getAddressTableLookupArrayEncoder() {
|
|
661
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
662
|
+
}
|
|
663
|
+
function getAddressTableLookupArrayDecoder() {
|
|
664
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
665
|
+
}
|
|
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
|
+
}
|
|
573
674
|
},
|
|
574
|
-
(
|
|
575
|
-
if (
|
|
576
|
-
return
|
|
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);
|
|
577
680
|
}
|
|
578
|
-
const { accountIndices, data, ...rest } = value;
|
|
579
|
-
return {
|
|
580
|
-
...rest,
|
|
581
|
-
...accountIndices.length ? { accountIndices } : null,
|
|
582
|
-
...data.byteLength ? { data } : null
|
|
583
|
-
};
|
|
584
681
|
}
|
|
585
|
-
);
|
|
682
|
+
});
|
|
586
683
|
}
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
);
|
|
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
|
+
});
|
|
594
691
|
}
|
|
595
|
-
function
|
|
596
|
-
return ()
|
|
597
|
-
throw getError("decoder", name);
|
|
598
|
-
};
|
|
692
|
+
function getCompiledMessageCodec() {
|
|
693
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
599
694
|
}
|
|
600
695
|
|
|
601
|
-
// src/
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
611
|
-
return ["legacy", offset];
|
|
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
|
+
}
|
|
612
705
|
} else {
|
|
613
|
-
|
|
614
|
-
return [version, offset + 1];
|
|
706
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
615
707
|
}
|
|
708
|
+
return {
|
|
709
|
+
compiledMessage,
|
|
710
|
+
signatures
|
|
711
|
+
};
|
|
616
712
|
}
|
|
617
|
-
function
|
|
618
|
-
|
|
619
|
-
|
|
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++;
|
|
620
739
|
}
|
|
621
|
-
|
|
622
|
-
|
|
740
|
+
for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
|
|
741
|
+
accountMetas.push({
|
|
742
|
+
address: message.staticAccounts[accountIndex],
|
|
743
|
+
role: AccountRole.READONLY
|
|
744
|
+
});
|
|
745
|
+
accountIndex++;
|
|
623
746
|
}
|
|
624
|
-
return
|
|
747
|
+
return accountMetas;
|
|
625
748
|
}
|
|
626
|
-
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;
|
|
627
756
|
return {
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
757
|
+
programAddress,
|
|
758
|
+
...accounts && accounts.length ? { accounts } : {},
|
|
759
|
+
...data && data.length ? { data } : {}
|
|
631
760
|
};
|
|
632
761
|
}
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
};
|
|
640
|
-
function serialize2(compiledMessage) {
|
|
641
|
-
if (compiledMessage.version === "legacy") {
|
|
642
|
-
return umiSerializers.struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
|
|
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
|
+
};
|
|
643
769
|
} else {
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
return {
|
|
654
|
-
...value,
|
|
655
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
656
|
-
};
|
|
657
|
-
}
|
|
658
|
-
).serialize(compiledMessage);
|
|
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
|
+
};
|
|
659
779
|
}
|
|
660
780
|
}
|
|
661
|
-
function
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
]
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
}
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
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
|
+
);
|
|
701
822
|
}
|
|
702
823
|
|
|
703
824
|
// src/serializers/transaction.ts
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
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([
|
|
712
833
|
[
|
|
713
834
|
"signatures",
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
size: umiSerializers.shortU16()
|
|
835
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
836
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
717
837
|
})
|
|
718
838
|
],
|
|
719
|
-
["compiledMessage",
|
|
720
|
-
])
|
|
839
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
840
|
+
]);
|
|
721
841
|
}
|
|
722
842
|
function getTransactionEncoder() {
|
|
723
|
-
return
|
|
724
|
-
...BASE_CONFIG3,
|
|
725
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
726
|
-
serialize: serialize3
|
|
727
|
-
};
|
|
843
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
728
844
|
}
|
|
729
|
-
function
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
putativeTransactionSignature.length > 88
|
|
735
|
-
) {
|
|
736
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
737
|
-
}
|
|
738
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
739
|
-
const numBytes = bytes3.byteLength;
|
|
740
|
-
if (numBytes !== 64) {
|
|
741
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
742
|
-
}
|
|
743
|
-
} catch (e) {
|
|
744
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
745
|
-
cause: e
|
|
746
|
-
});
|
|
747
|
-
}
|
|
748
|
-
}
|
|
749
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
750
|
-
if (
|
|
751
|
-
// Lowest value (64 bytes of zeroes)
|
|
752
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
753
|
-
putativeTransactionSignature.length > 88
|
|
754
|
-
) {
|
|
755
|
-
return false;
|
|
756
|
-
}
|
|
757
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
758
|
-
const numBytes = bytes3.byteLength;
|
|
759
|
-
if (numBytes !== 64) {
|
|
760
|
-
return false;
|
|
761
|
-
}
|
|
762
|
-
return true;
|
|
845
|
+
function getTransactionDecoder(lastValidBlockHeight) {
|
|
846
|
+
return codecsCore.mapDecoder(
|
|
847
|
+
getCompiledTransactionDecoder(),
|
|
848
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
|
|
849
|
+
);
|
|
763
850
|
}
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
767
|
-
return signature;
|
|
851
|
+
function getTransactionCodec(lastValidBlockHeight) {
|
|
852
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
|
|
768
853
|
}
|
|
854
|
+
var base58Decoder;
|
|
769
855
|
function getSignatureFromTransaction(transaction) {
|
|
770
|
-
|
|
771
|
-
|
|
856
|
+
if (!base58Decoder)
|
|
857
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
858
|
+
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
859
|
+
if (!signatureBytes) {
|
|
772
860
|
throw new Error(
|
|
773
861
|
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
774
862
|
);
|
|
775
863
|
}
|
|
776
|
-
|
|
864
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
865
|
+
return transactionSignature;
|
|
777
866
|
}
|
|
778
|
-
async function
|
|
867
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
779
868
|
const compiledMessage = compileMessage(transaction);
|
|
780
869
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
870
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
781
871
|
const publicKeySignaturePairs = await Promise.all(
|
|
782
872
|
keyPairs.map(
|
|
783
|
-
(keyPair) => Promise.all([
|
|
784
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
785
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
786
|
-
])
|
|
873
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
787
874
|
)
|
|
788
875
|
);
|
|
789
876
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -796,33 +883,47 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
796
883
|
Object.freeze(out);
|
|
797
884
|
return out;
|
|
798
885
|
}
|
|
799
|
-
function
|
|
800
|
-
|
|
801
|
-
|
|
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
|
+
});
|
|
802
900
|
}
|
|
803
|
-
|
|
804
|
-
// src/wire-transaction.ts
|
|
805
901
|
function getBase64EncodedWireTransaction(transaction) {
|
|
806
|
-
const wireTransactionBytes = getTransactionEncoder().
|
|
807
|
-
|
|
808
|
-
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
809
|
-
}
|
|
902
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
903
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
810
904
|
}
|
|
811
905
|
|
|
812
906
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
813
907
|
exports.assertIsBlockhash = assertIsBlockhash;
|
|
814
908
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
815
|
-
exports.
|
|
909
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
910
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
911
|
+
exports.compileMessage = compileMessage;
|
|
816
912
|
exports.createTransaction = createTransaction;
|
|
817
913
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
914
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
915
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
916
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
818
917
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
918
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
919
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
819
920
|
exports.getTransactionEncoder = getTransactionEncoder;
|
|
820
|
-
exports.
|
|
921
|
+
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
922
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
821
923
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
822
924
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
823
925
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
824
926
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
825
927
|
exports.signTransaction = signTransaction;
|
|
826
|
-
exports.transactionSignature = transactionSignature;
|
|
827
928
|
//# sourceMappingURL=out.js.map
|
|
828
929
|
//# sourceMappingURL=index.browser.cjs.map
|