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