@solana/transactions 2.0.0-experimental.df45965 → 2.0.0-experimental.dfb72ea
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 +8 -46
- package/dist/index.browser.cjs +441 -240
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +431 -240
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +429 -240
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +439 -240
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +431 -240
- 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 +7 -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 -5
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
- package/dist/types/serializers/header.d.ts +5 -5
- 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 -5
- 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 -6
- 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 +1 -1
- package/dist/types/wire-transaction.d.ts.map +1 -1
- package/package.json +18 -39
- package/dist/index.development.js +0 -1378
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -26
package/dist/index.browser.js
CHANGED
|
@@ -1,30 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
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';
|
|
7
8
|
import { signBytes } from '@solana/keys';
|
|
8
9
|
|
|
9
|
-
// ../
|
|
10
|
-
var
|
|
11
|
-
|
|
12
|
-
// src/unsigned-transaction.ts
|
|
13
|
-
function getUnsignedTransaction(transaction) {
|
|
14
|
-
if ("signatures" in transaction) {
|
|
15
|
-
const {
|
|
16
|
-
signatures: _,
|
|
17
|
-
// eslint-disable-line @typescript-eslint/no-unused-vars
|
|
18
|
-
...unsignedTransaction
|
|
19
|
-
} = transaction;
|
|
20
|
-
return unsignedTransaction;
|
|
21
|
-
} else {
|
|
22
|
-
return transaction;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
// src/blockhash.ts
|
|
10
|
+
// ../rpc-types/dist/index.browser.js
|
|
11
|
+
var base58Encoder;
|
|
27
12
|
function assertIsBlockhash(putativeBlockhash) {
|
|
13
|
+
if (!base58Encoder)
|
|
14
|
+
base58Encoder = getBase58Encoder();
|
|
28
15
|
try {
|
|
29
16
|
if (
|
|
30
17
|
// Lowest value (32 bytes of zeroes)
|
|
@@ -33,7 +20,7 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
33
20
|
) {
|
|
34
21
|
throw new Error("Expected input string to decode to a byte array of length 32.");
|
|
35
22
|
}
|
|
36
|
-
const bytes =
|
|
23
|
+
const bytes = base58Encoder.encode(putativeBlockhash);
|
|
37
24
|
const numBytes = bytes.byteLength;
|
|
38
25
|
if (numBytes !== 32) {
|
|
39
26
|
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
@@ -44,6 +31,38 @@ function assertIsBlockhash(putativeBlockhash) {
|
|
|
44
31
|
});
|
|
45
32
|
}
|
|
46
33
|
}
|
|
34
|
+
|
|
35
|
+
// src/unsigned-transaction.ts
|
|
36
|
+
function getUnsignedTransaction(transaction) {
|
|
37
|
+
if ("signatures" in transaction) {
|
|
38
|
+
const {
|
|
39
|
+
signatures: _,
|
|
40
|
+
// eslint-disable-line @typescript-eslint/no-unused-vars
|
|
41
|
+
...unsignedTransaction
|
|
42
|
+
} = transaction;
|
|
43
|
+
return unsignedTransaction;
|
|
44
|
+
} else {
|
|
45
|
+
return transaction;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
// src/blockhash.ts
|
|
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;
|
|
54
|
+
try {
|
|
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");
|
|
64
|
+
}
|
|
65
|
+
}
|
|
47
66
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
48
67
|
if ("lifetimeConstraint" in transaction && transaction.lifetimeConstraint.blockhash === blockhashLifetimeConstraint.blockhash && transaction.lifetimeConstraint.lastValidBlockHeight === blockhashLifetimeConstraint.lastValidBlockHeight) {
|
|
49
68
|
return transaction;
|
|
@@ -119,7 +138,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
119
138
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
120
139
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
121
140
|
instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
|
|
122
|
-
instruction.accounts[2].address != null && instruction.accounts[2].role
|
|
141
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
123
142
|
}
|
|
124
143
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
125
144
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -127,21 +146,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
127
146
|
function isDurableNonceTransaction(transaction) {
|
|
128
147
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
129
148
|
}
|
|
149
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
150
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
151
|
+
}
|
|
130
152
|
function setTransactionLifetimeUsingDurableNonce({
|
|
131
153
|
nonce,
|
|
132
154
|
nonceAccountAddress,
|
|
133
155
|
nonceAuthorityAddress
|
|
134
156
|
}, transaction) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
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
|
+
];
|
|
138
177
|
}
|
|
139
178
|
const out = {
|
|
140
179
|
...getUnsignedTransaction(transaction),
|
|
141
|
-
instructions:
|
|
142
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
143
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
144
|
-
],
|
|
180
|
+
instructions: newInstructions,
|
|
145
181
|
lifetimeConstraint: {
|
|
146
182
|
nonce
|
|
147
183
|
}
|
|
@@ -165,21 +201,172 @@ function setTransactionFeePayer(feePayer, transaction) {
|
|
|
165
201
|
|
|
166
202
|
// src/instructions.ts
|
|
167
203
|
function appendTransactionInstruction(instruction, transaction) {
|
|
204
|
+
return appendTransactionInstructions([instruction], transaction);
|
|
205
|
+
}
|
|
206
|
+
function appendTransactionInstructions(instructions, transaction) {
|
|
168
207
|
const out = {
|
|
169
208
|
...getUnsignedTransaction(transaction),
|
|
170
|
-
instructions: [...transaction.instructions,
|
|
209
|
+
instructions: [...transaction.instructions, ...instructions]
|
|
171
210
|
};
|
|
172
211
|
Object.freeze(out);
|
|
173
212
|
return out;
|
|
174
213
|
}
|
|
175
214
|
function prependTransactionInstruction(instruction, transaction) {
|
|
215
|
+
return prependTransactionInstructions([instruction], transaction);
|
|
216
|
+
}
|
|
217
|
+
function prependTransactionInstructions(instructions, transaction) {
|
|
176
218
|
const out = {
|
|
177
219
|
...getUnsignedTransaction(transaction),
|
|
178
|
-
instructions: [
|
|
220
|
+
instructions: [...instructions, ...transaction.instructions]
|
|
179
221
|
};
|
|
180
222
|
Object.freeze(out);
|
|
181
223
|
return out;
|
|
182
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
|
+
}
|
|
183
370
|
function upsert(addressMap, address, update) {
|
|
184
371
|
addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
|
|
185
372
|
}
|
|
@@ -232,7 +419,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
232
419
|
const shouldReplaceEntry = (
|
|
233
420
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
234
421
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
235
|
-
(addressComparator
|
|
422
|
+
(addressComparator ||= getAddressComparator())(
|
|
236
423
|
accountMeta.lookupTableAddress,
|
|
237
424
|
entry.lookupTableAddress
|
|
238
425
|
) < 0
|
|
@@ -338,7 +525,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
338
525
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
339
526
|
return leftIsWritable ? -1 : 1;
|
|
340
527
|
}
|
|
341
|
-
addressComparator
|
|
528
|
+
addressComparator ||= getAddressComparator();
|
|
342
529
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
343
530
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
344
531
|
} else {
|
|
@@ -351,16 +538,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
351
538
|
return orderedAccounts;
|
|
352
539
|
}
|
|
353
540
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
354
|
-
var _a;
|
|
355
541
|
const index = {};
|
|
356
542
|
for (const account of orderedAccounts) {
|
|
357
543
|
if (!("lookupTableAddress" in account)) {
|
|
358
544
|
continue;
|
|
359
545
|
}
|
|
360
|
-
const entry = index[
|
|
546
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
361
547
|
readableIndices: [],
|
|
362
548
|
writableIndices: []
|
|
363
|
-
}
|
|
549
|
+
};
|
|
364
550
|
if (account.role === AccountRole.WRITABLE) {
|
|
365
551
|
entry.writableIndices.push(account.addressIndex);
|
|
366
552
|
} else {
|
|
@@ -446,101 +632,68 @@ function compileMessage(transaction) {
|
|
|
446
632
|
version: transaction.version
|
|
447
633
|
};
|
|
448
634
|
}
|
|
449
|
-
|
|
450
|
-
// src/compile-transaction.ts
|
|
451
|
-
function getCompiledTransaction(transaction) {
|
|
452
|
-
const compiledMessage = compileMessage(transaction);
|
|
453
|
-
let signatures;
|
|
454
|
-
if ("signatures" in transaction) {
|
|
455
|
-
signatures = [];
|
|
456
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
457
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
458
|
-
}
|
|
459
|
-
} else {
|
|
460
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
461
|
-
}
|
|
462
|
-
return {
|
|
463
|
-
compiledMessage,
|
|
464
|
-
signatures
|
|
465
|
-
};
|
|
466
|
-
}
|
|
467
|
-
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
468
|
-
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
469
|
-
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
470
|
-
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";
|
|
471
635
|
var memoizedAddressTableLookupEncoder;
|
|
472
636
|
function getAddressTableLookupEncoder() {
|
|
473
637
|
if (!memoizedAddressTableLookupEncoder) {
|
|
474
|
-
memoizedAddressTableLookupEncoder = getStructEncoder(
|
|
638
|
+
memoizedAddressTableLookupEncoder = getStructEncoder([
|
|
639
|
+
["lookupTableAddress", getAddressEncoder()],
|
|
475
640
|
[
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
"writableIndices",
|
|
479
|
-
getArrayEncoder(getU8Encoder(), {
|
|
480
|
-
description: writableIndicesDescription,
|
|
481
|
-
size: getShortU16Encoder()
|
|
482
|
-
})
|
|
483
|
-
],
|
|
484
|
-
[
|
|
485
|
-
"readableIndices",
|
|
486
|
-
getArrayEncoder(getU8Encoder(), {
|
|
487
|
-
description: readableIndicesDescription,
|
|
488
|
-
size: getShortU16Encoder()
|
|
489
|
-
})
|
|
490
|
-
]
|
|
641
|
+
"writableIndices",
|
|
642
|
+
getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
|
|
491
643
|
],
|
|
492
|
-
|
|
493
|
-
|
|
644
|
+
[
|
|
645
|
+
"readableIndices",
|
|
646
|
+
getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
|
|
647
|
+
]
|
|
648
|
+
]);
|
|
494
649
|
}
|
|
495
650
|
return memoizedAddressTableLookupEncoder;
|
|
496
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
|
+
}
|
|
497
663
|
var memoizedU8Encoder;
|
|
498
664
|
function getMemoizedU8Encoder() {
|
|
499
665
|
if (!memoizedU8Encoder)
|
|
500
666
|
memoizedU8Encoder = getU8Encoder();
|
|
501
667
|
return memoizedU8Encoder;
|
|
502
668
|
}
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
};
|
|
669
|
+
var memoizedU8Decoder;
|
|
670
|
+
function getMemoizedU8Decoder() {
|
|
671
|
+
if (!memoizedU8Decoder)
|
|
672
|
+
memoizedU8Decoder = getU8Decoder();
|
|
673
|
+
return memoizedU8Decoder;
|
|
509
674
|
}
|
|
510
|
-
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;
|
|
511
|
-
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;
|
|
512
|
-
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
513
|
-
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
514
675
|
function getMessageHeaderEncoder() {
|
|
515
|
-
return getStructEncoder(
|
|
516
|
-
[
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
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
|
+
]);
|
|
525
688
|
}
|
|
526
|
-
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
527
|
-
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
528
|
-
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";
|
|
529
|
-
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
530
689
|
var memoizedGetInstructionEncoder;
|
|
531
690
|
function getInstructionEncoder() {
|
|
532
691
|
if (!memoizedGetInstructionEncoder) {
|
|
533
692
|
memoizedGetInstructionEncoder = mapEncoder(
|
|
534
693
|
getStructEncoder([
|
|
535
|
-
["programAddressIndex", getU8Encoder(
|
|
536
|
-
[
|
|
537
|
-
|
|
538
|
-
getArrayEncoder(getU8Encoder({ description: accountIndexDescription }), {
|
|
539
|
-
description: accountIndicesDescription,
|
|
540
|
-
size: getShortU16Encoder()
|
|
541
|
-
})
|
|
542
|
-
],
|
|
543
|
-
["data", getBytesEncoder({ description: dataDescription, size: getShortU16Encoder() })]
|
|
694
|
+
["programAddressIndex", getU8Encoder()],
|
|
695
|
+
["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
|
|
696
|
+
["data", getBytesEncoder({ size: getShortU16Encoder() })]
|
|
544
697
|
]),
|
|
545
698
|
// Convert an instruction to have all fields defined
|
|
546
699
|
(instruction) => {
|
|
@@ -557,33 +710,64 @@ function getInstructionEncoder() {
|
|
|
557
710
|
}
|
|
558
711
|
return memoizedGetInstructionEncoder;
|
|
559
712
|
}
|
|
560
|
-
var
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
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
|
+
);
|
|
572
735
|
}
|
|
573
|
-
return
|
|
736
|
+
return memoizedGetInstructionDecoder;
|
|
574
737
|
}
|
|
738
|
+
var VERSION_FLAG_MASK = 128;
|
|
575
739
|
function getTransactionVersionEncoder() {
|
|
576
|
-
return {
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
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
|
+
});
|
|
754
|
+
}
|
|
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
|
+
});
|
|
580
768
|
}
|
|
581
769
|
|
|
582
770
|
// src/serializers/message.ts
|
|
583
|
-
var staticAccountsDescription = __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "staticAccounts";
|
|
584
|
-
var lifetimeTokenDescription = __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "lifetimeToken";
|
|
585
|
-
var instructionsDescription = __DEV__ ? "A compact-array of instructions belonging to this transaction" : "instructions";
|
|
586
|
-
var addressTableLookupsDescription = __DEV__ ? "A compact array of address table lookups belonging to this transaction" : "addressTableLookups";
|
|
587
771
|
function getCompiledMessageLegacyEncoder() {
|
|
588
772
|
return getStructEncoder(getPreludeStructEncoderTuple());
|
|
589
773
|
}
|
|
@@ -608,134 +792,126 @@ function getPreludeStructEncoderTuple() {
|
|
|
608
792
|
return [
|
|
609
793
|
["version", getTransactionVersionEncoder()],
|
|
610
794
|
["header", getMessageHeaderEncoder()],
|
|
611
|
-
[
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
[
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
})
|
|
625
|
-
],
|
|
626
|
-
[
|
|
627
|
-
"instructions",
|
|
628
|
-
getArrayEncoder(getInstructionEncoder(), {
|
|
629
|
-
description: instructionsDescription,
|
|
630
|
-
size: getShortU16Encoder()
|
|
631
|
-
})
|
|
632
|
-
]
|
|
795
|
+
["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
|
|
796
|
+
["lifetimeToken", getStringEncoder({ encoding: getBase58Encoder(), size: 32 })],
|
|
797
|
+
["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
|
|
798
|
+
];
|
|
799
|
+
}
|
|
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()]
|
|
633
808
|
];
|
|
634
809
|
}
|
|
635
810
|
function getAddressTableLookupArrayEncoder() {
|
|
636
|
-
return getArrayEncoder(getAddressTableLookupEncoder(), {
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
});
|
|
811
|
+
return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
|
|
812
|
+
}
|
|
813
|
+
function getAddressTableLookupArrayDecoder() {
|
|
814
|
+
return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
|
|
640
815
|
}
|
|
641
|
-
var messageDescription = __DEV__ ? "The wire format of a Solana transaction message" : "message";
|
|
642
816
|
function getCompiledMessageEncoder() {
|
|
643
|
-
return {
|
|
644
|
-
|
|
645
|
-
encode: (compiledMessage) => {
|
|
817
|
+
return createEncoder({
|
|
818
|
+
getSizeFromValue: (compiledMessage) => {
|
|
646
819
|
if (compiledMessage.version === "legacy") {
|
|
647
|
-
return getCompiledMessageLegacyEncoder().
|
|
820
|
+
return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
|
|
648
821
|
} else {
|
|
649
|
-
return getCompiledMessageVersionedEncoder().
|
|
822
|
+
return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
|
|
650
823
|
}
|
|
651
824
|
},
|
|
652
|
-
|
|
653
|
-
|
|
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(
|
|
836
|
+
getStructDecoder(getPreludeStructDecoderTuple()),
|
|
837
|
+
({ addressTableLookups, ...restOfMessage }) => {
|
|
838
|
+
if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
|
|
839
|
+
return restOfMessage;
|
|
840
|
+
}
|
|
841
|
+
return { ...restOfMessage, addressTableLookups };
|
|
842
|
+
}
|
|
843
|
+
);
|
|
844
|
+
}
|
|
845
|
+
function getCompiledMessageCodec() {
|
|
846
|
+
return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
847
|
+
}
|
|
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
|
+
}
|
|
861
|
+
return {
|
|
862
|
+
compiledMessage,
|
|
863
|
+
signatures
|
|
654
864
|
};
|
|
655
865
|
}
|
|
656
866
|
|
|
657
867
|
// src/serializers/transaction.ts
|
|
658
|
-
var transactionDescription = __DEV__ ? "The wire format of a Solana transaction" : "transaction";
|
|
659
|
-
var signaturesDescription = __DEV__ ? "A compact array of 64-byte, base-64 encoded Ed25519 signatures" : "signatures";
|
|
660
868
|
function getCompiledTransactionEncoder() {
|
|
661
|
-
return getStructEncoder(
|
|
869
|
+
return getStructEncoder([
|
|
870
|
+
["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
|
|
871
|
+
["compiledMessage", getCompiledMessageEncoder()]
|
|
872
|
+
]);
|
|
873
|
+
}
|
|
874
|
+
function getCompiledTransactionDecoder() {
|
|
875
|
+
return getStructDecoder([
|
|
662
876
|
[
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
size: getShortU16Encoder()
|
|
668
|
-
})
|
|
669
|
-
],
|
|
670
|
-
["compiledMessage", getCompiledMessageEncoder()]
|
|
877
|
+
"signatures",
|
|
878
|
+
getArrayDecoder(getBytesDecoder({ size: 64 }), {
|
|
879
|
+
size: getShortU16Decoder()
|
|
880
|
+
})
|
|
671
881
|
],
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
}
|
|
675
|
-
);
|
|
882
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
883
|
+
]);
|
|
676
884
|
}
|
|
677
885
|
function getTransactionEncoder() {
|
|
678
886
|
return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
679
887
|
}
|
|
680
|
-
function
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
putativeTransactionSignature.length > 88
|
|
686
|
-
) {
|
|
687
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
688
|
-
}
|
|
689
|
-
const bytes = base58.serialize(putativeTransactionSignature);
|
|
690
|
-
const numBytes = bytes.byteLength;
|
|
691
|
-
if (numBytes !== 64) {
|
|
692
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
693
|
-
}
|
|
694
|
-
} catch (e) {
|
|
695
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
696
|
-
cause: e
|
|
697
|
-
});
|
|
698
|
-
}
|
|
699
|
-
}
|
|
700
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
701
|
-
if (
|
|
702
|
-
// Lowest value (64 bytes of zeroes)
|
|
703
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
704
|
-
putativeTransactionSignature.length > 88
|
|
705
|
-
) {
|
|
706
|
-
return false;
|
|
707
|
-
}
|
|
708
|
-
const bytes = base58.serialize(putativeTransactionSignature);
|
|
709
|
-
const numBytes = bytes.byteLength;
|
|
710
|
-
if (numBytes !== 64) {
|
|
711
|
-
return false;
|
|
712
|
-
}
|
|
713
|
-
return true;
|
|
888
|
+
function getTransactionDecoder(config) {
|
|
889
|
+
return mapDecoder(
|
|
890
|
+
getCompiledTransactionDecoder(),
|
|
891
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
892
|
+
);
|
|
714
893
|
}
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
const signature = await signBytes(secretKey, wireMessageBytes);
|
|
718
|
-
return signature;
|
|
894
|
+
function getTransactionCodec(config) {
|
|
895
|
+
return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
719
896
|
}
|
|
897
|
+
var base58Decoder;
|
|
720
898
|
function getSignatureFromTransaction(transaction) {
|
|
899
|
+
if (!base58Decoder)
|
|
900
|
+
base58Decoder = getBase58Decoder();
|
|
721
901
|
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
722
902
|
if (!signatureBytes) {
|
|
723
|
-
throw new
|
|
724
|
-
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
725
|
-
);
|
|
903
|
+
throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
|
|
726
904
|
}
|
|
727
|
-
const
|
|
728
|
-
return
|
|
905
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
906
|
+
return transactionSignature;
|
|
729
907
|
}
|
|
730
|
-
async function
|
|
908
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
731
909
|
const compiledMessage = compileMessage(transaction);
|
|
732
910
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
911
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
733
912
|
const publicKeySignaturePairs = await Promise.all(
|
|
734
913
|
keyPairs.map(
|
|
735
|
-
(keyPair) => Promise.all([
|
|
736
|
-
getAddressFromPublicKey(keyPair.publicKey),
|
|
737
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
738
|
-
])
|
|
914
|
+
(keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
739
915
|
)
|
|
740
916
|
);
|
|
741
917
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -748,17 +924,32 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
748
924
|
Object.freeze(out);
|
|
749
925
|
return out;
|
|
750
926
|
}
|
|
751
|
-
function
|
|
752
|
-
|
|
753
|
-
|
|
927
|
+
async function signTransaction(keyPairs, transaction) {
|
|
928
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
929
|
+
assertTransactionIsFullySigned(out);
|
|
930
|
+
Object.freeze(out);
|
|
931
|
+
return out;
|
|
932
|
+
}
|
|
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
|
+
});
|
|
946
|
+
}
|
|
754
947
|
}
|
|
755
|
-
|
|
756
|
-
// src/wire-transaction.ts
|
|
757
948
|
function getBase64EncodedWireTransaction(transaction) {
|
|
758
949
|
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
759
|
-
|
|
760
|
-
return btoa(String.fromCharCode(...wireTransactionBytes));
|
|
761
|
-
}
|
|
950
|
+
return getBase64Decoder().decode(wireTransactionBytes);
|
|
762
951
|
}
|
|
763
952
|
|
|
764
|
-
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 };
|
|
954
|
+
//# sourceMappingURL=out.js.map
|
|
955
|
+
//# sourceMappingURL=index.browser.js.map
|