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