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