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