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