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