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