@solana/transactions 2.0.0-experimental.ba9b4c7 → 2.0.0-experimental.bab191b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +276 -5
- package/dist/index.browser.cjs +466 -356
- package/dist/index.browser.cjs.map +1 -1
- package/dist/index.browser.js +457 -357
- package/dist/index.browser.js.map +1 -1
- package/dist/index.native.js +457 -357
- package/dist/index.native.js.map +1 -1
- package/dist/index.node.cjs +464 -356
- package/dist/index.node.cjs.map +1 -1
- package/dist/index.node.js +457 -357
- 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 +7 -9
- 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 +1 -1
- package/dist/types/compile-instructions.d.ts.map +1 -0
- package/dist/types/compile-lifetime-token.d.ts +2 -2
- 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 +8 -9
- package/dist/types/durable-nonce.d.ts.map +1 -0
- package/dist/types/fee-payer.d.ts +6 -6
- package/dist/types/fee-payer.d.ts.map +1 -0
- package/dist/types/index.d.ts +13 -9
- package/dist/types/index.d.ts.map +1 -0
- package/dist/types/instructions.d.ts +6 -4
- 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 -5
- package/dist/types/serializers/address-table-lookup.d.ts.map +1 -0
- package/dist/types/serializers/header.d.ts +5 -5
- package/dist/types/serializers/header.d.ts.map +1 -0
- package/dist/types/serializers/index.d.ts +2 -1
- package/dist/types/serializers/index.d.ts.map +1 -0
- package/dist/types/serializers/instruction.d.ts +5 -5
- 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 +9 -13
- package/dist/types/signatures.d.ts.map +1 -0
- package/dist/types/types.d.ts +6 -13
- package/dist/types/types.d.ts.map +1 -0
- package/dist/types/unsigned-transaction.d.ts +2 -2
- package/dist/types/unsigned-transaction.d.ts.map +1 -0
- package/dist/types/wire-transaction.d.ts +2 -2
- package/dist/types/wire-transaction.d.ts.map +1 -0
- package/package.json +18 -38
- package/dist/index.development.js +0 -2042
- package/dist/index.development.js.map +0 -1
- package/dist/index.production.min.js +0 -26
- package/dist/types/serializers/unimplemented.d.ts +0 -3
package/dist/index.browser.cjs
CHANGED
|
@@ -1,14 +1,36 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var errors = require('@solana/errors');
|
|
4
|
+
var codecsStrings = require('@solana/codecs-strings');
|
|
4
5
|
var addresses = require('@solana/addresses');
|
|
6
|
+
var functional = require('@solana/functional');
|
|
5
7
|
var codecsCore = require('@solana/codecs-core');
|
|
6
8
|
var codecsDataStructures = require('@solana/codecs-data-structures');
|
|
7
9
|
var codecsNumbers = require('@solana/codecs-numbers');
|
|
8
10
|
var keys = require('@solana/keys');
|
|
9
11
|
|
|
10
|
-
//
|
|
11
|
-
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__INVALID_BLOCKHASH_BYTE_LENGTH, {
|
|
30
|
+
actualLength: numBytes
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
12
34
|
|
|
13
35
|
// src/unsigned-transaction.ts
|
|
14
36
|
function getUnsignedTransaction(transaction) {
|
|
@@ -25,24 +47,20 @@ function getUnsignedTransaction(transaction) {
|
|
|
25
47
|
}
|
|
26
48
|
|
|
27
49
|
// src/blockhash.ts
|
|
28
|
-
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;
|
|
29
54
|
try {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
if (numBytes !== 32) {
|
|
40
|
-
throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
|
|
41
|
-
}
|
|
42
|
-
} catch (e) {
|
|
43
|
-
throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
|
|
44
|
-
cause: e
|
|
45
|
-
});
|
|
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);
|
|
46
64
|
}
|
|
47
65
|
}
|
|
48
66
|
function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
|
|
@@ -68,8 +86,6 @@ function createTransaction({
|
|
|
68
86
|
Object.freeze(out);
|
|
69
87
|
return out;
|
|
70
88
|
}
|
|
71
|
-
|
|
72
|
-
// ../instructions/dist/index.browser.js
|
|
73
89
|
var AccountRole = /* @__PURE__ */ ((AccountRole2) => {
|
|
74
90
|
AccountRole2[AccountRole2["WRITABLE_SIGNER"] = /* 3 */
|
|
75
91
|
3] = "WRITABLE_SIGNER";
|
|
@@ -91,13 +107,11 @@ function isWritableRole(role) {
|
|
|
91
107
|
function mergeRoles(roleA, roleB) {
|
|
92
108
|
return roleA | roleB;
|
|
93
109
|
}
|
|
94
|
-
|
|
95
|
-
// src/durable-nonce.ts
|
|
96
110
|
var RECENT_BLOCKHASHES_SYSVAR_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111";
|
|
97
111
|
var SYSTEM_PROGRAM_ADDRESS = "11111111111111111111111111111111";
|
|
98
112
|
function assertIsDurableNonceTransaction(transaction) {
|
|
99
113
|
if (!isDurableNonceTransaction(transaction)) {
|
|
100
|
-
throw new
|
|
114
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__EXPECTED_NONCE_LIFETIME);
|
|
101
115
|
}
|
|
102
116
|
}
|
|
103
117
|
function createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress) {
|
|
@@ -120,7 +134,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
|
|
|
120
134
|
instruction.accounts?.length === 3 && // First account is nonce account address
|
|
121
135
|
instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
|
|
122
136
|
instruction.accounts[1].address === RECENT_BLOCKHASHES_SYSVAR_ADDRESS && instruction.accounts[1].role === AccountRole.READONLY && // Third account is nonce authority account
|
|
123
|
-
instruction.accounts[2].address != null && instruction.accounts[2].role
|
|
137
|
+
instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
|
|
124
138
|
}
|
|
125
139
|
function isAdvanceNonceAccountInstructionData(data) {
|
|
126
140
|
return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
|
|
@@ -128,21 +142,38 @@ function isAdvanceNonceAccountInstructionData(data) {
|
|
|
128
142
|
function isDurableNonceTransaction(transaction) {
|
|
129
143
|
return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
|
|
130
144
|
}
|
|
145
|
+
function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
|
|
146
|
+
return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
|
|
147
|
+
}
|
|
131
148
|
function setTransactionLifetimeUsingDurableNonce({
|
|
132
149
|
nonce,
|
|
133
150
|
nonceAccountAddress,
|
|
134
151
|
nonceAuthorityAddress
|
|
135
152
|
}, transaction) {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
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
|
+
];
|
|
139
173
|
}
|
|
140
174
|
const out = {
|
|
141
175
|
...getUnsignedTransaction(transaction),
|
|
142
|
-
instructions:
|
|
143
|
-
createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
|
|
144
|
-
...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
|
|
145
|
-
],
|
|
176
|
+
instructions: newInstructions,
|
|
146
177
|
lifetimeConstraint: {
|
|
147
178
|
nonce
|
|
148
179
|
}
|
|
@@ -166,21 +197,181 @@ function setTransactionFeePayer(feePayer, transaction) {
|
|
|
166
197
|
|
|
167
198
|
// src/instructions.ts
|
|
168
199
|
function appendTransactionInstruction(instruction, transaction) {
|
|
200
|
+
return appendTransactionInstructions([instruction], transaction);
|
|
201
|
+
}
|
|
202
|
+
function appendTransactionInstructions(instructions, transaction) {
|
|
169
203
|
const out = {
|
|
170
204
|
...getUnsignedTransaction(transaction),
|
|
171
|
-
instructions: [...transaction.instructions,
|
|
205
|
+
instructions: [...transaction.instructions, ...instructions]
|
|
172
206
|
};
|
|
173
207
|
Object.freeze(out);
|
|
174
208
|
return out;
|
|
175
209
|
}
|
|
176
210
|
function prependTransactionInstruction(instruction, transaction) {
|
|
211
|
+
return prependTransactionInstructions([instruction], transaction);
|
|
212
|
+
}
|
|
213
|
+
function prependTransactionInstructions(instructions, transaction) {
|
|
177
214
|
const out = {
|
|
178
215
|
...getUnsignedTransaction(transaction),
|
|
179
|
-
instructions: [
|
|
216
|
+
instructions: [...instructions, ...transaction.instructions]
|
|
180
217
|
};
|
|
181
218
|
Object.freeze(out);
|
|
182
219
|
return out;
|
|
183
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
|
+
}
|
|
184
375
|
function upsert(addressMap, address, update) {
|
|
185
376
|
addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
|
|
186
377
|
}
|
|
@@ -197,13 +388,13 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
197
388
|
if (isWritableRole(entry.role)) {
|
|
198
389
|
switch (entry[TYPE]) {
|
|
199
390
|
case 0 /* FEE_PAYER */:
|
|
200
|
-
throw new
|
|
201
|
-
|
|
202
|
-
);
|
|
391
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_CANNOT_PAY_FEES, {
|
|
392
|
+
programAddress: instruction.programAddress
|
|
393
|
+
});
|
|
203
394
|
default:
|
|
204
|
-
throw new
|
|
205
|
-
|
|
206
|
-
);
|
|
395
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE, {
|
|
396
|
+
programAddress: instruction.programAddress
|
|
397
|
+
});
|
|
207
398
|
}
|
|
208
399
|
}
|
|
209
400
|
if (entry[TYPE] === 2 /* STATIC */) {
|
|
@@ -233,7 +424,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
233
424
|
const shouldReplaceEntry = (
|
|
234
425
|
// Consider using the new LOOKUP_TABLE if its address is different...
|
|
235
426
|
entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
|
|
236
|
-
(addressComparator
|
|
427
|
+
(addressComparator ||= addresses.getAddressComparator())(
|
|
237
428
|
accountMeta.lookupTableAddress,
|
|
238
429
|
entry.lookupTableAddress
|
|
239
430
|
) < 0
|
|
@@ -268,8 +459,11 @@ function getAddressMapFromInstructions(feePayer, instructions) {
|
|
|
268
459
|
addressesOfInvokedPrograms.has(account.address)
|
|
269
460
|
) {
|
|
270
461
|
if (isWritableRole(accountMeta.role)) {
|
|
271
|
-
throw new
|
|
272
|
-
|
|
462
|
+
throw new errors.SolanaError(
|
|
463
|
+
errors.SOLANA_ERROR__TRANSACTION__INVOKED_PROGRAMS_MUST_NOT_BE_WRITABLE,
|
|
464
|
+
{
|
|
465
|
+
programAddress: account.address
|
|
466
|
+
}
|
|
273
467
|
);
|
|
274
468
|
}
|
|
275
469
|
if (entry.role !== nextRole) {
|
|
@@ -339,7 +533,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
339
533
|
if (leftIsWritable !== isWritableRole(rightEntry.role)) {
|
|
340
534
|
return leftIsWritable ? -1 : 1;
|
|
341
535
|
}
|
|
342
|
-
addressComparator
|
|
536
|
+
addressComparator ||= addresses.getAddressComparator();
|
|
343
537
|
if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
|
|
344
538
|
return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
|
|
345
539
|
} else {
|
|
@@ -352,16 +546,15 @@ function getOrderedAccountsFromAddressMap(addressMap) {
|
|
|
352
546
|
return orderedAccounts;
|
|
353
547
|
}
|
|
354
548
|
function getCompiledAddressTableLookups(orderedAccounts) {
|
|
355
|
-
var _a;
|
|
356
549
|
const index = {};
|
|
357
550
|
for (const account of orderedAccounts) {
|
|
358
551
|
if (!("lookupTableAddress" in account)) {
|
|
359
552
|
continue;
|
|
360
553
|
}
|
|
361
|
-
const entry = index[
|
|
554
|
+
const entry = index[account.lookupTableAddress] ||= {
|
|
362
555
|
readableIndices: [],
|
|
363
556
|
writableIndices: []
|
|
364
|
-
}
|
|
557
|
+
};
|
|
365
558
|
if (account.role === AccountRole.WRITABLE) {
|
|
366
559
|
entry.writableIndices.push(account.addressIndex);
|
|
367
560
|
} else {
|
|
@@ -447,130 +640,68 @@ function compileMessage(transaction) {
|
|
|
447
640
|
version: transaction.version
|
|
448
641
|
};
|
|
449
642
|
}
|
|
450
|
-
|
|
451
|
-
// src/compile-transaction.ts
|
|
452
|
-
function getCompiledTransaction(transaction) {
|
|
453
|
-
const compiledMessage = compileMessage(transaction);
|
|
454
|
-
let signatures;
|
|
455
|
-
if ("signatures" in transaction) {
|
|
456
|
-
signatures = [];
|
|
457
|
-
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
458
|
-
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
459
|
-
}
|
|
460
|
-
} else {
|
|
461
|
-
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
462
|
-
}
|
|
463
|
-
return {
|
|
464
|
-
compiledMessage,
|
|
465
|
-
signatures
|
|
466
|
-
};
|
|
467
|
-
}
|
|
468
|
-
var lookupTableAddressDescription = __DEV__ ? "The address of the address lookup table account from which instruction addresses should be looked up" : "lookupTableAddress";
|
|
469
|
-
var writableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as writeable" : "writableIndices";
|
|
470
|
-
var readableIndicesDescription = __DEV__ ? "The indices of the accounts in the lookup table that should be loaded as read-only" : "readableIndices";
|
|
471
|
-
var addressTableLookupDescription = __DEV__ ? "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it" : "addressTableLookup";
|
|
472
643
|
var memoizedAddressTableLookupEncoder;
|
|
473
644
|
function getAddressTableLookupEncoder() {
|
|
474
645
|
if (!memoizedAddressTableLookupEncoder) {
|
|
475
|
-
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder(
|
|
646
|
+
memoizedAddressTableLookupEncoder = codecsDataStructures.getStructEncoder([
|
|
647
|
+
["lookupTableAddress", addresses.getAddressEncoder()],
|
|
476
648
|
[
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
"writableIndices",
|
|
480
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
481
|
-
description: writableIndicesDescription,
|
|
482
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
483
|
-
})
|
|
484
|
-
],
|
|
485
|
-
[
|
|
486
|
-
"readableIndices",
|
|
487
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), {
|
|
488
|
-
description: readableIndicesDescription,
|
|
489
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
490
|
-
})
|
|
491
|
-
]
|
|
649
|
+
"writableIndices",
|
|
650
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
492
651
|
],
|
|
493
|
-
|
|
494
|
-
|
|
652
|
+
[
|
|
653
|
+
"readableIndices",
|
|
654
|
+
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })
|
|
655
|
+
]
|
|
656
|
+
]);
|
|
495
657
|
}
|
|
496
658
|
return memoizedAddressTableLookupEncoder;
|
|
497
659
|
}
|
|
498
660
|
var memoizedAddressTableLookupDecoder;
|
|
499
661
|
function getAddressTableLookupDecoder() {
|
|
500
662
|
if (!memoizedAddressTableLookupDecoder) {
|
|
501
|
-
memoizedAddressTableLookupDecoder = codecsDataStructures.getStructDecoder(
|
|
502
|
-
[
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
507
|
-
description: writableIndicesDescription,
|
|
508
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
509
|
-
})
|
|
510
|
-
],
|
|
511
|
-
[
|
|
512
|
-
"readableIndices",
|
|
513
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), {
|
|
514
|
-
description: readableIndicesDescription,
|
|
515
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
516
|
-
})
|
|
517
|
-
]
|
|
518
|
-
],
|
|
519
|
-
{ description: addressTableLookupDescription }
|
|
520
|
-
);
|
|
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
|
+
]);
|
|
521
668
|
}
|
|
522
669
|
return memoizedAddressTableLookupDecoder;
|
|
523
670
|
}
|
|
524
|
-
|
|
525
|
-
|
|
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
|
+
]);
|
|
689
|
+
}
|
|
690
|
+
function getMessageHeaderDecoder() {
|
|
691
|
+
return codecsDataStructures.getStructDecoder([
|
|
692
|
+
["numSignerAccounts", getMemoizedU8Decoder()],
|
|
693
|
+
["numReadonlySignerAccounts", getMemoizedU8Decoder()],
|
|
694
|
+
["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
|
|
695
|
+
]);
|
|
526
696
|
}
|
|
527
|
-
var memoizedU8Codec;
|
|
528
|
-
function getMemoizedU8Codec() {
|
|
529
|
-
if (!memoizedU8Codec)
|
|
530
|
-
memoizedU8Codec = codecsNumbers.getU8Codec();
|
|
531
|
-
return memoizedU8Codec;
|
|
532
|
-
}
|
|
533
|
-
function getMemoizedU8CodecDescription(description) {
|
|
534
|
-
const codec = getMemoizedU8Codec();
|
|
535
|
-
return {
|
|
536
|
-
...codec,
|
|
537
|
-
description: description ?? codec.description
|
|
538
|
-
};
|
|
539
|
-
}
|
|
540
|
-
var numSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction" : void 0;
|
|
541
|
-
var numReadonlySignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable" : void 0;
|
|
542
|
-
var numReadonlyNonSignerAccountsDescription = __DEV__ ? "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable" : void 0;
|
|
543
|
-
var messageHeaderDescription = __DEV__ ? "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses" : void 0;
|
|
544
|
-
function getMessageHeaderCodec() {
|
|
545
|
-
return codecsDataStructures.getStructCodec(
|
|
546
|
-
[
|
|
547
|
-
["numSignerAccounts", getMemoizedU8CodecDescription(numSignerAccountsDescription)],
|
|
548
|
-
["numReadonlySignerAccounts", getMemoizedU8CodecDescription(numReadonlySignerAccountsDescription)],
|
|
549
|
-
["numReadonlyNonSignerAccounts", getMemoizedU8CodecDescription(numReadonlyNonSignerAccountsDescription)]
|
|
550
|
-
],
|
|
551
|
-
{
|
|
552
|
-
description: messageHeaderDescription
|
|
553
|
-
}
|
|
554
|
-
);
|
|
555
|
-
}
|
|
556
|
-
var programAddressIndexDescription = __DEV__ ? "The index of the program being called, according to the well-ordered accounts list for this transaction" : "programAddressIndex";
|
|
557
|
-
var accountIndexDescription = __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : void 0;
|
|
558
|
-
var accountIndicesDescription = __DEV__ ? "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" : "accountIndices";
|
|
559
|
-
var dataDescription = __DEV__ ? "An optional buffer of data passed to the instruction" : "data";
|
|
560
697
|
var memoizedGetInstructionEncoder;
|
|
561
698
|
function getInstructionEncoder() {
|
|
562
699
|
if (!memoizedGetInstructionEncoder) {
|
|
563
700
|
memoizedGetInstructionEncoder = codecsCore.mapEncoder(
|
|
564
701
|
codecsDataStructures.getStructEncoder([
|
|
565
|
-
["programAddressIndex", codecsNumbers.getU8Encoder(
|
|
566
|
-
[
|
|
567
|
-
|
|
568
|
-
codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder({ description: accountIndexDescription }), {
|
|
569
|
-
description: accountIndicesDescription,
|
|
570
|
-
size: codecsNumbers.getShortU16Encoder()
|
|
571
|
-
})
|
|
572
|
-
],
|
|
573
|
-
["data", codecsDataStructures.getBytesEncoder({ description: dataDescription, size: codecsNumbers.getShortU16Encoder() })]
|
|
702
|
+
["programAddressIndex", codecsNumbers.getU8Encoder()],
|
|
703
|
+
["accountIndices", codecsDataStructures.getArrayEncoder(codecsNumbers.getU8Encoder(), { size: codecsNumbers.getShortU16Encoder() })],
|
|
704
|
+
["data", codecsDataStructures.getBytesEncoder({ size: codecsNumbers.getShortU16Encoder() })]
|
|
574
705
|
]),
|
|
575
706
|
// Convert an instruction to have all fields defined
|
|
576
707
|
(instruction) => {
|
|
@@ -592,15 +723,9 @@ function getInstructionDecoder() {
|
|
|
592
723
|
if (!memoizedGetInstructionDecoder) {
|
|
593
724
|
memoizedGetInstructionDecoder = codecsCore.mapDecoder(
|
|
594
725
|
codecsDataStructures.getStructDecoder([
|
|
595
|
-
["programAddressIndex", codecsNumbers.getU8Decoder(
|
|
596
|
-
[
|
|
597
|
-
|
|
598
|
-
codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder({ description: accountIndexDescription }), {
|
|
599
|
-
description: accountIndicesDescription,
|
|
600
|
-
size: codecsNumbers.getShortU16Decoder()
|
|
601
|
-
})
|
|
602
|
-
],
|
|
603
|
-
["data", codecsDataStructures.getBytesDecoder({ description: dataDescription, size: codecsNumbers.getShortU16Decoder() })]
|
|
726
|
+
["programAddressIndex", codecsNumbers.getU8Decoder()],
|
|
727
|
+
["accountIndices", codecsDataStructures.getArrayDecoder(codecsNumbers.getU8Decoder(), { size: codecsNumbers.getShortU16Decoder() })],
|
|
728
|
+
["data", codecsDataStructures.getBytesDecoder({ size: codecsNumbers.getShortU16Decoder() })]
|
|
604
729
|
]),
|
|
605
730
|
// Convert an instruction to exclude optional fields if they are empty
|
|
606
731
|
(instruction) => {
|
|
@@ -618,225 +743,185 @@ function getInstructionDecoder() {
|
|
|
618
743
|
}
|
|
619
744
|
return memoizedGetInstructionDecoder;
|
|
620
745
|
}
|
|
621
|
-
function getInstructionCodec() {
|
|
622
|
-
return codecsCore.combineCodec(getInstructionEncoder(), getInstructionDecoder());
|
|
623
|
-
}
|
|
624
746
|
var VERSION_FLAG_MASK = 128;
|
|
625
|
-
var BASE_CONFIG = {
|
|
626
|
-
description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
|
|
627
|
-
fixedSize: null,
|
|
628
|
-
maxSize: 1
|
|
629
|
-
};
|
|
630
|
-
function decode(bytes2, offset = 0) {
|
|
631
|
-
const firstByte = bytes2[offset];
|
|
632
|
-
if ((firstByte & VERSION_FLAG_MASK) === 0) {
|
|
633
|
-
return ["legacy", offset];
|
|
634
|
-
} else {
|
|
635
|
-
const version = firstByte ^ VERSION_FLAG_MASK;
|
|
636
|
-
return [version, offset + 1];
|
|
637
|
-
}
|
|
638
|
-
}
|
|
639
|
-
function encode(value) {
|
|
640
|
-
if (value === "legacy") {
|
|
641
|
-
return new Uint8Array();
|
|
642
|
-
}
|
|
643
|
-
if (value < 0 || value > 127) {
|
|
644
|
-
throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
|
|
645
|
-
}
|
|
646
|
-
return new Uint8Array([value | VERSION_FLAG_MASK]);
|
|
647
|
-
}
|
|
648
|
-
function getTransactionVersionDecoder() {
|
|
649
|
-
return {
|
|
650
|
-
...BASE_CONFIG,
|
|
651
|
-
decode
|
|
652
|
-
};
|
|
653
|
-
}
|
|
654
747
|
function getTransactionVersionEncoder() {
|
|
655
|
-
return {
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
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
|
+
});
|
|
670
764
|
}
|
|
671
|
-
function
|
|
672
|
-
return (
|
|
673
|
-
|
|
674
|
-
|
|
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
|
+
});
|
|
675
778
|
}
|
|
676
779
|
|
|
677
780
|
// src/serializers/message.ts
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
["addressTableLookups", getAddressTableLookupsSerializer()]
|
|
691
|
-
]),
|
|
692
|
-
(value) => {
|
|
693
|
-
if (value.version === "legacy") {
|
|
694
|
-
return value;
|
|
695
|
-
}
|
|
696
|
-
return {
|
|
697
|
-
...value,
|
|
698
|
-
addressTableLookups: value.addressTableLookups ?? []
|
|
699
|
-
};
|
|
781
|
+
function getCompiledMessageLegacyEncoder() {
|
|
782
|
+
return codecsDataStructures.getStructEncoder(getPreludeStructEncoderTuple());
|
|
783
|
+
}
|
|
784
|
+
function getCompiledMessageVersionedEncoder() {
|
|
785
|
+
return codecsCore.mapEncoder(
|
|
786
|
+
codecsDataStructures.getStructEncoder([
|
|
787
|
+
...getPreludeStructEncoderTuple(),
|
|
788
|
+
["addressTableLookups", getAddressTableLookupArrayEncoder()]
|
|
789
|
+
]),
|
|
790
|
+
(value) => {
|
|
791
|
+
if (value.version === "legacy") {
|
|
792
|
+
return value;
|
|
700
793
|
}
|
|
701
|
-
|
|
702
|
-
|
|
794
|
+
return {
|
|
795
|
+
...value,
|
|
796
|
+
addressTableLookups: value.addressTableLookups ?? []
|
|
797
|
+
};
|
|
798
|
+
}
|
|
799
|
+
);
|
|
703
800
|
}
|
|
704
|
-
function
|
|
705
|
-
return
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
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
|
+
];
|
|
712
809
|
}
|
|
713
|
-
function
|
|
810
|
+
function getPreludeStructDecoderTuple() {
|
|
714
811
|
return [
|
|
715
|
-
["version",
|
|
716
|
-
["header",
|
|
717
|
-
[
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
size: umiSerializers.shortU16()
|
|
722
|
-
})
|
|
723
|
-
],
|
|
724
|
-
[
|
|
725
|
-
"lifetimeToken",
|
|
726
|
-
umiSerializers.string({
|
|
727
|
-
description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
|
|
728
|
-
encoding: umiSerializers.base58,
|
|
729
|
-
size: 32
|
|
730
|
-
})
|
|
731
|
-
],
|
|
732
|
-
[
|
|
733
|
-
"instructions",
|
|
734
|
-
umiSerializers.array(toSerializer(getInstructionCodec()), {
|
|
735
|
-
description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
|
|
736
|
-
size: umiSerializers.shortU16()
|
|
737
|
-
})
|
|
738
|
-
]
|
|
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()]
|
|
739
818
|
];
|
|
740
819
|
}
|
|
741
|
-
function
|
|
742
|
-
return
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
});
|
|
820
|
+
function getAddressTableLookupArrayEncoder() {
|
|
821
|
+
return codecsDataStructures.getArrayEncoder(getAddressTableLookupEncoder(), { size: codecsNumbers.getShortU16Encoder() });
|
|
822
|
+
}
|
|
823
|
+
function getAddressTableLookupArrayDecoder() {
|
|
824
|
+
return codecsDataStructures.getArrayDecoder(getAddressTableLookupDecoder(), { size: codecsNumbers.getShortU16Decoder() });
|
|
746
825
|
}
|
|
747
826
|
function getCompiledMessageEncoder() {
|
|
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
|
+
});
|
|
843
|
+
}
|
|
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
|
+
);
|
|
854
|
+
}
|
|
855
|
+
function getCompiledMessageCodec() {
|
|
856
|
+
return codecsCore.combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
|
|
857
|
+
}
|
|
858
|
+
|
|
859
|
+
// src/compile-transaction.ts
|
|
860
|
+
function getCompiledTransaction(transaction) {
|
|
861
|
+
const compiledMessage = compileMessage(transaction);
|
|
862
|
+
let signatures;
|
|
863
|
+
if ("signatures" in transaction) {
|
|
864
|
+
signatures = [];
|
|
865
|
+
for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
|
|
866
|
+
signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
|
|
867
|
+
}
|
|
868
|
+
} else {
|
|
869
|
+
signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
|
|
870
|
+
}
|
|
748
871
|
return {
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
serialize
|
|
872
|
+
compiledMessage,
|
|
873
|
+
signatures
|
|
752
874
|
};
|
|
753
875
|
}
|
|
754
876
|
|
|
755
877
|
// src/serializers/transaction.ts
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
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([
|
|
764
886
|
[
|
|
765
887
|
"signatures",
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
size: umiSerializers.shortU16()
|
|
888
|
+
codecsDataStructures.getArrayDecoder(codecsDataStructures.getBytesDecoder({ size: 64 }), {
|
|
889
|
+
size: codecsNumbers.getShortU16Decoder()
|
|
769
890
|
})
|
|
770
891
|
],
|
|
771
|
-
["compiledMessage",
|
|
772
|
-
])
|
|
892
|
+
["compiledMessage", getCompiledMessageDecoder()]
|
|
893
|
+
]);
|
|
773
894
|
}
|
|
774
895
|
function getTransactionEncoder() {
|
|
775
|
-
return
|
|
776
|
-
...BASE_CONFIG3,
|
|
777
|
-
deserialize: getUnimplementedDecoder("CompiledMessage"),
|
|
778
|
-
serialize: serialize2
|
|
779
|
-
};
|
|
896
|
+
return codecsCore.mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
|
|
780
897
|
}
|
|
781
|
-
function
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
putativeTransactionSignature.length > 88
|
|
787
|
-
) {
|
|
788
|
-
throw new Error("Expected input string to decode to a byte array of length 64.");
|
|
789
|
-
}
|
|
790
|
-
const bytes2 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
791
|
-
const numBytes = bytes2.byteLength;
|
|
792
|
-
if (numBytes !== 64) {
|
|
793
|
-
throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
|
|
794
|
-
}
|
|
795
|
-
} catch (e) {
|
|
796
|
-
throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
|
|
797
|
-
cause: e
|
|
798
|
-
});
|
|
799
|
-
}
|
|
800
|
-
}
|
|
801
|
-
function isTransactionSignature(putativeTransactionSignature) {
|
|
802
|
-
if (
|
|
803
|
-
// Lowest value (64 bytes of zeroes)
|
|
804
|
-
putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
|
|
805
|
-
putativeTransactionSignature.length > 88
|
|
806
|
-
) {
|
|
807
|
-
return false;
|
|
808
|
-
}
|
|
809
|
-
const bytes2 = umiSerializers.base58.serialize(putativeTransactionSignature);
|
|
810
|
-
const numBytes = bytes2.byteLength;
|
|
811
|
-
if (numBytes !== 64) {
|
|
812
|
-
return false;
|
|
813
|
-
}
|
|
814
|
-
return true;
|
|
898
|
+
function getTransactionDecoder(config) {
|
|
899
|
+
return codecsCore.mapDecoder(
|
|
900
|
+
getCompiledTransactionDecoder(),
|
|
901
|
+
(compiledTransaction) => decompileTransaction(compiledTransaction, config)
|
|
902
|
+
);
|
|
815
903
|
}
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
const signature = await keys.signBytes(secretKey, wireMessageBytes);
|
|
819
|
-
return signature;
|
|
904
|
+
function getTransactionCodec(config) {
|
|
905
|
+
return codecsCore.combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
|
|
820
906
|
}
|
|
907
|
+
var base58Decoder;
|
|
821
908
|
function getSignatureFromTransaction(transaction) {
|
|
909
|
+
if (!base58Decoder)
|
|
910
|
+
base58Decoder = codecsStrings.getBase58Decoder();
|
|
822
911
|
const signatureBytes = transaction.signatures[transaction.feePayer];
|
|
823
912
|
if (!signatureBytes) {
|
|
824
|
-
throw new
|
|
825
|
-
"Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
|
|
826
|
-
);
|
|
913
|
+
throw new errors.SolanaError(errors.SOLANA_ERROR__TRANSACTION__FEE_PAYER_SIGNATURE_MISSING);
|
|
827
914
|
}
|
|
828
|
-
const
|
|
829
|
-
return
|
|
915
|
+
const transactionSignature = base58Decoder.decode(signatureBytes);
|
|
916
|
+
return transactionSignature;
|
|
830
917
|
}
|
|
831
|
-
async function
|
|
918
|
+
async function partiallySignTransaction(keyPairs, transaction) {
|
|
832
919
|
const compiledMessage = compileMessage(transaction);
|
|
833
920
|
const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
|
|
921
|
+
const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
|
|
834
922
|
const publicKeySignaturePairs = await Promise.all(
|
|
835
923
|
keyPairs.map(
|
|
836
|
-
(keyPair) => Promise.all([
|
|
837
|
-
addresses.getAddressFromPublicKey(keyPair.publicKey),
|
|
838
|
-
getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
|
|
839
|
-
])
|
|
924
|
+
(keyPair) => Promise.all([addresses.getAddressFromPublicKey(keyPair.publicKey), keys.signBytes(keyPair.privateKey, wireMessageBytes)])
|
|
840
925
|
)
|
|
841
926
|
);
|
|
842
927
|
for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
|
|
@@ -849,32 +934,57 @@ async function signTransaction(keyPairs, transaction) {
|
|
|
849
934
|
Object.freeze(out);
|
|
850
935
|
return out;
|
|
851
936
|
}
|
|
852
|
-
function
|
|
853
|
-
|
|
854
|
-
|
|
937
|
+
async function signTransaction(keyPairs, transaction) {
|
|
938
|
+
const out = await partiallySignTransaction(keyPairs, transaction);
|
|
939
|
+
assertTransactionIsFullySigned(out);
|
|
940
|
+
Object.freeze(out);
|
|
941
|
+
return out;
|
|
855
942
|
}
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
const
|
|
860
|
-
{
|
|
861
|
-
|
|
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__SIGNATURES_MISSING, {
|
|
954
|
+
addresses: missingSigs
|
|
955
|
+
});
|
|
862
956
|
}
|
|
863
957
|
}
|
|
958
|
+
function getBase64EncodedWireTransaction(transaction) {
|
|
959
|
+
const wireTransactionBytes = getTransactionEncoder().encode(transaction);
|
|
960
|
+
return codecsStrings.getBase64Decoder().decode(wireTransactionBytes);
|
|
961
|
+
}
|
|
864
962
|
|
|
865
963
|
exports.appendTransactionInstruction = appendTransactionInstruction;
|
|
866
|
-
exports.
|
|
964
|
+
exports.appendTransactionInstructions = appendTransactionInstructions;
|
|
867
965
|
exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
|
|
868
|
-
exports.
|
|
966
|
+
exports.assertIsTransactionWithBlockhashLifetime = assertIsTransactionWithBlockhashLifetime;
|
|
967
|
+
exports.assertTransactionIsFullySigned = assertTransactionIsFullySigned;
|
|
968
|
+
exports.compileMessage = compileMessage;
|
|
869
969
|
exports.createTransaction = createTransaction;
|
|
970
|
+
exports.decompileTransaction = decompileTransaction;
|
|
870
971
|
exports.getBase64EncodedWireTransaction = getBase64EncodedWireTransaction;
|
|
972
|
+
exports.getCompiledMessageCodec = getCompiledMessageCodec;
|
|
973
|
+
exports.getCompiledMessageDecoder = getCompiledMessageDecoder;
|
|
974
|
+
exports.getCompiledMessageEncoder = getCompiledMessageEncoder;
|
|
975
|
+
exports.getCompiledTransactionDecoder = getCompiledTransactionDecoder;
|
|
871
976
|
exports.getSignatureFromTransaction = getSignatureFromTransaction;
|
|
977
|
+
exports.getTransactionCodec = getTransactionCodec;
|
|
978
|
+
exports.getTransactionDecoder = getTransactionDecoder;
|
|
872
979
|
exports.getTransactionEncoder = getTransactionEncoder;
|
|
980
|
+
exports.getUnsignedTransaction = getUnsignedTransaction;
|
|
873
981
|
exports.isAdvanceNonceAccountInstruction = isAdvanceNonceAccountInstruction;
|
|
874
|
-
exports.
|
|
982
|
+
exports.partiallySignTransaction = partiallySignTransaction;
|
|
875
983
|
exports.prependTransactionInstruction = prependTransactionInstruction;
|
|
984
|
+
exports.prependTransactionInstructions = prependTransactionInstructions;
|
|
876
985
|
exports.setTransactionFeePayer = setTransactionFeePayer;
|
|
877
986
|
exports.setTransactionLifetimeUsingBlockhash = setTransactionLifetimeUsingBlockhash;
|
|
878
987
|
exports.setTransactionLifetimeUsingDurableNonce = setTransactionLifetimeUsingDurableNonce;
|
|
879
988
|
exports.signTransaction = signTransaction;
|
|
880
|
-
|
|
989
|
+
//# sourceMappingURL=out.js.map
|
|
990
|
+
//# sourceMappingURL=index.browser.cjs.map
|