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