@solana/transactions 2.0.0-experimental.7da1908 → 2.0.0-experimental.7e745d6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (67) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +276 -5
  3. package/dist/index.browser.cjs +518 -357
  4. package/dist/index.browser.cjs.map +1 -1
  5. package/dist/index.browser.js +504 -355
  6. package/dist/index.browser.js.map +1 -1
  7. package/dist/index.native.js +504 -355
  8. package/dist/index.native.js.map +1 -1
  9. package/dist/index.node.cjs +520 -357
  10. package/dist/index.node.cjs.map +1 -1
  11. package/dist/index.node.js +506 -355
  12. package/dist/index.node.js.map +1 -1
  13. package/dist/types/accounts.d.ts +2 -2
  14. package/dist/types/accounts.d.ts.map +1 -1
  15. package/dist/types/blockhash.d.ts +5 -7
  16. package/dist/types/blockhash.d.ts.map +1 -1
  17. package/dist/types/compilable-transaction.d.ts +7 -0
  18. package/dist/types/compilable-transaction.d.ts.map +1 -0
  19. package/dist/types/compile-address-table-lookups.d.ts +3 -3
  20. package/dist/types/compile-address-table-lookups.d.ts.map +1 -1
  21. package/dist/types/compile-header.d.ts +1 -1
  22. package/dist/types/compile-instructions.d.ts +1 -1
  23. package/dist/types/compile-lifetime-token.d.ts +1 -1
  24. package/dist/types/compile-static-accounts.d.ts +3 -3
  25. package/dist/types/compile-static-accounts.d.ts.map +1 -1
  26. package/dist/types/compile-transaction.d.ts +6 -7
  27. package/dist/types/compile-transaction.d.ts.map +1 -1
  28. package/dist/types/create-transaction.d.ts +1 -1
  29. package/dist/types/decompile-transaction.d.ts +13 -0
  30. package/dist/types/decompile-transaction.d.ts.map +1 -0
  31. package/dist/types/durable-nonce.d.ts +8 -8
  32. package/dist/types/durable-nonce.d.ts.map +1 -1
  33. package/dist/types/fee-payer.d.ts +6 -6
  34. package/dist/types/fee-payer.d.ts.map +1 -1
  35. package/dist/types/index.d.ts +13 -8
  36. package/dist/types/index.d.ts.map +1 -1
  37. package/dist/types/instructions.d.ts +4 -2
  38. package/dist/types/instructions.d.ts.map +1 -1
  39. package/dist/types/message.d.ts +6 -10
  40. package/dist/types/message.d.ts.map +1 -1
  41. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  42. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -1
  43. package/dist/types/serializers/header.d.ts +5 -3
  44. package/dist/types/serializers/header.d.ts.map +1 -1
  45. package/dist/types/serializers/index.d.ts +3 -0
  46. package/dist/types/serializers/index.d.ts.map +1 -0
  47. package/dist/types/serializers/instruction.d.ts +5 -3
  48. package/dist/types/serializers/instruction.d.ts.map +1 -1
  49. package/dist/types/serializers/message.d.ts +5 -5
  50. package/dist/types/serializers/message.d.ts.map +1 -1
  51. package/dist/types/serializers/transaction-version.d.ts +5 -5
  52. package/dist/types/serializers/transaction-version.d.ts.map +1 -1
  53. package/dist/types/serializers/transaction.d.ts +9 -5
  54. package/dist/types/serializers/transaction.d.ts.map +1 -1
  55. package/dist/types/signatures.d.ts +9 -13
  56. package/dist/types/signatures.d.ts.map +1 -1
  57. package/dist/types/types.d.ts +6 -13
  58. package/dist/types/types.d.ts.map +1 -1
  59. package/dist/types/unsigned-transaction.d.ts +1 -1
  60. package/dist/types/wire-transaction.d.ts +2 -2
  61. package/dist/types/wire-transaction.d.ts.map +1 -1
  62. package/package.json +21 -38
  63. package/dist/index.development.js +0 -1383
  64. package/dist/index.development.js.map +0 -1
  65. package/dist/index.production.min.js +0 -24
  66. package/dist/types/serializers/unimplemented.d.ts +0 -3
  67. package/dist/types/serializers/unimplemented.d.ts.map +0 -1
