@solana/transactions 2.0.0-experimental.867084a → 2.0.0-experimental.8792aa2
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 +497 -337
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +482 -335
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +482 -335
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +497 -337
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +482 -335
- 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 +9 -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 +13 -8
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/instructions.d.ts +4 -2
- package/dist/types/instructions.d.ts.map +1 -1
- 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 +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 -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 -5
- package/dist/types/serializers/transaction.d.ts.map +1 -1
- package/dist/types/signatures.d.ts +9 -11
- 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 +25 -19
- package/dist/index.development.js +0 -1373
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -23
- 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,38 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var codecsStrings = require('@solana/codecs-strings');
|
|
4
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');
|
|
5
10
|
var keys = require('@solana/keys');
|
|
6
11
|
|
|
7
|
-
// ../
|
|
8
|
-
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
|
+
}
|
|
9
36
|
|
|
10
37
|
// src/unsigned-transaction.ts
|
|
11
38
|
function getUnsignedTransaction(transaction) {
|
|
@@ -22,24 +49,20 @@ function getUnsignedTransaction(transaction) {
|
|
|
22
49
|
}
|
|
23
50
|
|
|
24
51
|
// src/blockhash.ts
|
|
25
|
-
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;
|
|
26
56
|
try {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (numBytes !== 32) {
|
|
37
|
-
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
38
|
-
}
|
|
39
|
-
} catch (e) {
|
|
40
|
-
throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
|
|
41
|
-
cause: e
|
|
42
|
-
});
|
|
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");
|
|
43
66
|
}
|
|
44
67
|
}
|
|
45
68
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
@@ -117,7 +140,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
117
140
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
118
141
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
119
142
|
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
|
|
143
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
121
144
|
}
|
|
122
145
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
123
146
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -125,21 +148,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
125
148
|
function isDurableNonceTransaction(transaction) {
|
|
126
149
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
127
150
|
}
|
|
151
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
152
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
153
|
+
}
|
|
128
154
|
function setTransactionLifetimeUsingDurableNonce({
|
|
129
155
|
nonce,
|
|
130
156
|
nonceAccountAddress,
|
|
131
157
|
nonceAuthorityAddress
|
|
132
158
|
}, transaction) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
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
|
+
];
|
|
136
179
|
}
|
|
137
180
|
const out = {
|
|
138
181
|
...getUnsignedTransaction(transaction),
|
|
139
|
-
instructions:
|
|
140
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
141
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
142
|
-
],
|
|
182
|
+
instructions: newInstructions,
|
|
143
183
|
lifetimeConstraint: {
|
|
144
184
|
nonce
|
|
145
185
|
}
|
|
@@ -163,21 +203,172 @@ function setTransactionFeePayer(feePayer, transaction) {
|
|
|
163
203
|
|
|
164
204
|
// src/instructions.ts
|
|
165
205
|
function appendTransactionInstruction(instruction, transaction) {
|
|
206
|
+
return appendTransactionInstructions([instruction], transaction);
|
|
207
|
+
}
|
|
208
|
+
function appendTransactionInstructions(instructions, transaction) {
|
|
166
209
|
const out = {
|
|
167
210
|
...getUnsignedTransaction(transaction),
|
|
168
|
-
instructions: [...transaction.instructions,
|
|
211
|
+
instructions: [...transaction.instructions, ...instructions]
|
|
169
212
|
};
|
|
170
213
|
Object.freeze(out);
|
|
171
214
|
return out;
|
|
172
215
|
}
|
|
173
216
|
function prependTransactionInstruction(instruction, transaction) {
|
|
217
|
+
return prependTransactionInstructions([instruction], transaction);
|
|
218
|
+
}
|
|
219
|
+
function prependTransactionInstructions(instructions, transaction) {
|
|
174
220
|
const out = {
|
|
175
221
|
...getUnsignedTransaction(transaction),
|
|
176
|
-
instructions: [
|
|
222
|
+
instructions: [...instructions, ...transaction.instructions]
|
|
177
223
|
};
|
|
178
224
|
Object.freeze(out);
|
|
179
225
|
return out;
|
|
180
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
|
+
}
|
|
181
372
|
function upsert(addressMap, address, update) {
|
|
182
373
|
addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
|
|
183
374
|
}
|
|
@@ -230,7 +421,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
230
421
|
const shouldReplaceEntry = (
|
|
231
422
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
232
423
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
233
|
-
(addressComparator
|
|
424
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
234
425
|
accountMeta.lookupTableAddress,
|
|
235
426
|
entry.lookupTableAddress
|
|
236
427
|
) < 0
|
|
@@ -336,7 +527,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
336
527
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
337
528
|
return leftIsWritable ? -1 : 1;
|
|
338
529
|
}
|
|
339
|
-
addressComparator
|
|
530
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
340
531
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
341
532
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
342
533
|
} else {
|
|
@@ -349,23 +540,22 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
349
540
|
return orderedAccounts;
|
|
350
541
|
}
|
|
351
542
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
352
|
-
var _a;
|
|
353
543
|
const index = {};
|
|
354
544
|
for (const account of orderedAccounts) {
|
|
355
545
|
if (!("lookupTableAddress" in account)) {
|
|
356
546
|
continue;
|
|
357
547
|
}
|
|
358
|
-
const entry = index[
|
|
548
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
359
549
|
readableIndices: [],
|
|
360
550
|
writableIndices: []
|
|
361
|
-
}
|
|
551
|
+
};
|
|
362
552
|
if (account.role === AccountRole.WRITABLE) {
|
|
363
553
|
entry.writableIndices.push(account.addressIndex);
|
|
364
554
|
} else {
|
|
365
555
|
entry.readableIndices.push(account.addressIndex);
|
|
366
556
|
}
|
|
367
557
|
}
|
|
368
|
-
return Object.keys(index).sort(addresses.
|
|
558
|
+
return Object.keys(index).sort(addresses.getAddressComparator()).map((lookupTableAddress) => ({
|
|
369
559
|
lookupTableAddress,
|
|
370
560
|
...index[lookupTableAddress]
|
|
371
561
|
}));
|
|
@@ -444,294 +634,283 @@ function compileMessage(transaction) {
|
|
|
444
634
|
version: transaction.version
|
|
445
635
|
};
|
|
446
636
|
}
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
addresses.getBase58EncodedAddressCodec(
|
|
453
|
-
__DEV__ ? {
|
|
454
|
-
description: "The address of the address lookup table account from which instruction addresses should be looked up"
|
|
455
|
-
} : void 0
|
|
456
|
-
)
|
|
457
|
-
],
|
|
637
|
+
var memoizedAddressTableLookupEncoder;
|
|
638
|
+
function getAddressTableLookupEncoder() {
|
|
639
|
+
if (!memoizedAddressTableLookupEncoder) {
|
|
640
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
641
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
458
642
|
[
|
|
459
643
|
"writableIndices",
|
|
460
|
-
|
|
461
|
-
...__DEV__ ? {
|
|
462
|
-
description: "The indices of the accounts in the lookup table that should be loaded as writeable"
|
|
463
|
-
} : null,
|
|
464
|
-
size: umiSerializers.shortU16()
|
|
465
|
-
})
|
|
644
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
466
645
|
],
|
|
467
646
|
[
|
|
468
647
|
"readableIndices",
|
|
469
|
-
|
|
470
|
-
...__DEV__ ? {
|
|
471
|
-
description: "The indices of the accounts in the lookup table that should be loaded as read-only"
|
|
472
|
-
} : void 0,
|
|
473
|
-
size: umiSerializers.shortU16()
|
|
474
|
-
})
|
|
648
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
475
649
|
]
|
|
476
|
-
]
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
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
|
+
]);
|
|
683
|
+
}
|
|
684
|
+
function getMessageHeaderDecoder() {
|
|
685
|
+
return codecsDataStructures.getStructDecoder([
|
|
686
|
+
["numSignerAccounts", getMemoizedU8Decoder()],
|
|
687
|
+
["numReadonlySignerAccounts", getMemoizedU8Decoder()],
|
|
688
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
|
|
689
|
+
]);
|
|
690
|
+
}
|
|
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;
|
|
481
739
|
}
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
} : void 0
|
|
499
|
-
)
|
|
500
|
-
],
|
|
501
|
-
[
|
|
502
|
-
"numReadonlyNonSignerAccounts",
|
|
503
|
-
umiSerializers.u8(
|
|
504
|
-
__DEV__ ? {
|
|
505
|
-
description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
|
|
506
|
-
} : void 0
|
|
507
|
-
)
|
|
508
|
-
]
|
|
509
|
-
],
|
|
510
|
-
__DEV__ ? {
|
|
511
|
-
description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
|
|
512
|
-
} : void 0
|
|
513
|
-
);
|
|
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
|
+
});
|
|
514
756
|
}
|
|
515
|
-
function
|
|
516
|
-
return
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
[
|
|
539
|
-
"data",
|
|
540
|
-
umiSerializers.bytes({
|
|
541
|
-
description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
|
|
542
|
-
size: umiSerializers.shortU16()
|
|
543
|
-
})
|
|
544
|
-
]
|
|
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()]
|
|
545
781
|
]),
|
|
546
782
|
(value) => {
|
|
547
|
-
if (value.
|
|
783
|
+
if (value.version === "legacy") {
|
|
548
784
|
return value;
|
|
549
785
|
}
|
|
550
786
|
return {
|
|
551
787
|
...value,
|
|
552
|
-
|
|
553
|
-
data: value.data ?? new Uint8Array(0)
|
|
788
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
554
789
|
};
|
|
790
|
+
}
|
|
791
|
+
);
|
|
792
|
+
}
|
|
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
|
+
];
|
|
801
|
+
}
|
|
802
|
+
function getPreludeStructDecoderTuple() {
|
|
803
|
+
return [
|
|
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()]
|
|
810
|
+
];
|
|
811
|
+
}
|
|
812
|
+
function getAddressTableLookupArrayEncoder() {
|
|
813
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
814
|
+
}
|
|
815
|
+
function getAddressTableLookupArrayDecoder() {
|
|
816
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
817
|
+
}
|
|
818
|
+
function getCompiledMessageEncoder() {
|
|
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
|
+
}
|
|
555
826
|
},
|
|
556
|
-
(
|
|
557
|
-
if (
|
|
558
|
-
return
|
|
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);
|
|
559
832
|
}
|
|
560
|
-
const { accountIndices, data, ...rest } = value;
|
|
561
|
-
return {
|
|
562
|
-
...rest,
|
|
563
|
-
...accountIndices.length ? { accountIndices } : null,
|
|
564
|
-
...data.byteLength ? { data } : null
|
|
565
|
-
};
|
|
566
833
|
}
|
|
567
|
-
);
|
|
834
|
+
});
|
|
568
835
|
}
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
);
|
|
836
|
+
function getCompiledMessageDecoder() {
|
|
837
|
+
return codecsCore.mapDecoder(codecsDataStructures.getStructDecoder(getPreludeStructDecoderTuple()), ({ addressTableLookups, ...restOfMessage }) => {
|
|
838
|
+
if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
|
|
839
|
+
return restOfMessage;
|
|
840
|
+
}
|
|
841
|
+
return { ...restOfMessage, addressTableLookups };
|
|
842
|
+
});
|
|
576
843
|
}
|
|
577
|
-
function
|
|
578
|
-
return ()
|
|
579
|
-
throw getError("decoder", name);
|
|
580
|
-
};
|
|
844
|
+
function getCompiledMessageCodec() {
|
|
845
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
581
846
|
}
|
|
582
847
|
|
|
583
|
-
// src/
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
593
|
-
return ["legacy", offset];
|
|
848
|
+
// src/compile-transaction.ts
|
|
849
|
+
function getCompiledTransaction(transaction) {
|
|
850
|
+
const compiledMessage = compileMessage(transaction);
|
|
851
|
+
let signatures;
|
|
852
|
+
if ("signatures" in transaction) {
|
|
853
|
+
signatures = [];
|
|
854
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
855
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
856
|
+
}
|
|
594
857
|
} else {
|
|
595
|
-
|
|
596
|
-
return [version, offset + 1];
|
|
597
|
-
}
|
|
598
|
-
}
|
|
599
|
-
function serialize(value) {
|
|
600
|
-
if (value === "legacy") {
|
|
601
|
-
return new Uint8Array();
|
|
602
|
-
}
|
|
603
|
-
if (value < 0 || value > 127) {
|
|
604
|
-
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
858
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
605
859
|
}
|
|
606
|
-
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
607
|
-
}
|
|
608
|
-
function getTransactionVersionCodec() {
|
|
609
860
|
return {
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
serialize
|
|
861
|
+
compiledMessage,
|
|
862
|
+
signatures
|
|
613
863
|
};
|
|
614
864
|
}
|
|
615
865
|
|
|
616
|
-
// src/serializers/
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
function serialize2(compiledMessage) {
|
|
623
|
-
if (compiledMessage.version === "legacy") {
|
|
624
|
-
return umiSerializers.struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
|
|
625
|
-
} else {
|
|
626
|
-
return umiSerializers.mapSerializer(
|
|
627
|
-
umiSerializers.struct([
|
|
628
|
-
...getPreludeStructSerializerTuple(),
|
|
629
|
-
["addressTableLookups", getAddressTableLookupsSerializer()]
|
|
630
|
-
]),
|
|
631
|
-
(value) => {
|
|
632
|
-
if (value.version === "legacy") {
|
|
633
|
-
return value;
|
|
634
|
-
}
|
|
635
|
-
return {
|
|
636
|
-
...value,
|
|
637
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
638
|
-
};
|
|
639
|
-
}
|
|
640
|
-
).serialize(compiledMessage);
|
|
641
|
-
}
|
|
866
|
+
// src/serializers/transaction.ts
|
|
867
|
+
function getCompiledTransactionEncoder() {
|
|
868
|
+
return codecsDataStructures.getStructEncoder([
|
|
869
|
+
["signatures", codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), { size: codecsNumbers.getShortU16Encoder() })],
|
|
870
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
871
|
+
]);
|
|
642
872
|
}
|
|
643
|
-
function
|
|
644
|
-
return [
|
|
645
|
-
["version", getTransactionVersionCodec()],
|
|
646
|
-
["header", getMessageHeaderCodec()],
|
|
647
|
-
[
|
|
648
|
-
"staticAccounts",
|
|
649
|
-
umiSerializers.array(addresses.getBase58EncodedAddressCodec(), {
|
|
650
|
-
description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
|
|
651
|
-
size: umiSerializers.shortU16()
|
|
652
|
-
})
|
|
653
|
-
],
|
|
873
|
+
function getCompiledTransactionDecoder() {
|
|
874
|
+
return codecsDataStructures.getStructDecoder([
|
|
654
875
|
[
|
|
655
|
-
"
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
encoding: umiSerializers.base58,
|
|
659
|
-
size: 32
|
|
876
|
+
"signatures",
|
|
877
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
878
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
660
879
|
})
|
|
661
880
|
],
|
|
662
|
-
[
|
|
663
|
-
|
|
664
|
-
umiSerializers.array(getInstructionCodec(), {
|
|
665
|
-
description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
|
|
666
|
-
size: umiSerializers.shortU16()
|
|
667
|
-
})
|
|
668
|
-
]
|
|
669
|
-
];
|
|
881
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
882
|
+
]);
|
|
670
883
|
}
|
|
671
|
-
function
|
|
672
|
-
return
|
|
673
|
-
...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
|
|
674
|
-
size: umiSerializers.shortU16()
|
|
675
|
-
});
|
|
884
|
+
function getTransactionEncoder() {
|
|
885
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
676
886
|
}
|
|
677
|
-
function
|
|
678
|
-
return
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
};
|
|
887
|
+
function getTransactionDecoder(config) {
|
|
888
|
+
return codecsCore.mapDecoder(
|
|
889
|
+
getCompiledTransactionDecoder(),
|
|
890
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
891
|
+
);
|
|
683
892
|
}
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
function assertIsTransactionSignature(putativeTransactionSignature) {
|
|
687
|
-
try {
|
|
688
|
-
if (
|
|
689
|
-
// Lowest value (64 bytes of zeroes)
|
|
690
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
691
|
-
putativeTransactionSignature.length > 88
|
|
692
|
-
) {
|
|
693
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
694
|
-
}
|
|
695
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
696
|
-
const numBytes = bytes3.byteLength;
|
|
697
|
-
if (numBytes !== 64) {
|
|
698
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
699
|
-
}
|
|
700
|
-
} catch (e) {
|
|
701
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
702
|
-
cause: e
|
|
703
|
-
});
|
|
704
|
-
}
|
|
893
|
+
function getTransactionCodec(config) {
|
|
894
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
705
895
|
}
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
) {
|
|
712
|
-
|
|
713
|
-
}
|
|
714
|
-
const bytes3 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
715
|
-
const numBytes = bytes3.byteLength;
|
|
716
|
-
if (numBytes !== 64) {
|
|
717
|
-
return false;
|
|
896
|
+
var base58Decoder;
|
|
897
|
+
function getSignatureFromTransaction(transaction) {
|
|
898
|
+
if (!base58Decoder)
|
|
899
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
900
|
+
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
901
|
+
if (!signatureBytes) {
|
|
902
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
|
|
718
903
|
}
|
|
719
|
-
|
|
904
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
905
|
+
return transactionSignature;
|
|
720
906
|
}
|
|
721
|
-
async function
|
|
722
|
-
const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
|
|
723
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
724
|
-
return signature;
|
|
725
|
-
}
|
|
726
|
-
async function signTransaction(keyPairs, transaction) {
|
|
907
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
727
908
|
const compiledMessage = compileMessage(transaction);
|
|
728
909
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
910
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
729
911
|
const publicKeySignaturePairs = await Promise.all(
|
|
730
912
|
keyPairs.map(
|
|
731
|
-
(keyPair) => Promise.all([
|
|
732
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
733
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
734
|
-
])
|
|
913
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
735
914
|
)
|
|
736
915
|
);
|
|
737
916
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -744,76 +923,57 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
744
923
|
Object.freeze(out);
|
|
745
924
|
return out;
|
|
746
925
|
}
|
|
747
|
-
function
|
|
748
|
-
|
|
749
|
-
|
|
926
|
+
async function signTransaction(keyPairs, transaction) {
|
|
927
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
928
|
+
assertTransactionIsFullySigned(out);
|
|
929
|
+
Object.freeze(out);
|
|
930
|
+
return out;
|
|
750
931
|
}
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
const
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
759
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
932
|
+
function assertTransactionIsFullySigned(transaction) {
|
|
933
|
+
const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
|
|
934
|
+
const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
|
|
935
|
+
const missingSigs = [];
|
|
936
|
+
requiredSigners.forEach((address) => {
|
|
937
|
+
if (!transaction.signatures[address]) {
|
|
938
|
+
missingSigs.push(address);
|
|
760
939
|
}
|
|
761
|
-
}
|
|
762
|
-
|
|
940
|
+
});
|
|
941
|
+
if (missingSigs.length > 0) {
|
|
942
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
|
|
943
|
+
addresses: missingSigs
|
|
944
|
+
});
|
|
763
945
|
}
|
|
764
|
-
return {
|
|
765
|
-
compiledMessage,
|
|
766
|
-
signatures
|
|
767
|
-
};
|
|
768
946
|
}
|
|
769
|
-
|
|
770
|
-
// src/serializers/transaction.ts
|
|
771
|
-
var BASE_CONFIG3 = {
|
|
772
|
-
description: __DEV__ ? "The wire format of a Solana transaction" : "",
|
|
773
|
-
fixedSize: null,
|
|
774
|
-
maxSize: null
|
|
775
|
-
};
|
|
776
|
-
function serialize3(transaction) {
|
|
777
|
-
const compiledTransaction = getCompiledTransaction(transaction);
|
|
778
|
-
return umiSerializers.struct([
|
|
779
|
-
[
|
|
780
|
-
"signatures",
|
|
781
|
-
umiSerializers.array(umiSerializers.bytes({ size: 64 }), {
|
|
782
|
-
...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
|
|
783
|
-
size: umiSerializers.shortU16()
|
|
784
|
-
})
|
|
785
|
-
],
|
|
786
|
-
["compiledMessage", getCompiledMessageEncoder()]
|
|
787
|
-
]).serialize(compiledTransaction);
|
|
788
|
-
}
|
|
789
|
-
function getTransactionEncoder() {
|
|
790
|
-
return {
|
|
791
|
-
...BASE_CONFIG3,
|
|
792
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
793
|
-
serialize: serialize3
|
|
794
|
-
};
|
|
795
|
-
}
|
|
796
|
-
|
|
797
|
-
// src/wire-transaction.ts
|
|
798
947
|
function getBase64EncodedWireTransaction(transaction) {
|
|
799
|
-
const wireTransactionBytes = getTransactionEncoder().
|
|
800
|
-
|
|
801
|
-
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
802
|
-
}
|
|
948
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
949
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
803
950
|
}
|
|
804
951
|
|
|
805
952
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
806
|
-
exports.
|
|
953
|
+
exports.appendTransactionInstructions = appendTransactionInstructions;
|
|
807
954
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
808
|
-
exports.
|
|
955
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
956
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
957
|
+
exports.compileMessage = compileMessage;
|
|
809
958
|
exports.createTransaction = createTransaction;
|
|
959
|
+
exports.decompileTransaction = decompileTransaction;
|
|
810
960
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
811
|
-
exports.
|
|
961
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
962
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
963
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
964
|
+
exports.getCompiledTransactionDecoder = getCompiledTransactionDecoder;
|
|
965
|
+
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
966
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
967
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
968
|
+
exports.getTransactionEncoder = getTransactionEncoder;
|
|
969
|
+
exports.getUnsignedTransaction = getUnsignedTransaction;
|
|
970
|
+
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
971
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
812
972
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
973
|
+
exports.prependTransactionInstructions = prependTransactionInstructions;
|
|
813
974
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
814
975
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
815
976
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
816
977
|
exports.signTransaction = signTransaction;
|
|
817
|
-
exports.transactionSignature = transactionSignature;
|
|
818
978
|
//# sourceMappingURL=out.js.map
|
|
819
979
|
//# sourceMappingURL=index.browser.cjs.map
|