@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.js
CHANGED
|
@@ -1,12 +1,36 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { getAddressFromPublicKey,
|
|
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,130 +632,68 @@ function compileMessage(transaction) {
|
|
|
445
632
|
version: transaction.version
|
|
446
633
|
};
|
|
447
634
|
}
|
|
448
|
-
|
|
449
|
-
// src/compile-transaction.ts
|
|
450
|
-
function getCompiledTransaction(transaction) {
|
|
451
|
-
const compiledMessage = compileMessage(transaction);
|
|
452
|
-
let signatures;
|
|
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
|
-
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
467
|
-
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
468
|
-
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
469
|
-
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";
|
|
470
635
|
var memoizedAddressTableLookupEncoder;
|
|
471
636
|
function getAddressTableLookupEncoder() {
|
|
472
637
|
if (!memoizedAddressTableLookupEncoder) {
|
|
473
|
-
memoizedAddressTableLookupEncoder = getStructEncoder(
|
|
638
|
+
memoizedAddressTableLookupEncoder = getStructEncoder([
|
|
639
|
+
["lookupTableAddress", getAddressEncoder()],
|
|
474
640
|
[
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
"writableIndices",
|
|
478
|
-
getArrayEncoder(getU8Encoder(), {
|
|
479
|
-
description: writableIndicesDescription,
|
|
480
|
-
size: getShortU16Encoder()
|
|
481
|
-
})
|
|
482
|
-
],
|
|
483
|
-
[
|
|
484
|
-
"readableIndices",
|
|
485
|
-
getArrayEncoder(getU8Encoder(), {
|
|
486
|
-
description: readableIndicesDescription,
|
|
487
|
-
size: getShortU16Encoder()
|
|
488
|
-
})
|
|
489
|
-
]
|
|
641
|
+
"writableIndices",
|
|
642
|
+
getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
|
|
490
643
|
],
|
|
491
|
-
|
|
492
|
-
|
|
644
|
+
[
|
|
645
|
+
"readableIndices",
|
|
646
|
+
getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
|
|
647
|
+
]
|
|
648
|
+
]);
|
|
493
649
|
}
|
|
494
650
|
return memoizedAddressTableLookupEncoder;
|
|
495
651
|
}
|
|
496
652
|
var memoizedAddressTableLookupDecoder;
|
|
497
653
|
function getAddressTableLookupDecoder() {
|
|
498
654
|
if (!memoizedAddressTableLookupDecoder) {
|
|
499
|
-
memoizedAddressTableLookupDecoder = getStructDecoder(
|
|
500
|
-
[
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
getArrayDecoder(getU8Decoder(), {
|
|
505
|
-
description: writableIndicesDescription,
|
|
506
|
-
size: getShortU16Decoder()
|
|
507
|
-
})
|
|
508
|
-
],
|
|
509
|
-
[
|
|
510
|
-
"readableIndices",
|
|
511
|
-
getArrayDecoder(getU8Decoder(), {
|
|
512
|
-
description: readableIndicesDescription,
|
|
513
|
-
size: getShortU16Decoder()
|
|
514
|
-
})
|
|
515
|
-
]
|
|
516
|
-
],
|
|
517
|
-
{ description: addressTableLookupDescription }
|
|
518
|
-
);
|
|
655
|
+
memoizedAddressTableLookupDecoder = getStructDecoder([
|
|
656
|
+
["lookupTableAddress", getAddressDecoder()],
|
|
657
|
+
["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
|
|
658
|
+
["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
|
|
659
|
+
]);
|
|
519
660
|
}
|
|
520
661
|
return memoizedAddressTableLookupDecoder;
|
|
521
662
|
}
|
|
522
|
-
|
|
523
|
-
|
|
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
|
+
]);
|
|
524
688
|
}
|
|
525
|
-
var memoizedU8Codec;
|
|
526
|
-
function getMemoizedU8Codec() {
|
|
527
|
-
if (!memoizedU8Codec)
|
|
528
|
-
memoizedU8Codec = getU8Codec();
|
|
529
|
-
return memoizedU8Codec;
|
|
530
|
-
}
|
|
531
|
-
function getMemoizedU8CodecDescription(description) {
|
|
532
|
-
const codec = getMemoizedU8Codec();
|
|
533
|
-
return {
|
|
534
|
-
...codec,
|
|
535
|
-
description: description ?? codec.description
|
|
536
|
-
};
|
|
537
|
-
}
|
|
538
|
-
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;
|
|
539
|
-
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;
|
|
540
|
-
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
541
|
-
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
542
|
-
function getMessageHeaderCodec() {
|
|
543
|
-
return getStructCodec(
|
|
544
|
-
[
|
|
545
|
-
["numSignerAccounts", getMemoizedU8CodecDescription(numSignerAccountsDescription)],
|
|
546
|
-
["numReadonlySignerAccounts", getMemoizedU8CodecDescription(numReadonlySignerAccountsDescription)],
|
|
547
|
-
["numReadonlyNonSignerAccounts", getMemoizedU8CodecDescription(numReadonlyNonSignerAccountsDescription)]
|
|
548
|
-
],
|
|
549
|
-
{
|
|
550
|
-
description: messageHeaderDescription
|
|
551
|
-
}
|
|
552
|
-
);
|
|
553
|
-
}
|
|
554
|
-
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
555
|
-
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
556
|
-
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";
|
|
557
|
-
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
558
689
|
var memoizedGetInstructionEncoder;
|
|
559
690
|
function getInstructionEncoder() {
|
|
560
691
|
if (!memoizedGetInstructionEncoder) {
|
|
561
692
|
memoizedGetInstructionEncoder = mapEncoder(
|
|
562
693
|
getStructEncoder([
|
|
563
|
-
["programAddressIndex", getU8Encoder(
|
|
564
|
-
[
|
|
565
|
-
|
|
566
|
-
getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
|
|
567
|
-
description: accountIndicesDescription,
|
|
568
|
-
size: getShortU16Encoder()
|
|
569
|
-
})
|
|
570
|
-
],
|
|
571
|
-
["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
|
|
694
|
+
["programAddressIndex", getU8Encoder()],
|
|
695
|
+
["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
|
|
696
|
+
["data", getBytesEncoder({ size: getShortU16Encoder() })]
|
|
572
697
|
]),
|
|
573
698
|
// Convert an instruction to have all fields defined
|
|
574
699
|
(instruction) => {
|
|
@@ -590,15 +715,9 @@ function getInstructionDecoder() {
|
|
|
590
715
|
if (!memoizedGetInstructionDecoder) {
|
|
591
716
|
memoizedGetInstructionDecoder = mapDecoder(
|
|
592
717
|
getStructDecoder([
|
|
593
|
-
["programAddressIndex", getU8Decoder(
|
|
594
|
-
[
|
|
595
|
-
|
|
596
|
-
getArrayDecoder(getU8Decoder({ description: accountIndexDescription }), {
|
|
597
|
-
description: accountIndicesDescription,
|
|
598
|
-
size: getShortU16Decoder()
|
|
599
|
-
})
|
|
600
|
-
],
|
|
601
|
-
["data", getBytesDecoder({ description: dataDescription, size: getShortU16Decoder() })]
|
|
718
|
+
["programAddressIndex", getU8Decoder()],
|
|
719
|
+
["accountIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
|
|
720
|
+
["data", getBytesDecoder({ size: getShortU16Decoder() })]
|
|
602
721
|
]),
|
|
603
722
|
// Convert an instruction to exclude optional fields if they are empty
|
|
604
723
|
(instruction) => {
|
|
@@ -616,225 +735,180 @@ function getInstructionDecoder() {
|
|
|
616
735
|
}
|
|
617
736
|
return memoizedGetInstructionDecoder;
|
|
618
737
|
}
|
|
619
|
-
function getInstructionCodec() {
|
|
620
|
-
return combineCodec(getInstructionEncoder(), getInstructionDecoder());
|
|
621
|
-
}
|
|
622
738
|
var VERSION_FLAG_MASK = 128;
|
|
623
|
-
var BASE_CONFIG = {
|
|
624
|
-
description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
|
|
625
|
-
fixedSize: null,
|
|
626
|
-
maxSize: 1
|
|
627
|
-
};
|
|
628
|
-
function decode(bytes2, offset = 0) {
|
|
629
|
-
const firstByte = bytes2[offset];
|
|
630
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
631
|
-
return ["legacy", offset];
|
|
632
|
-
} else {
|
|
633
|
-
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
634
|
-
return [version, offset + 1];
|
|
635
|
-
}
|
|
636
|
-
}
|
|
637
|
-
function encode(value) {
|
|
638
|
-
if (value === "legacy") {
|
|
639
|
-
return new Uint8Array();
|
|
640
|
-
}
|
|
641
|
-
if (value < 0 || value > 127) {
|
|
642
|
-
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
643
|
-
}
|
|
644
|
-
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
645
|
-
}
|
|
646
|
-
function getTransactionVersionDecoder() {
|
|
647
|
-
return {
|
|
648
|
-
...BASE_CONFIG,
|
|
649
|
-
decode
|
|
650
|
-
};
|
|
651
|
-
}
|
|
652
739
|
function getTransactionVersionEncoder() {
|
|
653
|
-
return {
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
);
|
|
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
|
+
});
|
|
668
754
|
}
|
|
669
|
-
function
|
|
670
|
-
return (
|
|
671
|
-
|
|
672
|
-
|
|
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
|
+
}
|
|
766
|
+
}
|
|
767
|
+
});
|
|
673
768
|
}
|
|
674
769
|
|
|
675
770
|
// src/serializers/message.ts
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
["addressTableLookups", getAddressTableLookupsSerializer()]
|
|
689
|
-
]),
|
|
690
|
-
(value) => {
|
|
691
|
-
if (value.version === "legacy") {
|
|
692
|
-
return value;
|
|
693
|
-
}
|
|
694
|
-
return {
|
|
695
|
-
...value,
|
|
696
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
697
|
-
};
|
|
771
|
+
function getCompiledMessageLegacyEncoder() {
|
|
772
|
+
return getStructEncoder(getPreludeStructEncoderTuple());
|
|
773
|
+
}
|
|
774
|
+
function getCompiledMessageVersionedEncoder() {
|
|
775
|
+
return mapEncoder(
|
|
776
|
+
getStructEncoder([
|
|
777
|
+
...getPreludeStructEncoderTuple(),
|
|
778
|
+
["addressTableLookups", getAddressTableLookupArrayEncoder()]
|
|
779
|
+
]),
|
|
780
|
+
(value) => {
|
|
781
|
+
if (value.version === "legacy") {
|
|
782
|
+
return value;
|
|
698
783
|
}
|
|
699
|
-
|
|
700
|
-
|
|
784
|
+
return {
|
|
785
|
+
...value,
|
|
786
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
787
|
+
};
|
|
788
|
+
}
|
|
789
|
+
);
|
|
701
790
|
}
|
|
702
|
-
function
|
|
703
|
-
return
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
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
|
+
];
|
|
710
799
|
}
|
|
711
|
-
function
|
|
800
|
+
function getPreludeStructDecoderTuple() {
|
|
712
801
|
return [
|
|
713
|
-
["version",
|
|
714
|
-
["header",
|
|
715
|
-
[
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
size: shortU16()
|
|
720
|
-
})
|
|
721
|
-
],
|
|
722
|
-
[
|
|
723
|
-
"lifetimeToken",
|
|
724
|
-
string({
|
|
725
|
-
description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
|
|
726
|
-
encoding: base58,
|
|
727
|
-
size: 32
|
|
728
|
-
})
|
|
729
|
-
],
|
|
730
|
-
[
|
|
731
|
-
"instructions",
|
|
732
|
-
array(toSerializer(getInstructionCodec()), {
|
|
733
|
-
description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
|
|
734
|
-
size: shortU16()
|
|
735
|
-
})
|
|
736
|
-
]
|
|
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()]
|
|
737
808
|
];
|
|
738
809
|
}
|
|
739
|
-
function
|
|
740
|
-
return
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
});
|
|
810
|
+
function getAddressTableLookupArrayEncoder() {
|
|
811
|
+
return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
|
|
812
|
+
}
|
|
813
|
+
function getAddressTableLookupArrayDecoder() {
|
|
814
|
+
return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
|
|
744
815
|
}
|
|
745
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
|
+
});
|
|
833
|
+
}
|
|
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
|
+
});
|
|
841
|
+
}
|
|
842
|
+
function getCompiledMessageCodec() {
|
|
843
|
+
return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
844
|
+
}
|
|
845
|
+
|
|
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
|
+
}
|
|
855
|
+
} else {
|
|
856
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
857
|
+
}
|
|
746
858
|
return {
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
serialize
|
|
859
|
+
compiledMessage,
|
|
860
|
+
signatures
|
|
750
861
|
};
|
|
751
862
|
}
|
|
752
863
|
|
|
753
864
|
// src/serializers/transaction.ts
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
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([
|
|
762
873
|
[
|
|
763
874
|
"signatures",
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
size: shortU16()
|
|
875
|
+
getArrayDecoder(getBytesDecoder({ size: 64 }), {
|
|
876
|
+
size: getShortU16Decoder()
|
|
767
877
|
})
|
|
768
878
|
],
|
|
769
|
-
["compiledMessage",
|
|
770
|
-
])
|
|
879
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
880
|
+
]);
|
|
771
881
|
}
|
|
772
882
|
function getTransactionEncoder() {
|
|
773
|
-
return
|
|
774
|
-
...BASE_CONFIG3,
|
|
775
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
776
|
-
serialize: serialize2
|
|
777
|
-
};
|
|
883
|
+
return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
778
884
|
}
|
|
779
|
-
function
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
putativeTransactionSignature.length > 88
|
|
785
|
-
) {
|
|
786
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
787
|
-
}
|
|
788
|
-
const bytes2 = base58.serialize(putativeTransactionSignature);
|
|
789
|
-
const numBytes = bytes2.byteLength;
|
|
790
|
-
if (numBytes !== 64) {
|
|
791
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
792
|
-
}
|
|
793
|
-
} catch (e) {
|
|
794
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
795
|
-
cause: e
|
|
796
|
-
});
|
|
797
|
-
}
|
|
798
|
-
}
|
|
799
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
800
|
-
if (
|
|
801
|
-
// Lowest value (64 bytes of zeroes)
|
|
802
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
803
|
-
putativeTransactionSignature.length > 88
|
|
804
|
-
) {
|
|
805
|
-
return false;
|
|
806
|
-
}
|
|
807
|
-
const bytes2 = base58.serialize(putativeTransactionSignature);
|
|
808
|
-
const numBytes = bytes2.byteLength;
|
|
809
|
-
if (numBytes !== 64) {
|
|
810
|
-
return false;
|
|
811
|
-
}
|
|
812
|
-
return true;
|
|
885
|
+
function getTransactionDecoder(config) {
|
|
886
|
+
return mapDecoder(
|
|
887
|
+
getCompiledTransactionDecoder(),
|
|
888
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
889
|
+
);
|
|
813
890
|
}
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
const signature = await signBytes(secretKey, wireMessageBytes);
|
|
817
|
-
return signature;
|
|
891
|
+
function getTransactionCodec(config) {
|
|
892
|
+
return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
818
893
|
}
|
|
894
|
+
var base58Decoder;
|
|
819
895
|
function getSignatureFromTransaction(transaction) {
|
|
896
|
+
if (!base58Decoder)
|
|
897
|
+
base58Decoder = getBase58Decoder();
|
|
820
898
|
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
821
899
|
if (!signatureBytes) {
|
|
822
|
-
throw new
|
|
823
|
-
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
824
|
-
);
|
|
900
|
+
throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
|
|
825
901
|
}
|
|
826
|
-
const
|
|
827
|
-
return
|
|
902
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
903
|
+
return transactionSignature;
|
|
828
904
|
}
|
|
829
|
-
async function
|
|
905
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
830
906
|
const compiledMessage = compileMessage(transaction);
|
|
831
907
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
908
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
832
909
|
const publicKeySignaturePairs = await Promise.all(
|
|
833
910
|
keyPairs.map(
|
|
834
|
-
(keyPair) => Promise.all([
|
|
835
|
-
getAddressFromPublicKey(keyPair.publicKey),
|
|
836
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
837
|
-
])
|
|
911
|
+
(keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
838
912
|
)
|
|
839
913
|
);
|
|
840
914
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -847,19 +921,32 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
847
921
|
Object.freeze(out);
|
|
848
922
|
return out;
|
|
849
923
|
}
|
|
850
|
-
function
|
|
851
|
-
|
|
852
|
-
|
|
924
|
+
async function signTransaction(keyPairs, transaction) {
|
|
925
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
926
|
+
assertTransactionIsFullySigned(out);
|
|
927
|
+
Object.freeze(out);
|
|
928
|
+
return out;
|
|
853
929
|
}
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
const
|
|
858
|
-
{
|
|
859
|
-
|
|
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
|
+
});
|
|
860
943
|
}
|
|
861
944
|
}
|
|
945
|
+
function getBase64EncodedWireTransaction(transaction) {
|
|
946
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
947
|
+
return getBase64Decoder().decode(wireTransactionBytes);
|
|
948
|
+
}
|
|
862
949
|
|
|
863
|
-
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 };
|
|
864
951
|
//# sourceMappingURL=out.js.map
|
|
865
952
|
//# sourceMappingURL=index.browser.js.map
|