@@ -1,9 +1,34 @@
1
- import { base58, struct, array, bytes, shortU16, mapSerializer, string, u8 } from '@metaplex-foundation/umi-serializers';
2
- import { getAddressFromPublicKey, getBase58EncodedAddressComparator, getBase58EncodedAddressCodec } from '@solana/addresses';
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_SIGNATURE_NOT_COMPUTABLE, SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, 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__BLOCKHASH_BYTE_LENGTH_OUT_OF_RANGE, 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
- // ../build-scripts/env-shim.ts
6
- var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
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__BLOCKHASH_BYTE_LENGTH_OUT_OF_RANGE, {
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 assertIsBlockhash(putativeBlockhash) {
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
- if (
26
- // Lowest value (32 bytes of zeroes)
27
- putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
28
- putativeBlockhash.length > 44
29
- ) {
30
- throw new Error("Expected input string to decode to a byte array of length 32.");
31
- }
32
- const bytes3 = base58.serialize(putativeBlockhash);
33
- const numBytes = bytes3.byteLength;
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 Error("Transaction is not a durable nonce transaction");
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 === AccountRole.READONLY_SIGNER;
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
- const isAlreadyDurableNonceTransaction = isDurableNonceTransaction(transaction);
132
- if (isAlreadyDurableNonceTransaction && transaction.lifetimeConstraint.nonce === nonce && transaction.instructions[0].accounts[0].address === nonceAccountAddress && transaction.instructions[0].accounts[2].address === nonceAuthorityAddress) {
133
- return transaction;
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, instruction]
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: [instruction, ...transaction.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 Error(
196
- `This transaction includes an address (\`${instruction.programAddress}\`) which is both invoked and set as the fee payer. Program addresses may not pay fees.`
197
- );
389
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_INVOKED_PROGRAMS_CANNOT_PAY_FEES, {
390
+ programAddress: instruction.programAddress
391
+ });
198
392
  default:
199
- throw new Error(
200
- `This transaction includes an address (\`${instruction.programAddress}\`) which is both invoked and marked writable. Program addresses may not be writable.`
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 || (addressComparator = getBase58EncodedAddressComparator()))(
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 Error(
267
- `This transaction includes an address (\`${account.address}\`) which is both invoked and marked writable. Program addresses may not be writable.`
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 || (addressComparator = getBase58EncodedAddressComparator());
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,23 +544,22 @@ 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[_a = account.lookupTableAddress] || (index[_a] = {
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 {
363
559
  entry.readableIndices.push(account.addressIndex);
364
560
  }
365
561
  }
366
- return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
562
+ return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
367
563
  lookupTableAddress,
368
564
  ...index[lookupTableAddress]
369
565
  }));
@@ -442,303 +638,288 @@ function compileMessage(transaction) {
442
638
  version: transaction.version
443
639
  };
444
640
  }
445
- function getAddressTableLookupCodec() {
446
- return struct(
447
- [
448
- [
449
- "lookupTableAddress",
450
- getBase58EncodedAddressCodec(
451
- __DEV__ ? {
452
- description: "The address of the address lookup table account from which instruction addresses should be looked up"
453
- } : void 0
454
- )
455
- ],
641
+ var memoizedAddressTableLookupEncoder;
642
+ function getAddressTableLookupEncoder() {
643
+ if (!memoizedAddressTableLookupEncoder) {
644
+ memoizedAddressTableLookupEncoder = getStructEncoder([
645
+ ["lookupTableAddress", getAddressEncoder()],
456
646
  [
457
647
  "writableIndices",
458
- array(u8(), {
459
- ...__DEV__ ? {
460
- description: "The indices of the accounts in the lookup table that should be loaded as writeable"
461
- } : null,
462
- size: shortU16()
463
- })
648
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
464
649
  ],
465
650
  [
466
651
  "readableIndices",
467
- array(u8(), {
468
- ...__DEV__ ? {
469
- description: "The indices of the accounts in the lookup table that should be loaded as read-only"
470
- } : void 0,
471
- size: shortU16()
472
- })
652
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
473
653
  ]
474
- ],
475
- __DEV__ ? {
476
- description: "A pointer to the address of an address lookup table, along with the readonly/writeable indices of the addresses that should be loaded from it"
477
- } : void 0
478
- );
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;
479
743
  }
480
- function getMessageHeaderCodec() {
481
- return struct(
482
- [
483
- [
484
- "numSignerAccounts",
485
- u8(
486
- __DEV__ ? {
487
- description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction"
488
- } : void 0
489
- )
490
- ],
491
- [
492
- "numReadonlySignerAccounts",
493
- u8(
494
- __DEV__ ? {
495
- description: "The expected number of addresses in the static address list belonging to accounts that are required to sign this transaction, but may not be writable"
496
- } : void 0
497
- )
498
- ],
499
- [
500
- "numReadonlyNonSignerAccounts",
501
- u8(
502
- __DEV__ ? {
503
- description: "The expected number of addresses in the static address list belonging to accounts that are neither signers, nor writable"
504
- } : void 0
505
- )
506
- ]
507
- ],
508
- __DEV__ ? {
509
- description: "The transaction message header containing counts of the signer, readonly-signer, and readonly-nonsigner account addresses"
510
- } : void 0
511
- );
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
+ });
512
762
  }
513
- function getInstructionCodec() {
514
- return mapSerializer(
515
- struct([
516
- [
517
- "programAddressIndex",
518
- u8(
519
- __DEV__ ? {
520
- description: "The index of the program being called, according to the well-ordered accounts list for this transaction"
521
- } : void 0
522
- )
523
- ],
524
- [
525
- "accountIndices",
526
- array(
527
- u8({
528
- description: __DEV__ ? "The index of an account, according to the well-ordered accounts list for this transaction" : ""
529
- }),
530
- {
531
- description: __DEV__ ? "An optional list of account indices, according to the well-ordered accounts list for this transaction, in the order in which the program being called expects them" : "",
532
- size: shortU16()
533
- }
534
- )
535
- ],
536
- [
537
- "data",
538
- bytes({
539
- description: __DEV__ ? "An optional buffer of data passed to the instruction" : "",
540
- size: shortU16()
541
- })
542
- ]
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()]
543
787
  ]),
544
788
  (value) => {
545
- if (value.accountIndices !== void 0 && value.data !== void 0) {
789
+ if (value.version === "legacy") {
546
790
  return value;
547
791
  }
548
792
  return {
549
793
  ...value,
550
- accountIndices: value.accountIndices ?? [],
551
- data: value.data ?? new Uint8Array(0)
794
+ addressTableLookups: value.addressTableLookups ?? []
552
795
  };
796
+ }
797
+ );
798
+ }
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
+ ];
807
+ }
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
+ ];
817
+ }
818
+ function getAddressTableLookupArrayEncoder() {
819
+ return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
820
+ }
821
+ function getAddressTableLookupArrayDecoder() {
822
+ return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
823
+ }
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);
831
+ }
553
832
  },
