@solana/transactions 2.0.0-experimental.19791fe → 2.0.0-experimental.1a0940d
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 +427 -238
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +420 -238
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +420 -238
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +427 -238
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +418 -238
- 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 +5 -7
- 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 +13 -0
- package/dist/types/decompile-transaction.d.ts.map +1 -0
- package/dist/types/durable-nonce.d.ts +7 -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 +12 -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 -5
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
- package/dist/types/serializers/header.d.ts +5 -5
- 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 -5
- 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 +9 -6
- 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 +1 -1
- package/dist/types/wire-transaction.d.ts.map +1 -1
- package/package.json +18 -16
- package/dist/index.development.js +0 -1378
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -26
package/dist/index.browser.cjs
CHANGED
|
@@ -1,32 +1,19 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var codecsStrings = require('@solana/codecs-strings');
|
|
4
|
+
var addresses = require('@solana/addresses');
|
|
5
|
+
var functional = require('@solana/functional');
|
|
4
6
|
var codecsCore = require('@solana/codecs-core');
|
|
5
7
|
var codecsDataStructures = require('@solana/codecs-data-structures');
|
|
6
8
|
var codecsNumbers = require('@solana/codecs-numbers');
|
|
7
|
-
var
|
|
8
|
-
var codecsStrings = require('@solana/codecs-strings');
|
|
9
|
+
var errors = require('@solana/errors');
|
|
9
10
|
var keys = require('@solana/keys');
|
|
10
11
|
|
|
11
|
-
// ../
|
|
12
|
-
var
|
|
13
|
-
|
|
14
|
-
// src/unsigned-transaction.ts
|
|
15
|
-
function getUnsignedTransaction(transaction) {
|
|
16
|
-
if ("signatures" in transaction) {
|
|
17
|
-
const {
|
|
18
|
-
signatures: _,
|
|
19
|
-
// eslint-disable-line @typescript-eslint/no-unused-vars
|
|
20
|
-
...unsignedTransaction
|
|
21
|
-
} = transaction;
|
|
22
|
-
return unsignedTransaction;
|
|
23
|
-
} else {
|
|
24
|
-
return transaction;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
// src/blockhash.ts
|
|
12
|
+
// ../rpc-types/dist/index.browser.js
|
|
13
|
+
var base58Encoder;
|
|
29
14
|
function assertIsBlockhash(putativeBlockhash) {
|
|
15
|
+
if (!base58Encoder)
|
|
16
|
+
base58Encoder = codecsStrings.getBase58Encoder();
|
|
30
17
|
try {
|
|
31
18
|
if (
|
|
32
19
|
// Lowest value (32 bytes of zeroes)
|
|
@@ -35,7 +22,7 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
35
22
|
) {
|
|
36
23
|
throw new Error("Expected input string to decode to a byte array of length 32.");
|
|
37
24
|
}
|
|
38
|
-
const bytes =
|
|
25
|
+
const bytes = base58Encoder.encode(putativeBlockhash);
|
|
39
26
|
const numBytes = bytes.byteLength;
|
|
40
27
|
if (numBytes !== 32) {
|
|
41
28
|
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
@@ -46,6 +33,38 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
46
33
|
});
|
|
47
34
|
}
|
|
48
35
|
}
|
|
36
|
+
|
|
37
|
+
// src/unsigned-transaction.ts
|
|
38
|
+
function getUnsignedTransaction(transaction) {
|
|
39
|
+
if ("signatures" in transaction) {
|
|
40
|
+
const {
|
|
41
|
+
signatures: _,
|
|
42
|
+
// eslint-disable-line @typescript-eslint/no-unused-vars
|
|
43
|
+
...unsignedTransaction
|
|
44
|
+
} = transaction;
|
|
45
|
+
return unsignedTransaction;
|
|
46
|
+
} else {
|
|
47
|
+
return transaction;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// src/blockhash.ts
|
|
52
|
+
function isTransactionWithBlockhashLifetime(transaction) {
|
|
53
|
+
const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
|
|
54
|
+
if (!lifetimeConstraintShapeMatches)
|
|
55
|
+
return false;
|
|
56
|
+
try {
|
|
57
|
+
assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
|
|
58
|
+
return true;
|
|
59
|
+
} catch {
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function assertIsTransactionWithBlockhashLifetime(transaction) {
|
|
64
|
+
if (!isTransactionWithBlockhashLifetime(transaction)) {
|
|
65
|
+
throw new Error("Transaction does not have a blockhash lifetime");
|
|
66
|
+
}
|
|
67
|
+
}
|
|
49
68
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
50
69
|
if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
|
|
51
70
|
return transaction;
|
|
@@ -121,7 +140,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
121
140
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
122
141
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
123
142
|
instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
|
|
124
|
-
instruction.accounts[2].address != null && instruction.accounts[2].role
|
|
143
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
125
144
|
}
|
|
126
145
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
127
146
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -129,21 +148,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
129
148
|
function isDurableNonceTransaction(transaction) {
|
|
130
149
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
131
150
|
}
|
|
151
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
152
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
153
|
+
}
|
|
132
154
|
function setTransactionLifetimeUsingDurableNonce({
|
|
133
155
|
nonce,
|
|
134
156
|
nonceAccountAddress,
|
|
135
157
|
nonceAuthorityAddress
|
|
136
158
|
}, transaction) {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
159
|
+
let newInstructions;
|
|
160
|
+
const firstInstruction = transaction.instructions[0];
|
|
161
|
+
if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
|
|
162
|
+
if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
|
|
163
|
+
if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
|
|
164
|
+
return transaction;
|
|
165
|
+
} else {
|
|
166
|
+
newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
|
|
167
|
+
}
|
|
168
|
+
} else {
|
|
169
|
+
newInstructions = [
|
|
170
|
+
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
171
|
+
...transaction.instructions.slice(1)
|
|
172
|
+
];
|
|
173
|
+
}
|
|
174
|
+
} else {
|
|
175
|
+
newInstructions = [
|
|
176
|
+
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
177
|
+
...transaction.instructions
|
|
178
|
+
];
|
|
140
179
|
}
|
|
141
180
|
const out = {
|
|
142
181
|
...getUnsignedTransaction(transaction),
|
|
143
|
-
instructions:
|
|
144
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
145
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
146
|
-
],
|
|
182
|
+
instructions: newInstructions,
|
|
147
183
|
lifetimeConstraint: {
|
|
148
184
|
nonce
|
|
149
185
|
}
|
|
@@ -182,6 +218,151 @@ function prependTransactionInstruction(instruction, transaction) {
|
|
|
182
218
|
Object.freeze(out);
|
|
183
219
|
return out;
|
|
184
220
|
}
|
|
221
|
+
|
|
222
|
+
// src/decompile-transaction.ts
|
|
223
|
+
function getAccountMetas(message) {
|
|
224
|
+
const { header } = message;
|
|
225
|
+
const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
|
|
226
|
+
const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
|
|
227
|
+
const accountMetas = [];
|
|
228
|
+
let accountIndex = 0;
|
|
229
|
+
for (let i = 0; i < numWritableSignerAccounts; i++) {
|
|
230
|
+
accountMetas.push({
|
|
231
|
+
address: message.staticAccounts[accountIndex],
|
|
232
|
+
role: AccountRole.WRITABLE_SIGNER
|
|
233
|
+
});
|
|
234
|
+
accountIndex++;
|
|
235
|
+
}
|
|
236
|
+
for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
|
|
237
|
+
accountMetas.push({
|
|
238
|
+
address: message.staticAccounts[accountIndex],
|
|
239
|
+
role: AccountRole.READONLY_SIGNER
|
|
240
|
+
});
|
|
241
|
+
accountIndex++;
|
|
242
|
+
}
|
|
243
|
+
for (let i = 0; i < numWritableNonSignerAccounts; i++) {
|
|
244
|
+
accountMetas.push({
|
|
245
|
+
address: message.staticAccounts[accountIndex],
|
|
246
|
+
role: AccountRole.WRITABLE
|
|
247
|
+
});
|
|
248
|
+
accountIndex++;
|
|
249
|
+
}
|
|
250
|
+
for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
|
|
251
|
+
accountMetas.push({
|
|
252
|
+
address: message.staticAccounts[accountIndex],
|
|
253
|
+
role: AccountRole.READONLY
|
|
254
|
+
});
|
|
255
|
+
accountIndex++;
|
|
256
|
+
}
|
|
257
|
+
return accountMetas;
|
|
258
|
+
}
|
|
259
|
+
function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTableAddress) {
|
|
260
|
+
const compiledAddressTableLookupAddresses = compiledAddressTableLookups.map((l) => l.lookupTableAddress);
|
|
261
|
+
const missing = compiledAddressTableLookupAddresses.filter((a) => addressesByLookupTableAddress[a] === void 0);
|
|
262
|
+
if (missing.length > 0) {
|
|
263
|
+
const missingAddresses = missing.join(", ");
|
|
264
|
+
throw new Error(`Addresses not provided for lookup tables: [${missingAddresses}]`);
|
|
265
|
+
}
|
|
266
|
+
const readOnlyMetas = [];
|
|
267
|
+
const writableMetas = [];
|
|
268
|
+
for (const lookup of compiledAddressTableLookups) {
|
|
269
|
+
const addresses = addressesByLookupTableAddress[lookup.lookupTableAddress];
|
|
270
|
+
const highestIndex = Math.max(...lookup.readableIndices, ...lookup.writableIndices);
|
|
271
|
+
if (highestIndex >= addresses.length) {
|
|
272
|
+
throw new Error(
|
|
273
|
+
`Cannot look up index ${highestIndex} in lookup table [${lookup.lookupTableAddress}]. The lookup table may have been extended since the addresses provided were retrieved.`
|
|
274
|
+
);
|
|
275
|
+
}
|
|
276
|
+
const readOnlyForLookup = lookup.readableIndices.map((r) => ({
|
|
277
|
+
address: addresses[r],
|
|
278
|
+
addressIndex: r,
|
|
279
|
+
lookupTableAddress: lookup.lookupTableAddress,
|
|
280
|
+
role: AccountRole.READONLY
|
|
281
|
+
}));
|
|
282
|
+
readOnlyMetas.push(...readOnlyForLookup);
|
|
283
|
+
const writableForLookup = lookup.writableIndices.map((w) => ({
|
|
284
|
+
address: addresses[w],
|
|
285
|
+
addressIndex: w,
|
|
286
|
+
lookupTableAddress: lookup.lookupTableAddress,
|
|
287
|
+
role: AccountRole.WRITABLE
|
|
288
|
+
}));
|
|
289
|
+
writableMetas.push(...writableForLookup);
|
|
290
|
+
}
|
|
291
|
+
return [...writableMetas, ...readOnlyMetas];
|
|
292
|
+
}
|
|
293
|
+
function convertInstruction(instruction, accountMetas) {
|
|
294
|
+
const programAddress = accountMetas[instruction.programAddressIndex]?.address;
|
|
295
|
+
if (!programAddress) {
|
|
296
|
+
throw new Error(`Could not find program address at index ${instruction.programAddressIndex}`);
|
|
297
|
+
}
|
|
298
|
+
const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
|
|
299
|
+
const { data } = instruction;
|
|
300
|
+
return {
|
|
301
|
+
programAddress,
|
|
302
|
+
...accounts && accounts.length ? { accounts } : {},
|
|
303
|
+
...data && data.length ? { data } : {}
|
|
304
|
+
};
|
|
305
|
+
}
|
|
306
|
+
function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
|
|
307
|
+
if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
|
|
308
|
+
return {
|
|
309
|
+
blockhash: messageLifetimeToken,
|
|
310
|
+
lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
|
|
311
|
+
// U64 MAX
|
|
312
|
+
};
|
|
313
|
+
} else {
|
|
314
|
+
const nonceAccountAddress = firstInstruction.accounts[0].address;
|
|
315
|
+
addresses.assertIsAddress(nonceAccountAddress);
|
|
316
|
+
const nonceAuthorityAddress = firstInstruction.accounts[2].address;
|
|
317
|
+
addresses.assertIsAddress(nonceAuthorityAddress);
|
|
318
|
+
return {
|
|
319
|
+
nonce: messageLifetimeToken,
|
|
320
|
+
nonceAccountAddress,
|
|
321
|
+
nonceAuthorityAddress
|
|
322
|
+
};
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
function convertSignatures(compiledTransaction) {
|
|
326
|
+
const {
|
|
327
|
+
compiledMessage: { staticAccounts },
|
|
328
|
+
signatures
|
|
329
|
+
} = compiledTransaction;
|
|
330
|
+
return signatures.reduce((acc, sig, index) => {
|
|
331
|
+
const allZeros = sig.every((byte) => byte === 0);
|
|
332
|
+
if (allZeros)
|
|
333
|
+
return acc;
|
|
334
|
+
const address = staticAccounts[index];
|
|
335
|
+
return { ...acc, [address]: sig };
|
|
336
|
+
}, {});
|
|
337
|
+
}
|
|
338
|
+
function decompileTransaction(compiledTransaction, config) {
|
|
339
|
+
const { compiledMessage } = compiledTransaction;
|
|
340
|
+
const feePayer = compiledMessage.staticAccounts[0];
|
|
341
|
+
if (!feePayer)
|
|
342
|
+
throw new Error("No fee payer set in CompiledTransaction");
|
|
343
|
+
const accountMetas = getAccountMetas(compiledMessage);
|
|
344
|
+
const accountLookupMetas = "addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups !== void 0 && compiledMessage.addressTableLookups.length > 0 ? getAddressLookupMetas(compiledMessage.addressTableLookups, config?.addressesByLookupTableAddress ?? {}) : [];
|
|
345
|
+
const transactionMetas = [...accountMetas, ...accountLookupMetas];
|
|
346
|
+
const instructions = compiledMessage.instructions.map(
|
|
347
|
+
(compiledInstruction) => convertInstruction(compiledInstruction, transactionMetas)
|
|
348
|
+
);
|
|
349
|
+
const firstInstruction = instructions[0];
|
|
350
|
+
const lifetimeConstraint = getLifetimeConstraint(
|
|
351
|
+
compiledMessage.lifetimeToken,
|
|
352
|
+
firstInstruction,
|
|
353
|
+
config?.lastValidBlockHeight
|
|
354
|
+
);
|
|
355
|
+
const signatures = convertSignatures(compiledTransaction);
|
|
356
|
+
return functional.pipe(
|
|
357
|
+
createTransaction({ version: compiledMessage.version }),
|
|
358
|
+
(tx) => setTransactionFeePayer(feePayer, tx),
|
|
359
|
+
(tx) => instructions.reduce((acc, instruction) => {
|
|
360
|
+
return appendTransactionInstruction(instruction, acc);
|
|
361
|
+
}, tx),
|
|
362
|
+
(tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
|
|
363
|
+
(tx) => Object.keys(signatures).length > 0 ? { ...tx, signatures } : tx
|
|
364
|
+
);
|
|
365
|
+
}
|
|
185
366
|
function upsert(addressMap, address, update) {
|
|
186
367
|
addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
|
|
187
368
|
}
|
|
@@ -234,7 +415,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
234
415
|
const shouldReplaceEntry = (
|
|
235
416
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
236
417
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
237
|
-
(addressComparator
|
|
418
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
238
419
|
accountMeta.lookupTableAddress,
|
|
239
420
|
entry.lookupTableAddress
|
|
240
421
|
) < 0
|
|
@@ -340,7 +521,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
340
521
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
341
522
|
return leftIsWritable ? -1 : 1;
|
|
342
523
|
}
|
|
343
|
-
addressComparator
|
|
524
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
344
525
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
345
526
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
346
527
|
} else {
|
|
@@ -353,16 +534,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
353
534
|
return orderedAccounts;
|
|
354
535
|
}
|
|
355
536
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
356
|
-
var _a;
|
|
357
537
|
const index = {};
|
|
358
538
|
for (const account of orderedAccounts) {
|
|
359
539
|
if (!("lookupTableAddress" in account)) {
|
|
360
540
|
continue;
|
|
361
541
|
}
|
|
362
|
-
const entry = index[
|
|
542
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
363
543
|
readableIndices: [],
|
|
364
544
|
writableIndices: []
|
|
365
|
-
}
|
|
545
|
+
};
|
|
366
546
|
if (account.role === AccountRole.WRITABLE) {
|
|
367
547
|
entry.writableIndices.push(account.addressIndex);
|
|
368
548
|
} else {
|
|
@@ -448,101 +628,68 @@ function compileMessage(transaction) {
|
|
|
448
628
|
version: transaction.version
|
|
449
629
|
};
|
|
450
630
|
}
|
|
451
|
-
|
|
452
|
-
// src/compile-transaction.ts
|
|
453
|
-
function getCompiledTransaction(transaction) {
|
|
454
|
-
const compiledMessage = compileMessage(transaction);
|
|
455
|
-
let signatures;
|
|
456
|
-
if ("signatures" in transaction) {
|
|
457
|
-
signatures = [];
|
|
458
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
459
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
460
|
-
}
|
|
461
|
-
} else {
|
|
462
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
463
|
-
}
|
|
464
|
-
return {
|
|
465
|
-
compiledMessage,
|
|
466
|
-
signatures
|
|
467
|
-
};
|
|
468
|
-
}
|
|
469
|
-
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
470
|
-
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
471
|
-
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
472
|
-
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";
|
|
473
631
|
var memoizedAddressTableLookupEncoder;
|
|
474
632
|
function getAddressTableLookupEncoder() {
|
|
475
633
|
if (!memoizedAddressTableLookupEncoder) {
|
|
476
|
-
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder(
|
|
634
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
635
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
477
636
|
[
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
"writableIndices",
|
|
481
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
482
|
-
description: writableIndicesDescription,
|
|
483
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
484
|
-
})
|
|
485
|
-
],
|
|
486
|
-
[
|
|
487
|
-
"readableIndices",
|
|
488
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
489
|
-
description: readableIndicesDescription,
|
|
490
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
491
|
-
})
|
|
492
|
-
]
|
|
637
|
+
"writableIndices",
|
|
638
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
493
639
|
],
|
|
494
|
-
|
|
495
|
-
|
|
640
|
+
[
|
|
641
|
+
"readableIndices",
|
|
642
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
643
|
+
]
|
|
644
|
+
]);
|
|
496
645
|
}
|
|
497
646
|
return memoizedAddressTableLookupEncoder;
|
|
498
647
|
}
|
|
648
|
+
var memoizedAddressTableLookupDecoder;
|
|
649
|
+
function getAddressTableLookupDecoder() {
|
|
650
|
+
if (!memoizedAddressTableLookupDecoder) {
|
|
651
|
+
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder([
|
|
652
|
+
["lookupTableAddress", addresses.getAddressDecoder()],
|
|
653
|
+
["writableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
654
|
+
["readableIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })]
|
|
655
|
+
]);
|
|
656
|
+
}
|
|
657
|
+
return memoizedAddressTableLookupDecoder;
|
|
658
|
+
}
|
|
499
659
|
var memoizedU8Encoder;
|
|
500
660
|
function getMemoizedU8Encoder() {
|
|
501
661
|
if (!memoizedU8Encoder)
|
|
502
662
|
memoizedU8Encoder = codecsNumbers.getU8Encoder();
|
|
503
663
|
return memoizedU8Encoder;
|
|
504
664
|
}
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
};
|
|
665
|
+
var memoizedU8Decoder;
|
|
666
|
+
function getMemoizedU8Decoder() {
|
|
667
|
+
if (!memoizedU8Decoder)
|
|
668
|
+
memoizedU8Decoder = codecsNumbers.getU8Decoder();
|
|
669
|
+
return memoizedU8Decoder;
|
|
511
670
|
}
|
|
512
|
-
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;
|
|
513
|
-
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;
|
|
514
|
-
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
515
|
-
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
516
671
|
function getMessageHeaderEncoder() {
|
|
517
|
-
return codecsDataStructures.getStructEncoder(
|
|
518
|
-
[
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
672
|
+
return codecsDataStructures.getStructEncoder([
|
|
673
|
+
["numSignerAccounts", getMemoizedU8Encoder()],
|
|
674
|
+
["numReadonlySignerAccounts", getMemoizedU8Encoder()],
|
|
675
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
|
|
676
|
+
]);
|
|
677
|
+
}
|
|
678
|
+
function getMessageHeaderDecoder() {
|
|
679
|
+
return codecsDataStructures.getStructDecoder([
|
|
680
|
+
["numSignerAccounts", getMemoizedU8Decoder()],
|
|
681
|
+
["numReadonlySignerAccounts", getMemoizedU8Decoder()],
|
|
682
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
|
|
683
|
+
]);
|
|
527
684
|
}
|
|
528
|
-
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
529
|
-
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
530
|
-
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";
|
|
531
|
-
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
532
685
|
var memoizedGetInstructionEncoder;
|
|
533
686
|
function getInstructionEncoder() {
|
|
534
687
|
if (!memoizedGetInstructionEncoder) {
|
|
535
688
|
memoizedGetInstructionEncoder = codecsCore.mapEncoder(
|
|
536
689
|
codecsDataStructures.getStructEncoder([
|
|
537
|
-
["programAddressIndex", codecsNumbers.getU8Encoder(
|
|
538
|
-
[
|
|
539
|
-
|
|
540
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder({ description: accountIndexDescription }), {
|
|
541
|
-
description: accountIndicesDescription,
|
|
542
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
543
|
-
})
|
|
544
|
-
],
|
|
545
|
-
["data", codecsDataStructures.getBytesEncoder({ description: dataDescription, size: codecsNumbers.getShortU16Encoder() })]
|
|
690
|
+
["programAddressIndex", codecsNumbers.getU8Encoder()],
|
|
691
|
+
["accountIndices", codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
692
|
+
["data", codecsDataStructures.getBytesEncoder({ size: codecsNumbers.getShortU16Encoder() })]
|
|
546
693
|
]),
|
|
547
694
|
// Convert an instruction to have all fields defined
|
|
548
695
|
(instruction) => {
|
|
@@ -559,33 +706,64 @@ function getInstructionEncoder() {
|
|
|
559
706
|
}
|
|
560
707
|
return memoizedGetInstructionEncoder;
|
|
561
708
|
}
|
|
562
|
-
var
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
709
|
+
var memoizedGetInstructionDecoder;
|
|
710
|
+
function getInstructionDecoder() {
|
|
711
|
+
if (!memoizedGetInstructionDecoder) {
|
|
712
|
+
memoizedGetInstructionDecoder = codecsCore.mapDecoder(
|
|
713
|
+
codecsDataStructures.getStructDecoder([
|
|
714
|
+
["programAddressIndex", codecsNumbers.getU8Decoder()],
|
|
715
|
+
["accountIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
716
|
+
["data", codecsDataStructures.getBytesDecoder({ size: codecsNumbers.getShortU16Decoder() })]
|
|
717
|
+
]),
|
|
718
|
+
// Convert an instruction to exclude optional fields if they are empty
|
|
719
|
+
(instruction) => {
|
|
720
|
+
if (instruction.accountIndices.length && instruction.data.byteLength) {
|
|
721
|
+
return instruction;
|
|
722
|
+
}
|
|
723
|
+
const { accountIndices, data, ...rest } = instruction;
|
|
724
|
+
return {
|
|
725
|
+
...rest,
|
|
726
|
+
...accountIndices.length ? { accountIndices } : null,
|
|
727
|
+
...data.byteLength ? { data } : null
|
|
728
|
+
};
|
|
729
|
+
}
|
|
730
|
+
);
|
|
574
731
|
}
|
|
575
|
-
return
|
|
732
|
+
return memoizedGetInstructionDecoder;
|
|
576
733
|
}
|
|
734
|
+
var VERSION_FLAG_MASK = 128;
|
|
577
735
|
function getTransactionVersionEncoder() {
|
|
578
|
-
return {
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
736
|
+
return codecsCore.createEncoder({
|
|
737
|
+
getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
|
|
738
|
+
maxSize: 1,
|
|
739
|
+
write: (value, bytes, offset) => {
|
|
740
|
+
if (value === "legacy") {
|
|
741
|
+
return offset;
|
|
742
|
+
}
|
|
743
|
+
if (value < 0 || value > 127) {
|
|
744
|
+
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
745
|
+
}
|
|
746
|
+
bytes.set([value | VERSION_FLAG_MASK], offset);
|
|
747
|
+
return offset + 1;
|
|
748
|
+
}
|
|
749
|
+
});
|
|
750
|
+
}
|
|
751
|
+
function getTransactionVersionDecoder() {
|
|
752
|
+
return codecsCore.createDecoder({
|
|
753
|
+
maxSize: 1,
|
|
754
|
+
read: (bytes, offset) => {
|
|
755
|
+
const firstByte = bytes[offset];
|
|
756
|
+
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
757
|
+
return ["legacy", offset];
|
|
758
|
+
} else {
|
|
759
|
+
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
760
|
+
return [version, offset + 1];
|
|
761
|
+
}
|
|
762
|
+
}
|
|
763
|
+
});
|
|
582
764
|
}
|
|
583
765
|
|
|
584
766
|
// src/serializers/message.ts
|
|
585
|
-
var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
|
|
586
|
-
var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
|
|
587
|
-
var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
|
|
588
|
-
var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
|
|
589
767
|
function getCompiledMessageLegacyEncoder() {
|
|
590
768
|
return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
|
|
591
769
|
}
|
|
@@ -610,134 +788,123 @@ function getPreludeStructEncoderTuple() {
|
|
|
610
788
|
return [
|
|
611
789
|
["version", getTransactionVersionEncoder()],
|
|
612
790
|
["header", getMessageHeaderEncoder()],
|
|
613
|
-
[
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
[
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
})
|
|
627
|
-
],
|
|
628
|
-
[
|
|
629
|
-
"instructions",
|
|
630
|
-
codecsDataStructures.getArrayEncoder(getInstructionEncoder(), {
|
|
631
|
-
description: instructionsDescription,
|
|
632
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
633
|
-
})
|
|
634
|
-
]
|
|
791
|
+
["staticAccounts", codecsDataStructures.getArrayEncoder(addresses.getAddressEncoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
792
|
+
["lifetimeToken", codecsStrings.getStringEncoder({ encoding: codecsStrings.getBase58Encoder(), size: 32 })],
|
|
793
|
+
["instructions", codecsDataStructures.getArrayEncoder(getInstructionEncoder(), { size: codecsNumbers.getShortU16Encoder() })]
|
|
794
|
+
];
|
|
795
|
+
}
|
|
796
|
+
function getPreludeStructDecoderTuple() {
|
|
797
|
+
return [
|
|
798
|
+
["version", getTransactionVersionDecoder()],
|
|
799
|
+
["header", getMessageHeaderDecoder()],
|
|
800
|
+
["staticAccounts", codecsDataStructures.getArrayDecoder(addresses.getAddressDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
801
|
+
["lifetimeToken", codecsStrings.getStringDecoder({ encoding: codecsStrings.getBase58Decoder(), size: 32 })],
|
|
802
|
+
["instructions", codecsDataStructures.getArrayDecoder(getInstructionDecoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
803
|
+
["addressTableLookups", getAddressTableLookupArrayDecoder()]
|
|
635
804
|
];
|
|
636
805
|
}
|
|
637
806
|
function getAddressTableLookupArrayEncoder() {
|
|
638
|
-
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), {
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
});
|
|
807
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
808
|
+
}
|
|
809
|
+
function getAddressTableLookupArrayDecoder() {
|
|
810
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
642
811
|
}
|
|
643
|
-
var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
|
|
644
812
|
function getCompiledMessageEncoder() {
|
|
645
|
-
return {
|
|
646
|
-
|
|
647
|
-
encode: (compiledMessage) => {
|
|
813
|
+
return codecsCore.createEncoder({
|
|
814
|
+
getSizeFromValue: (compiledMessage) => {
|
|
648
815
|
if (compiledMessage.version === "legacy") {
|
|
649
|
-
return getCompiledMessageLegacyEncoder().
|
|
816
|
+
return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
|
|
650
817
|
} else {
|
|
651
|
-
return getCompiledMessageVersionedEncoder().
|
|
818
|
+
return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
|
|
652
819
|
}
|
|
653
820
|
},
|
|
654
|
-
|
|
655
|
-
|
|
821
|
+
write: (compiledMessage, bytes, offset) => {
|
|
822
|
+
if (compiledMessage.version === "legacy") {
|
|
823
|
+
return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
|
|
824
|
+
} else {
|
|
825
|
+
return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
|
|
826
|
+
}
|
|
827
|
+
}
|
|
828
|
+
});
|
|
829
|
+
}
|
|
830
|
+
function getCompiledMessageDecoder() {
|
|
831
|
+
return codecsCore.mapDecoder(codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
|
|
832
|
+
if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
|
|
833
|
+
return restOfMessage;
|
|
834
|
+
}
|
|
835
|
+
return { ...restOfMessage, addressTableLookups };
|
|
836
|
+
});
|
|
837
|
+
}
|
|
838
|
+
function getCompiledMessageCodec() {
|
|
839
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
840
|
+
}
|
|
841
|
+
|
|
842
|
+
// src/compile-transaction.ts
|
|
843
|
+
function getCompiledTransaction(transaction) {
|
|
844
|
+
const compiledMessage = compileMessage(transaction);
|
|
845
|
+
let signatures;
|
|
846
|
+
if ("signatures" in transaction) {
|
|
847
|
+
signatures = [];
|
|
848
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
849
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
850
|
+
}
|
|
851
|
+
} else {
|
|
852
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
853
|
+
}
|
|
854
|
+
return {
|
|
855
|
+
compiledMessage,
|
|
856
|
+
signatures
|
|
656
857
|
};
|
|
657
858
|
}
|
|
658
859
|
|
|
659
860
|
// src/serializers/transaction.ts
|
|
660
|
-
var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
|
|
661
|
-
var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
|
|
662
861
|
function getCompiledTransactionEncoder() {
|
|
663
|
-
return codecsDataStructures.getStructEncoder(
|
|
862
|
+
return codecsDataStructures.getStructEncoder([
|
|
863
|
+
["signatures", codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), { size: codecsNumbers.getShortU16Encoder() })],
|
|
864
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
865
|
+
]);
|
|
866
|
+
}
|
|
867
|
+
function getCompiledTransactionDecoder() {
|
|
868
|
+
return codecsDataStructures.getStructDecoder([
|
|
664
869
|
[
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
670
|
-
})
|
|
671
|
-
],
|
|
672
|
-
["compiledMessage", getCompiledMessageEncoder()]
|
|
870
|
+
"signatures",
|
|
871
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
872
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
873
|
+
})
|
|
673
874
|
],
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
}
|
|
677
|
-
);
|
|
875
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
876
|
+
]);
|
|
678
877
|
}
|
|
679
878
|
function getTransactionEncoder() {
|
|
680
879
|
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
681
880
|
}
|
|
682
|
-
function
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
putativeTransactionSignature.length > 88
|
|
688
|
-
) {
|
|
689
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
690
|
-
}
|
|
691
|
-
const bytes = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
692
|
-
const numBytes = bytes.byteLength;
|
|
693
|
-
if (numBytes !== 64) {
|
|
694
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
695
|
-
}
|
|
696
|
-
} catch (e) {
|
|
697
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
698
|
-
cause: e
|
|
699
|
-
});
|
|
700
|
-
}
|
|
701
|
-
}
|
|
702
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
703
|
-
if (
|
|
704
|
-
// Lowest value (64 bytes of zeroes)
|
|
705
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
706
|
-
putativeTransactionSignature.length > 88
|
|
707
|
-
) {
|
|
708
|
-
return false;
|
|
709
|
-
}
|
|
710
|
-
const bytes = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
711
|
-
const numBytes = bytes.byteLength;
|
|
712
|
-
if (numBytes !== 64) {
|
|
713
|
-
return false;
|
|
714
|
-
}
|
|
715
|
-
return true;
|
|
881
|
+
function getTransactionDecoder(config) {
|
|
882
|
+
return codecsCore.mapDecoder(
|
|
883
|
+
getCompiledTransactionDecoder(),
|
|
884
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
885
|
+
);
|
|
716
886
|
}
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
720
|
-
return signature;
|
|
887
|
+
function getTransactionCodec(config) {
|
|
888
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
721
889
|
}
|
|
890
|
+
var base58Decoder;
|
|
722
891
|
function getSignatureFromTransaction(transaction) {
|
|
892
|
+
if (!base58Decoder)
|
|
893
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
723
894
|
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
724
895
|
if (!signatureBytes) {
|
|
725
|
-
throw new
|
|
726
|
-
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
727
|
-
);
|
|
896
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
|
|
728
897
|
}
|
|
729
|
-
const
|
|
730
|
-
return
|
|
898
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
899
|
+
return transactionSignature;
|
|
731
900
|
}
|
|
732
|
-
async function
|
|
901
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
733
902
|
const compiledMessage = compileMessage(transaction);
|
|
734
903
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
904
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
735
905
|
const publicKeySignaturePairs = await Promise.all(
|
|
736
906
|
keyPairs.map(
|
|
737
|
-
(keyPair) => Promise.all([
|
|
738
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
739
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
740
|
-
])
|
|
907
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
741
908
|
)
|
|
742
909
|
);
|
|
743
910
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -750,32 +917,54 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
750
917
|
Object.freeze(out);
|
|
751
918
|
return out;
|
|
752
919
|
}
|
|
753
|
-
function
|
|
754
|
-
|
|
755
|
-
|
|
920
|
+
async function signTransaction(keyPairs, transaction) {
|
|
921
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
922
|
+
assertTransactionIsFullySigned(out);
|
|
923
|
+
Object.freeze(out);
|
|
924
|
+
return out;
|
|
925
|
+
}
|
|
926
|
+
function assertTransactionIsFullySigned(transaction) {
|
|
927
|
+
const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
|
|
928
|
+
const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
|
|
929
|
+
const missingSigs = [];
|
|
930
|
+
requiredSigners.forEach((address) => {
|
|
931
|
+
if (!transaction.signatures[address]) {
|
|
932
|
+
missingSigs.push(address);
|
|
933
|
+
}
|
|
934
|
+
});
|
|
935
|
+
if (missingSigs.length > 0) {
|
|
936
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
|
|
937
|
+
addresses: missingSigs
|
|
938
|
+
});
|
|
939
|
+
}
|
|
756
940
|
}
|
|
757
|
-
|
|
758
|
-
// src/wire-transaction.ts
|
|
759
941
|
function getBase64EncodedWireTransaction(transaction) {
|
|
760
942
|
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
761
|
-
|
|
762
|
-
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
763
|
-
}
|
|
943
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
764
944
|
}
|
|
765
945
|
|
|
766
946
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
767
|
-
exports.assertIsBlockhash = assertIsBlockhash;
|
|
768
947
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
769
|
-
exports.
|
|
948
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
949
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
950
|
+
exports.compileMessage = compileMessage;
|
|
770
951
|
exports.createTransaction = createTransaction;
|
|
952
|
+
exports.decompileTransaction = decompileTransaction;
|
|
771
953
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
954
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
955
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
956
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
957
|
+
exports.getCompiledTransactionDecoder = getCompiledTransactionDecoder;
|
|
772
958
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
959
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
960
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
773
961
|
exports.getTransactionEncoder = getTransactionEncoder;
|
|
774
962
|
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
775
|
-
exports.
|
|
963
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
776
964
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
777
965
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
778
966
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
779
967
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
780
968
|
exports.signTransaction = signTransaction;
|
|
781
|
-
|
|
969
|
+
//# sourceMappingURL=out.js.map
|
|
970
|
+
//# sourceMappingURL=index.browser.cjs.map
|