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