554
- (value) => {
555
- if (value.accountIndices.length && value.data.byteLength) {
556
- return value;
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);
557
838
  }
558
- const { accountIndices, data, ...rest } = value;
559
- return {
560
- ...rest,
561
- ...accountIndices.length ? { accountIndices } : null,
562
- ...data.byteLength ? { data } : null
563
- };
564
839
  }
565
- );
840
+ });
566
841
  }
567
-
568
- // src/serializers/unimplemented.ts
569
- function getError(type, name) {
570
- const functionSuffix = name + type[0].toUpperCase() + type.slice(1);
571
- return new Error(
572
- `No ${type} exists for ${name}. Use \`get${functionSuffix}()\` if you need a ${type}, and \`get${name}Codec()\` if you need to both encode and decode ${name}`
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
+ }
573
851
  );
574
852
  }
575
- function getUnimplementedDecoder(name) {
576
- return () => {
577
- throw getError("decoder", name);
578
- };
853
+ function getCompiledMessageCodec() {
854
+ return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
579
855
  }
580
856
 
581
- // src/serializers/transaction-version.ts
582
- var VERSION_FLAG_MASK = 128;
583
- var BASE_CONFIG = {
584
- description: __DEV__ ? "A single byte that encodes the version of the transaction" : "",
585
- fixedSize: null,
586
- maxSize: 1
587
- };
588
- function deserialize(bytes3, offset = 0) {
589
- const firstByte = bytes3[offset];
590
- if ((firstByte & VERSION_FLAG_MASK) === 0) {
591
- return ["legacy", offset];
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
+ }
592
866
  } else {
593
- const version = firstByte ^ VERSION_FLAG_MASK;
594
- return [version, offset + 1];
595
- }
596
- }
597
- function serialize(value) {
598
- if (value === "legacy") {
599
- return new Uint8Array();
600
- }
601
- if (value < 0 || value > 127) {
602
- throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
867
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
603
868
  }
604
- return new Uint8Array([value | VERSION_FLAG_MASK]);
605
- }
606
- function getTransactionVersionCodec() {
607
869
  return {
608
- ...BASE_CONFIG,
609
- deserialize,
610
- serialize
870
+ compiledMessage,
871
+ signatures
611
872
  };
612
873
  }
