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