@solana/transactions 2.0.0-experimental.be901cf → 2.0.0-experimental.c098656
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +276 -5
- package/dist/index.browser.cjs +440 -343
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +431 -344
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +431 -344
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +442 -343
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +431 -344
- package/dist/index.node.js.map +1 -1
- package/dist/types/accounts.d.ts +2 -2
- 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 +1 -1
- 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 +7 -8
- package/dist/types/durable-nonce.d.ts.map +1 -0
- package/dist/types/fee-payer.d.ts +6 -6
- package/dist/types/fee-payer.d.ts.map +1 -0
- package/dist/types/index.d.ts +13 -9
- 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 -5
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -0
- package/dist/types/serializers/header.d.ts +5 -5
- package/dist/types/serializers/header.d.ts.map +1 -0
- package/dist/types/serializers/index.d.ts +2 -1
- package/dist/types/serializers/index.d.ts.map +1 -0
- package/dist/types/serializers/instruction.d.ts +5 -5
- 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 +9 -13
- package/dist/types/signatures.d.ts.map +1 -0
- package/dist/types/types.d.ts +6 -13
- package/dist/types/types.d.ts.map +1 -0
- package/dist/types/unsigned-transaction.d.ts +1 -1
- package/dist/types/unsigned-transaction.d.ts.map +1 -0
- package/dist/types/wire-transaction.d.ts +2 -2
- package/dist/types/wire-transaction.d.ts.map +1 -0
- package/package.json +17 -38
- package/dist/index.development.js +0 -2042
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -26
- package/dist/types/serializers/unimplemented.d.ts +0 -3
package/dist/index.browser.cjs
CHANGED
|
@@ -1,14 +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');
|
|
5
6
|
var codecsCore = require('@solana/codecs-core');
|
|
6
7
|
var codecsDataStructures = require('@solana/codecs-data-structures');
|
|
7
8
|
var codecsNumbers = require('@solana/codecs-numbers');
|
|
9
|
+
var errors = require('@solana/errors');
|
|
8
10
|
var keys = require('@solana/keys');
|
|
9
11
|
|
|
10
|
-
// ../
|
|
11
|
-
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
|
+
}
|
|
12
36
|
|
|
13
37
|
// src/unsigned-transaction.ts
|
|
14
38
|
function getUnsignedTransaction(transaction) {
|
|
@@ -25,24 +49,20 @@ function getUnsignedTransaction(transaction) {
|
|
|
25
49
|
}
|
|
26
50
|
|
|
27
51
|
// src/blockhash.ts
|
|
28
|
-
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;
|
|
29
56
|
try {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
if (numBytes !== 32) {
|
|
40
|
-
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
41
|
-
}
|
|
42
|
-
} catch (e) {
|
|
43
|
-
throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
|
|
44
|
-
cause: e
|
|
45
|
-
});
|
|
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");
|
|
46
66
|
}
|
|
47
67
|
}
|
|
48
68
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
@@ -120,7 +140,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
120
140
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
121
141
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
122
142
|
instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
|
|
123
|
-
instruction.accounts[2].address != null && instruction.accounts[2].role
|
|
143
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
124
144
|
}
|
|
125
145
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
126
146
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -128,21 +148,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
128
148
|
function isDurableNonceTransaction(transaction) {
|
|
129
149
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
130
150
|
}
|
|
151
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
152
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
153
|
+
}
|
|
131
154
|
function setTransactionLifetimeUsingDurableNonce({
|
|
132
155
|
nonce,
|
|
133
156
|
nonceAccountAddress,
|
|
134
157
|
nonceAuthorityAddress
|
|
135
158
|
}, transaction) {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
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
|
+
];
|
|
139
179
|
}
|
|
140
180
|
const out = {
|
|
141
181
|
...getUnsignedTransaction(transaction),
|
|
142
|
-
instructions:
|
|
143
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
144
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
145
|
-
],
|
|
182
|
+
instructions: newInstructions,
|
|
146
183
|
lifetimeConstraint: {
|
|
147
184
|
nonce
|
|
148
185
|
}
|
|
@@ -166,21 +203,172 @@ function setTransactionFeePayer(feePayer, transaction) {
|
|
|
166
203
|
|
|
167
204
|
// src/instructions.ts
|
|
168
205
|
function appendTransactionInstruction(instruction, transaction) {
|
|
206
|
+
return appendTransactionInstructions([instruction], transaction);
|
|
207
|
+
}
|
|
208
|
+
function appendTransactionInstructions(instructions, transaction) {
|
|
169
209
|
const out = {
|
|
170
210
|
...getUnsignedTransaction(transaction),
|
|
171
|
-
instructions: [...transaction.instructions,
|
|
211
|
+
instructions: [...transaction.instructions, ...instructions]
|
|
172
212
|
};
|
|
173
213
|
Object.freeze(out);
|
|
174
214
|
return out;
|
|
175
215
|
}
|
|
176
216
|
function prependTransactionInstruction(instruction, transaction) {
|
|
217
|
+
return prependTransactionInstructions([instruction], transaction);
|
|
218
|
+
}
|
|
219
|
+
function prependTransactionInstructions(instructions, transaction) {
|
|
177
220
|
const out = {
|
|
178
221
|
...getUnsignedTransaction(transaction),
|
|
179
|
-
instructions: [
|
|
222
|
+
instructions: [...instructions, ...transaction.instructions]
|
|
180
223
|
};
|
|
181
224
|
Object.freeze(out);
|
|
182
225
|
return out;
|
|
183
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
|
+
}
|
|
184
372
|
function upsert(addressMap, address, update) {
|
|
185
373
|
addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
|
|
186
374
|
}
|
|
@@ -233,7 +421,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
233
421
|
const shouldReplaceEntry = (
|
|
234
422
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
235
423
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
236
|
-
(addressComparator
|
|
424
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
237
425
|
accountMeta.lookupTableAddress,
|
|
238
426
|
entry.lookupTableAddress
|
|
239
427
|
) < 0
|
|
@@ -339,7 +527,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
339
527
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
340
528
|
return leftIsWritable ? -1 : 1;
|
|
341
529
|
}
|
|
342
|
-
addressComparator
|
|
530
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
343
531
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
344
532
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
345
533
|
} else {
|
|
@@ -352,16 +540,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
352
540
|
return orderedAccounts;
|
|
353
541
|
}
|
|
354
542
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
355
|
-
var _a;
|
|
356
543
|
const index = {};
|
|
357
544
|
for (const account of orderedAccounts) {
|
|
358
545
|
if (!("lookupTableAddress" in account)) {
|
|
359
546
|
continue;
|
|
360
547
|
}
|
|
361
|
-
const entry = index[
|
|
548
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
362
549
|
readableIndices: [],
|
|
363
550
|
writableIndices: []
|
|
364
|
-
}
|
|
551
|
+
};
|
|
365
552
|
if (account.role === AccountRole.WRITABLE) {
|
|
366
553
|
entry.writableIndices.push(account.addressIndex);
|
|
367
554
|
} else {
|
|
@@ -447,130 +634,68 @@ function compileMessage(transaction) {
|
|
|
447
634
|
version: transaction.version
|
|
448
635
|
};
|
|
449
636
|
}
|
|
450
|
-
|
|
451
|
-
// src/compile-transaction.ts
|
|
452
|
-
function getCompiledTransaction(transaction) {
|
|
453
|
-
const compiledMessage = compileMessage(transaction);
|
|
454
|
-
let signatures;
|
|
455
|
-
if ("signatures" in transaction) {
|
|
456
|
-
signatures = [];
|
|
457
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
458
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
459
|
-
}
|
|
460
|
-
} else {
|
|
461
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
462
|
-
}
|
|
463
|
-
return {
|
|
464
|
-
compiledMessage,
|
|
465
|
-
signatures
|
|
466
|
-
};
|
|
467
|
-
}
|
|
468
|
-
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
469
|
-
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
470
|
-
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
471
|
-
var addressTableLookupDescription = __DEV__ ? "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it" : "addressTableLookup";
|
|
472
637
|
var memoizedAddressTableLookupEncoder;
|
|
473
638
|
function getAddressTableLookupEncoder() {
|
|
474
639
|
if (!memoizedAddressTableLookupEncoder) {
|
|
475
|
-
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder(
|
|
640
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
641
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
476
642
|
[
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
"writableIndices",
|
|
480
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
481
|
-
description: writableIndicesDescription,
|
|
482
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
483
|
-
})
|
|
484
|
-
],
|
|
485
|
-
[
|
|
486
|
-
"readableIndices",
|
|
487
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
488
|
-
description: readableIndicesDescription,
|
|
489
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
490
|
-
})
|
|
491
|
-
]
|
|
643
|
+
"writableIndices",
|
|
644
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
492
645
|
],
|
|
493
|
-
|
|
494
|
-
|
|
646
|
+
[
|
|
647
|
+
"readableIndices",
|
|
648
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
649
|
+
]
|
|
650
|
+
]);
|
|
495
651
|
}
|
|
496
652
|
return memoizedAddressTableLookupEncoder;
|
|
497
653
|
}
|
|
498
654
|
var memoizedAddressTableLookupDecoder;
|
|
499
655
|
function getAddressTableLookupDecoder() {
|
|
500
656
|
if (!memoizedAddressTableLookupDecoder) {
|
|
501
|
-
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder(
|
|
502
|
-
[
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
507
|
-
description: writableIndicesDescription,
|
|
508
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
509
|
-
})
|
|
510
|
-
],
|
|
511
|
-
[
|
|
512
|
-
"readableIndices",
|
|
513
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
514
|
-
description: readableIndicesDescription,
|
|
515
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
516
|
-
})
|
|
517
|
-
]
|
|
518
|
-
],
|
|
519
|
-
{ description: addressTableLookupDescription }
|
|
520
|
-
);
|
|
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
|
+
]);
|
|
521
662
|
}
|
|
522
663
|
return memoizedAddressTableLookupDecoder;
|
|
523
664
|
}
|
|
524
|
-
|
|
525
|
-
|
|
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
|
+
]);
|
|
526
690
|
}
|
|
527
|
-
var memoizedU8Codec;
|
|
528
|
-
function getMemoizedU8Codec() {
|
|
529
|
-
if (!memoizedU8Codec)
|
|
530
|
-
memoizedU8Codec = codecsNumbers.getU8Codec();
|
|
531
|
-
return memoizedU8Codec;
|
|
532
|
-
}
|
|
533
|
-
function getMemoizedU8CodecDescription(description) {
|
|
534
|
-
const codec = getMemoizedU8Codec();
|
|
535
|
-
return {
|
|
536
|
-
...codec,
|
|
537
|
-
description: description ?? codec.description
|
|
538
|
-
};
|
|
539
|
-
}
|
|
540
|
-
var numSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" : void 0;
|
|
541
|
-
var numReadonlySignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable" : void 0;
|
|
542
|
-
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
543
|
-
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
544
|
-
function getMessageHeaderCodec() {
|
|
545
|
-
return codecsDataStructures.getStructCodec(
|
|
546
|
-
[
|
|
547
|
-
["numSignerAccounts", getMemoizedU8CodecDescription(numSignerAccountsDescription)],
|
|
548
|
-
["numReadonlySignerAccounts", getMemoizedU8CodecDescription(numReadonlySignerAccountsDescription)],
|
|
549
|
-
["numReadonlyNonSignerAccounts", getMemoizedU8CodecDescription(numReadonlyNonSignerAccountsDescription)]
|
|
550
|
-
],
|
|
551
|
-
{
|
|
552
|
-
description: messageHeaderDescription
|
|
553
|
-
}
|
|
554
|
-
);
|
|
555
|
-
}
|
|
556
|
-
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
557
|
-
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
558
|
-
var accountIndicesDescription = __DEV__ ? "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" : "accountIndices";
|
|
559
|
-
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
560
691
|
var memoizedGetInstructionEncoder;
|
|
561
692
|
function getInstructionEncoder() {
|
|
562
693
|
if (!memoizedGetInstructionEncoder) {
|
|
563
694
|
memoizedGetInstructionEncoder = codecsCore.mapEncoder(
|
|
564
695
|
codecsDataStructures.getStructEncoder([
|
|
565
|
-
["programAddressIndex", codecsNumbers.getU8Encoder(
|
|
566
|
-
[
|
|
567
|
-
|
|
568
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder({ description: accountIndexDescription }), {
|
|
569
|
-
description: accountIndicesDescription,
|
|
570
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
571
|
-
})
|
|
572
|
-
],
|
|
573
|
-
["data", codecsDataStructures.getBytesEncoder({ description: dataDescription, size: codecsNumbers.getShortU16Encoder() })]
|
|
696
|
+
["programAddressIndex", codecsNumbers.getU8Encoder()],
|
|
697
|
+
["accountIndices", codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
698
|
+
["data", codecsDataStructures.getBytesEncoder({ size: codecsNumbers.getShortU16Encoder() })]
|
|
574
699
|
]),
|
|
575
700
|
// Convert an instruction to have all fields defined
|
|
576
701
|
(instruction) => {
|
|
@@ -592,15 +717,9 @@ function getInstructionDecoder() {
|
|
|
592
717
|
if (!memoizedGetInstructionDecoder) {
|
|
593
718
|
memoizedGetInstructionDecoder = codecsCore.mapDecoder(
|
|
594
719
|
codecsDataStructures.getStructDecoder([
|
|
595
|
-
["programAddressIndex", codecsNumbers.getU8Decoder(
|
|
596
|
-
[
|
|
597
|
-
|
|
598
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder({ description: accountIndexDescription }), {
|
|
599
|
-
description: accountIndicesDescription,
|
|
600
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
601
|
-
})
|
|
602
|
-
],
|
|
603
|
-
["data", codecsDataStructures.getBytesDecoder({ description: dataDescription, size: codecsNumbers.getShortU16Decoder() })]
|
|
720
|
+
["programAddressIndex", codecsNumbers.getU8Decoder()],
|
|
721
|
+
["accountIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
722
|
+
["data", codecsDataStructures.getBytesDecoder({ size: codecsNumbers.getShortU16Decoder() })]
|
|
604
723
|
]),
|
|
605
724
|
// Convert an instruction to exclude optional fields if they are empty
|
|
606
725
|
(instruction) => {
|
|
@@ -618,225 +737,180 @@ function getInstructionDecoder() {
|
|
|
618
737
|
}
|
|
619
738
|
return memoizedGetInstructionDecoder;
|
|
620
739
|
}
|
|
621
|
-
function getInstructionCodec() {
|
|
622
|
-
return codecsCore.combineCodec(getInstructionEncoder(), getInstructionDecoder());
|
|
623
|
-
}
|
|
624
740
|
var VERSION_FLAG_MASK = 128;
|
|
625
|
-
var BASE_CONFIG = {
|
|
626
|
-
description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
|
|
627
|
-
fixedSize: null,
|
|
628
|
-
maxSize: 1
|
|
629
|
-
};
|
|
630
|
-
function decode(bytes2, offset = 0) {
|
|
631
|
-
const firstByte = bytes2[offset];
|
|
632
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
633
|
-
return ["legacy", offset];
|
|
634
|
-
} else {
|
|
635
|
-
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
636
|
-
return [version, offset + 1];
|
|
637
|
-
}
|
|
638
|
-
}
|
|
639
|
-
function encode(value) {
|
|
640
|
-
if (value === "legacy") {
|
|
641
|
-
return new Uint8Array();
|
|
642
|
-
}
|
|
643
|
-
if (value < 0 || value > 127) {
|
|
644
|
-
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
645
|
-
}
|
|
646
|
-
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
647
|
-
}
|
|
648
|
-
function getTransactionVersionDecoder() {
|
|
649
|
-
return {
|
|
650
|
-
...BASE_CONFIG,
|
|
651
|
-
decode
|
|
652
|
-
};
|
|
653
|
-
}
|
|
654
741
|
function getTransactionVersionEncoder() {
|
|
655
|
-
return {
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
);
|
|
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
|
+
});
|
|
670
756
|
}
|
|
671
|
-
function
|
|
672
|
-
return (
|
|
673
|
-
|
|
674
|
-
|
|
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
|
+
});
|
|
675
770
|
}
|
|
676
771
|
|
|
677
772
|
// src/serializers/message.ts
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
["addressTableLookups", getAddressTableLookupsSerializer()]
|
|
691
|
-
]),
|
|
692
|
-
(value) => {
|
|
693
|
-
if (value.version === "legacy") {
|
|
694
|
-
return value;
|
|
695
|
-
}
|
|
696
|
-
return {
|
|
697
|
-
...value,
|
|
698
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
699
|
-
};
|
|
773
|
+
function getCompiledMessageLegacyEncoder() {
|
|
774
|
+
return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
|
|
775
|
+
}
|
|
776
|
+
function getCompiledMessageVersionedEncoder() {
|
|
777
|
+
return codecsCore.mapEncoder(
|
|
778
|
+
codecsDataStructures.getStructEncoder([
|
|
779
|
+
...getPreludeStructEncoderTuple(),
|
|
780
|
+
["addressTableLookups", getAddressTableLookupArrayEncoder()]
|
|
781
|
+
]),
|
|
782
|
+
(value) => {
|
|
783
|
+
if (value.version === "legacy") {
|
|
784
|
+
return value;
|
|
700
785
|
}
|
|
701
|
-
|
|
702
|
-
|
|
786
|
+
return {
|
|
787
|
+
...value,
|
|
788
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
789
|
+
};
|
|
790
|
+
}
|
|
791
|
+
);
|
|
703
792
|
}
|
|
704
|
-
function
|
|
705
|
-
return
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
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
|
+
];
|
|
712
801
|
}
|
|
713
|
-
function
|
|
802
|
+
function getPreludeStructDecoderTuple() {
|
|
714
803
|
return [
|
|
715
|
-
["version",
|
|
716
|
-
["header",
|
|
717
|
-
[
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
size: umiSerializers.shortU16()
|
|
722
|
-
})
|
|
723
|
-
],
|
|
724
|
-
[
|
|
725
|
-
"lifetimeToken",
|
|
726
|
-
umiSerializers.string({
|
|
727
|
-
description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
|
|
728
|
-
encoding: umiSerializers.base58,
|
|
729
|
-
size: 32
|
|
730
|
-
})
|
|
731
|
-
],
|
|
732
|
-
[
|
|
733
|
-
"instructions",
|
|
734
|
-
umiSerializers.array(toSerializer(getInstructionCodec()), {
|
|
735
|
-
description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
|
|
736
|
-
size: umiSerializers.shortU16()
|
|
737
|
-
})
|
|
738
|
-
]
|
|
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()]
|
|
739
810
|
];
|
|
740
811
|
}
|
|
741
|
-
function
|
|
742
|
-
return
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
});
|
|
812
|
+
function getAddressTableLookupArrayEncoder() {
|
|
813
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
814
|
+
}
|
|
815
|
+
function getAddressTableLookupArrayDecoder() {
|
|
816
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
746
817
|
}
|
|
747
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
|
+
}
|
|
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
|
+
});
|
|
835
|
+
}
|
|
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
|
+
});
|
|
843
|
+
}
|
|
844
|
+
function getCompiledMessageCodec() {
|
|
845
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
846
|
+
}
|
|
847
|
+
|
|
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
|
+
}
|
|
857
|
+
} else {
|
|
858
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
859
|
+
}
|
|
748
860
|
return {
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
serialize
|
|
861
|
+
compiledMessage,
|
|
862
|
+
signatures
|
|
752
863
|
};
|
|
753
864
|
}
|
|
754
865
|
|
|
755
866
|
// src/serializers/transaction.ts
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
return
|
|
867
|
+
function getCompiledTransactionEncoder() {
|
|
868
|
+
return codecsDataStructures.getStructEncoder([
|
|
869
|
+
["signatures", codecsDataStructures.getArrayEncoder(codecsDataStructures.getBytesEncoder({ size: 64 }), { size: codecsNumbers.getShortU16Encoder() })],
|
|
870
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
871
|
+
]);
|
|
872
|
+
}
|
|
873
|
+
function getCompiledTransactionDecoder() {
|
|
874
|
+
return codecsDataStructures.getStructDecoder([
|
|
764
875
|
[
|
|
765
876
|
"signatures",
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
size: umiSerializers.shortU16()
|
|
877
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
878
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
769
879
|
})
|
|
770
880
|
],
|
|
771
|
-
["compiledMessage",
|
|
772
|
-
])
|
|
881
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
882
|
+
]);
|
|
773
883
|
}
|
|
774
884
|
function getTransactionEncoder() {
|
|
775
|
-
return
|
|
776
|
-
...BASE_CONFIG3,
|
|
777
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
778
|
-
serialize: serialize2
|
|
779
|
-
};
|
|
885
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
780
886
|
}
|
|
781
|
-
function
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
putativeTransactionSignature.length > 88
|
|
787
|
-
) {
|
|
788
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
789
|
-
}
|
|
790
|
-
const bytes2 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
791
|
-
const numBytes = bytes2.byteLength;
|
|
792
|
-
if (numBytes !== 64) {
|
|
793
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
794
|
-
}
|
|
795
|
-
} catch (e) {
|
|
796
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
797
|
-
cause: e
|
|
798
|
-
});
|
|
799
|
-
}
|
|
800
|
-
}
|
|
801
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
802
|
-
if (
|
|
803
|
-
// Lowest value (64 bytes of zeroes)
|
|
804
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
805
|
-
putativeTransactionSignature.length > 88
|
|
806
|
-
) {
|
|
807
|
-
return false;
|
|
808
|
-
}
|
|
809
|
-
const bytes2 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
810
|
-
const numBytes = bytes2.byteLength;
|
|
811
|
-
if (numBytes !== 64) {
|
|
812
|
-
return false;
|
|
813
|
-
}
|
|
814
|
-
return true;
|
|
887
|
+
function getTransactionDecoder(config) {
|
|
888
|
+
return codecsCore.mapDecoder(
|
|
889
|
+
getCompiledTransactionDecoder(),
|
|
890
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
891
|
+
);
|
|
815
892
|
}
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
819
|
-
return signature;
|
|
893
|
+
function getTransactionCodec(config) {
|
|
894
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
820
895
|
}
|
|
896
|
+
var base58Decoder;
|
|
821
897
|
function getSignatureFromTransaction(transaction) {
|
|
898
|
+
if (!base58Decoder)
|
|
899
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
822
900
|
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
823
901
|
if (!signatureBytes) {
|
|
824
|
-
throw new
|
|
825
|
-
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
826
|
-
);
|
|
902
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
|
|
827
903
|
}
|
|
828
|
-
const
|
|
829
|
-
return
|
|
904
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
905
|
+
return transactionSignature;
|
|
830
906
|
}
|
|
831
|
-
async function
|
|
907
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
832
908
|
const compiledMessage = compileMessage(transaction);
|
|
833
909
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
910
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
834
911
|
const publicKeySignaturePairs = await Promise.all(
|
|
835
912
|
keyPairs.map(
|
|
836
|
-
(keyPair) => Promise.all([
|
|
837
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
838
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
839
|
-
])
|
|
913
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
840
914
|
)
|
|
841
915
|
);
|
|
842
916
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -849,34 +923,57 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
849
923
|
Object.freeze(out);
|
|
850
924
|
return out;
|
|
851
925
|
}
|
|
852
|
-
function
|
|
853
|
-
|
|
854
|
-
|
|
926
|
+
async function signTransaction(keyPairs, transaction) {
|
|
927
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
928
|
+
assertTransactionIsFullySigned(out);
|
|
929
|
+
Object.freeze(out);
|
|
930
|
+
return out;
|
|
855
931
|
}
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
const
|
|
860
|
-
{
|
|
861
|
-
|
|
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);
|
|
939
|
+
}
|
|
940
|
+
});
|
|
941
|
+
if (missingSigs.length > 0) {
|
|
942
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
|
|
943
|
+
addresses: missingSigs
|
|
944
|
+
});
|
|
862
945
|
}
|
|
863
946
|
}
|
|
947
|
+
function getBase64EncodedWireTransaction(transaction) {
|
|
948
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
949
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
950
|
+
}
|
|
864
951
|
|
|
865
952
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
866
|
-
exports.
|
|
953
|
+
exports.appendTransactionInstructions = appendTransactionInstructions;
|
|
867
954
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
868
|
-
exports.
|
|
955
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
956
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
957
|
+
exports.compileMessage = compileMessage;
|
|
869
958
|
exports.createTransaction = createTransaction;
|
|
959
|
+
exports.decompileTransaction = decompileTransaction;
|
|
870
960
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
961
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
962
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
963
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
964
|
+
exports.getCompiledTransactionDecoder = getCompiledTransactionDecoder;
|
|
871
965
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
966
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
967
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
872
968
|
exports.getTransactionEncoder = getTransactionEncoder;
|
|
969
|
+
exports.getUnsignedTransaction = getUnsignedTransaction;
|
|
873
970
|
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
874
|
-
exports.
|
|
971
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
875
972
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
973
|
+
exports.prependTransactionInstructions = prependTransactionInstructions;
|
|
876
974
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
877
975
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
878
976
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
879
977
|
exports.signTransaction = signTransaction;
|
|
880
|
-
exports.transactionSignature = transactionSignature;
|
|
881
978
|
//# sourceMappingURL=out.js.map
|
|
882
979
|
//# sourceMappingURL=index.browser.cjs.map
|