613
874
 
614
- // src/serializers/message.ts
615
- var BASE_CONFIG2 = {
616
- description: __DEV__ ? "The wire format of a Solana transaction message" : "",
617
- fixedSize: null,
618
- maxSize: null
619
- };
620
- function serialize2(compiledMessage) {
621
- if (compiledMessage.version === "legacy") {
622
- return struct(getPreludeStructSerializerTuple()).serialize(compiledMessage);
623
- } else {
624
- return mapSerializer(
625
- struct([
626
- ...getPreludeStructSerializerTuple(),
627
- ["addressTableLookups", getAddressTableLookupsSerializer()]
628
- ]),
629
- (value) => {
630
- if (value.version === "legacy") {
631
- return value;
632
- }
633
- return {
634
- ...value,
635
- addressTableLookups: value.addressTableLookups ?? []
636
- };
637
- }
638
- ).serialize(compiledMessage);
639
- }
875
+ // src/serializers/transaction.ts
876
+ function getCompiledTransactionEncoder() {
877
+ return getStructEncoder([
878
+ ["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
879
+ ["compiledMessage", getCompiledMessageEncoder()]
880
+ ]);
640
881
  }
641
- function getPreludeStructSerializerTuple() {
642
- return [
643
- ["version", getTransactionVersionCodec()],
644
- ["header", getMessageHeaderCodec()],
882
+ function getCompiledTransactionDecoder() {
883
+ return getStructDecoder([
645
884
  [
646
- "staticAccounts",
647
- array(getBase58EncodedAddressCodec(), {
648
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
649
- size: shortU16()
650
- })
651
- ],
652
- [
653
- "lifetimeToken",
654
- string({
655
- description: __DEV__ ? "A 32-byte token that specifies the lifetime of this transaction (eg. a recent blockhash, or a durable nonce)" : "",
656
- encoding: base58,
657
- size: 32
885
+ "signatures",
886
+ getArrayDecoder(getBytesDecoder({ size: 64 }), {
887
+ size: getShortU16Decoder()
658
888
  })
659
889
  ],
660
- [
661
- "instructions",
662
- array(getInstructionCodec(), {
663
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
664
- size: shortU16()
665
- })
666
- ]
667
- ];
890
+ ["compiledMessage", getCompiledMessageDecoder()]
891
+ ]);
668
892
  }
669
- function getAddressTableLookupsSerializer() {
670
- return array(getAddressTableLookupCodec(), {
671
- ...__DEV__ ? { description: "A compact array of address table lookups belonging to this transaction" } : null,
672
- size: shortU16()
673
- });
674
- }
675
- function getCompiledMessageEncoder() {
676
- return {
677
- ...BASE_CONFIG2,
678
- deserialize: getUnimplementedDecoder("CompiledMessage"),
679
- serialize: serialize2
680
- };
681
- }
682
-
683
- // src/signatures.ts
684
- function assertIsTransactionSignature(putativeTransactionSignature) {
685
- try {
686
- if (
687
- // Lowest value (64 bytes of zeroes)
688
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
689
- putativeTransactionSignature.length > 88
690
- ) {
691
- throw new Error("Expected input string to decode to a byte array of length 64.");
692
- }
693
- const bytes3 = base58.serialize(putativeTransactionSignature);
694
- const numBytes = bytes3.byteLength;
695
- if (numBytes !== 64) {
696
- throw new Error(`Expected input string to decode to a byte array of length 64. Actual length: ${numBytes}`);
697
- }
698
- } catch (e) {
699
- throw new Error(`\`${putativeTransactionSignature}\` is not a transaction signature`, {
700
- cause: e
701
- });
702
- }
893
+ function getTransactionEncoder() {
894
+ return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
703
895
  }
704
- function isTransactionSignature(putativeTransactionSignature) {
705
- if (
706
- // Lowest value (64 bytes of zeroes)
707
- putativeTransactionSignature.length < 64 || // Highest value (64 bytes of 255)
708
- putativeTransactionSignature.length > 88
709
- ) {
710
- return false;
711
- }
712
- const bytes3 = base58.serialize(putativeTransactionSignature);
713
- const numBytes = bytes3.byteLength;
714
- if (numBytes !== 64) {
715
- return false;
716
- }
717
- return true;
896
+ function getTransactionDecoder(config) {
897
+ return mapDecoder(
898
+ getCompiledTransactionDecoder(),
899
+ (compiledTransaction) => decompileTransaction(compiledTransaction, config)
900
+ );
718
901
  }
719
- async function getCompiledMessageSignature(message, secretKey) {
720
- const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
721
- const signature = await signBytes(secretKey, wireMessageBytes);
722
- return signature;
902
+ function getTransactionCodec(config) {
903
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
723
904
  }
905
+ var base58Decoder;
724
906
  function getSignatureFromTransaction(transaction) {
725
- const signature = transaction.signatures[transaction.feePayer];
726
- if (!signature) {
727
- throw new Error(
728
- "Could not determine this transaction's signature. Make sure that the transaction has been signed by its fee payer."
729
- );
907
+ if (!base58Decoder)
908
+ base58Decoder = getBase58Decoder();
909
+ const signatureBytes = transaction.signatures[transaction.feePayer];
910
+ if (!signatureBytes) {
911
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
730
912
  }
731
- return signature;
913
+ const transactionSignature = base58Decoder.decode(signatureBytes);
914
+ return transactionSignature;
732
915
  }
733
- async function signTransaction(keyPairs, transaction) {
916
+ async function partiallySignTransaction(keyPairs, transaction) {
734
917
  const compiledMessage = compileMessage(transaction);
735
918
  const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
919
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
736
920
  const publicKeySignaturePairs = await Promise.all(
737
921
  keyPairs.map(
738
- (keyPair) => Promise.all([
739
- getAddressFromPublicKey(keyPair.publicKey),
740
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
741
- ])
922
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
742
923
  )
743
924
  );
744
925
  for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
@@ -751,64 +932,32 @@ async function signTransaction(keyPairs, transaction) {
751
932
  Object.freeze(out);
752
933
  return out;
753
934
  }
754
- function transactionSignature(putativeTransactionSignature) {
755
- assertIsTransactionSignature(putativeTransactionSignature);
756
- return putativeTransactionSignature;
935
+ async function signTransaction(keyPairs, transaction) {
936
+ const out = await partiallySignTransaction(keyPairs, transaction);
937
+ assertTransactionIsFullySigned(out);
938
+ Object.freeze(out);
939
+ return out;
757
940
  }
758
-
759
- // src/compile-transaction.ts
760
- function getCompiledTransaction(transaction) {
761
- const compiledMessage = compileMessage(transaction);
762
- let signatures;
763
- if ("signatures" in transaction) {
764
- signatures = [];
765
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
766
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
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);
767
948
  }
768
- } else {
769
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
949
+ });
950
+ if (missingSigs.length > 0) {
951
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
952
+ addresses: missingSigs
953
+ });
770
954
  }
771
- return {
772
- compiledMessage,
773
- signatures
774
- };
775
955
  }
776
-
777
- // src/serializers/transaction.ts
778
- var BASE_CONFIG3 = {
779
- description: __DEV__ ? "The wire format of a Solana transaction" : "",
780
- fixedSize: null,
781
- maxSize: null
782
- };
783
- function serialize3(transaction) {
784
- const compiledTransaction = getCompiledTransaction(transaction);
785
- return struct([
786
- [
787
- "signatures",
788
- array(bytes({ size: 64 }), {
789
- ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
790
- size: shortU16()
791
- })
792
- ],
793
- ["compiledMessage", getCompiledMessageEncoder()]
794
- ]).serialize(compiledTransaction);
795
- }
796
- function getTransactionEncoder() {
797
- return {
798
- ...BASE_CONFIG3,
799
- deserialize: getUnimplementedDecoder("CompiledMessage"),
800
- serialize: serialize3
801
- };
802
- }
803
-
804
- // src/wire-transaction.ts
805
956
  function getBase64EncodedWireTransaction(transaction) {
806
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
807
- {
808
- return btoa(String.fromCharCode(...wireTransactionBytes));
809
- }
957
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
958
+ return getBase64Decoder().decode(wireTransactionBytes);
810
959
  }
811
960
 
812
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, assertIsTransactionSignature, createTransaction, getBase64EncodedWireTransaction, getSignatureFromTransaction, isTransactionSignature, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction, transactionSignature };
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 };
813
962
  //# sourceMappingURL=out.js.map
814
963
  //# sourceMappingURL=index.browser.js.map