@solana/transactions 2.0.0-experimental.cd89114 → 2.0.0-experimental.cdf7079

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 (71) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +276 -5
  3. package/dist/index.browser.cjs +502 -297
  4. package/dist/index.browser.cjs.map +1 -1
  5. package/dist/index.browser.js +487 -298
  6. package/dist/index.browser.js.map +1 -1
  7. package/dist/index.native.js +487 -298
  8. package/dist/index.native.js.map +1 -1
  9. package/dist/index.node.cjs +502 -297
  10. package/dist/index.node.cjs.map +1 -1
  11. package/dist/index.node.js +487 -298
  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 -0
  15. package/dist/types/blockhash.d.ts +5 -7
  16. package/dist/types/blockhash.d.ts.map +1 -0
  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 -0
  21. package/dist/types/compile-header.d.ts +1 -1
  22. package/dist/types/compile-header.d.ts.map +1 -0
  23. package/dist/types/compile-instructions.d.ts +1 -1
  24. package/dist/types/compile-instructions.d.ts.map +1 -0
  25. package/dist/types/compile-lifetime-token.d.ts +1 -1
  26. package/dist/types/compile-lifetime-token.d.ts.map +1 -0
  27. package/dist/types/compile-static-accounts.d.ts +3 -3
  28. package/dist/types/compile-static-accounts.d.ts.map +1 -0
  29. package/dist/types/compile-transaction.d.ts +6 -7
  30. package/dist/types/compile-transaction.d.ts.map +1 -0
  31. package/dist/types/create-transaction.d.ts +1 -1
  32. package/dist/types/create-transaction.d.ts.map +1 -0
  33. package/dist/types/decompile-transaction.d.ts +13 -0
  34. package/dist/types/decompile-transaction.d.ts.map +1 -0
  35. package/dist/types/durable-nonce.d.ts +9 -8
  36. package/dist/types/durable-nonce.d.ts.map +1 -0
  37. package/dist/types/fee-payer.d.ts +6 -6
  38. package/dist/types/fee-payer.d.ts.map +1 -0
  39. package/dist/types/index.d.ts +13 -8
  40. package/dist/types/index.d.ts.map +1 -0
  41. package/dist/types/instructions.d.ts +4 -2
  42. package/dist/types/instructions.d.ts.map +1 -0
  43. package/dist/types/message.d.ts +6 -10
  44. package/dist/types/message.d.ts.map +1 -0
  45. package/dist/types/serializers/address-table-lookup.d.ts +5 -3
  46. package/dist/types/serializers/address-table-lookup.d.ts.map +1 -0
  47. package/dist/types/serializers/header.d.ts +5 -3
  48. package/dist/types/serializers/header.d.ts.map +1 -0
  49. package/dist/types/serializers/index.d.ts +3 -0
  50. package/dist/types/serializers/index.d.ts.map +1 -0
  51. package/dist/types/serializers/instruction.d.ts +5 -3
  52. package/dist/types/serializers/instruction.d.ts.map +1 -0
  53. package/dist/types/serializers/message.d.ts +5 -5
  54. package/dist/types/serializers/message.d.ts.map +1 -0
  55. package/dist/types/serializers/transaction-version.d.ts +5 -5
  56. package/dist/types/serializers/transaction-version.d.ts.map +1 -0
  57. package/dist/types/serializers/transaction.d.ts +9 -5
  58. package/dist/types/serializers/transaction.d.ts.map +1 -0
  59. package/dist/types/signatures.d.ts +9 -5
  60. package/dist/types/signatures.d.ts.map +1 -0
  61. package/dist/types/types.d.ts +6 -13
  62. package/dist/types/types.d.ts.map +1 -0
  63. package/dist/types/unsigned-transaction.d.ts +1 -1
  64. package/dist/types/unsigned-transaction.d.ts.map +1 -0
  65. package/dist/types/wire-transaction.d.ts +2 -2
  66. package/dist/types/wire-transaction.d.ts.map +1 -0
  67. package/package.json +21 -38
  68. package/dist/index.development.js +0 -1331
  69. package/dist/index.development.js.map +0 -1
  70. package/dist/index.production.min.js +0 -20
  71. package/dist/types/serializers/unimplemented.d.ts +0 -3
@@ -1,9 +1,36 @@
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 { getBase58Decoder, getBase64Decoder, getStringEncoder, getBase58Encoder, getStringDecoder } from '@solana/codecs-strings';
2
+ import { getAddressFromPublicKey, assertIsAddress, getAddressComparator, getAddressEncoder, getAddressDecoder } from '@solana/addresses';
3
+ import { pipe } from '@solana/functional';
4
+ import { createEncoder, mapDecoder, combineCodec, mapEncoder, createDecoder } from '@solana/codecs-core';
5
+ import { getStructDecoder, getArrayDecoder, getBytesDecoder, getStructEncoder, getArrayEncoder, getBytesEncoder } from '@solana/codecs-data-structures';
6
+ import { getShortU16Decoder, getShortU16Encoder, getU8Encoder, getU8Decoder } from '@solana/codecs-numbers';
7
+ import { SolanaError, SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE, SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES } from '@solana/errors';
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
+ // ../rpc-types/dist/index.browser.js
11
+ var base58Encoder;
12
+ function assertIsBlockhash(putativeBlockhash) {
13
+ if (!base58Encoder)
14
+ base58Encoder = getBase58Encoder();
15
+ try {
16
+ if (
17
+ // Lowest value (32 bytes of zeroes)
18
+ putativeBlockhash.length < 32 || // Highest value (32 bytes of 255)
19
+ putativeBlockhash.length > 44
20
+ ) {
21
+ throw new Error("Expected input string to decode to a byte array of length 32.");
22
+ }
23
+ const bytes = base58Encoder.encode(putativeBlockhash);
24
+ const numBytes = bytes.byteLength;
25
+ if (numBytes !== 32) {
26
+ throw new Error(`Expected input string to decode to a byte array of length 32. Actual length: ${numBytes}`);
27
+ }
28
+ } catch (e) {
29
+ throw new Error(`\`${putativeBlockhash}\` is not a blockhash`, {
30
+ cause: e
31
+ });
32
+ }
33
+ }
7
34
 
8
35
  // src/unsigned-transaction.ts
9
36
  function getUnsignedTransaction(transaction) {
@@ -20,24 +47,20 @@ function getUnsignedTransaction(transaction) {
20
47
  }
21
48
 
22
49
  // src/blockhash.ts
23
- function assertIsBlockhash(putativeBlockhash) {
50
+ function isTransactionWithBlockhashLifetime(transaction) {
51
+ const lifetimeConstraintShapeMatches = "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.blockhash === "string" && typeof transaction.lifetimeConstraint.lastValidBlockHeight === "bigint";
52
+ if (!lifetimeConstraintShapeMatches)
53
+ return false;
24
54
  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
- });
55
+ assertIsBlockhash(transaction.lifetimeConstraint.blockhash);
56
+ return true;
57
+ } catch {
58
+ return false;
59
+ }
60
+ }
61
+ function assertIsTransactionWithBlockhashLifetime(transaction) {
62
+ if (!isTransactionWithBlockhashLifetime(transaction)) {
63
+ throw new Error("Transaction does not have a blockhash lifetime");
41
64
  }
42
65
  }
43
66
  function setTransactionLifetimeUsingBlockhash(blockhashLifetimeConstraint, transaction) {
@@ -115,7 +138,7 @@ function isAdvanceNonceAccountInstruction(instruction) {
115
138
  instruction.accounts?.length === 3 && // First account is nonce account address
116
139
  instruction.accounts[0].address != null && instruction.accounts[0].role === AccountRole.WRITABLE && // Second account is recent blockhashes sysvar
117
140
  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;
141
+ instruction.accounts[2].address != null && isSignerRole(instruction.accounts[2].role);
119
142
  }
120
143
  function isAdvanceNonceAccountInstructionData(data) {
121
144
  return data.byteLength === 4 && data[0] === 4 && data[1] === 0 && data[2] === 0 && data[3] === 0;
@@ -123,21 +146,38 @@ function isAdvanceNonceAccountInstructionData(data) {
123
146
  function isDurableNonceTransaction(transaction) {
124
147
  return "lifetimeConstraint" in transaction && typeof transaction.lifetimeConstraint.nonce === "string" && transaction.instructions[0] != null && isAdvanceNonceAccountInstruction(transaction.instructions[0]);
125
148
  }
149
+ function isAdvanceNonceAccountInstructionForNonce(instruction, nonceAccountAddress, nonceAuthorityAddress) {
150
+ return instruction.accounts[0].address === nonceAccountAddress && instruction.accounts[2].address === nonceAuthorityAddress;
151
+ }
126
152
  function setTransactionLifetimeUsingDurableNonce({
127
153
  nonce,
128
154
  nonceAccountAddress,
129
155
  nonceAuthorityAddress
130
156
  }, 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;
157
+ let newInstructions;
158
+ const firstInstruction = transaction.instructions[0];
159
+ if (firstInstruction && isAdvanceNonceAccountInstruction(firstInstruction)) {
160
+ if (isAdvanceNonceAccountInstructionForNonce(firstInstruction, nonceAccountAddress, nonceAuthorityAddress)) {
161
+ if (isDurableNonceTransaction(transaction) && transaction.lifetimeConstraint.nonce === nonce) {
162
+ return transaction;
163
+ } else {
164
+ newInstructions = [firstInstruction, ...transaction.instructions.slice(1)];
165
+ }
166
+ } else {
167
+ newInstructions = [
168
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
169
+ ...transaction.instructions.slice(1)
170
+ ];
171
+ }
172
+ } else {
173
+ newInstructions = [
174
+ createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
175
+ ...transaction.instructions
176
+ ];
134
177
  }
135
178
  const out = {
136
179
  ...getUnsignedTransaction(transaction),
137
- instructions: [
138
- createAdvanceNonceAccountInstruction(nonceAccountAddress, nonceAuthorityAddress),
139
- ...isAlreadyDurableNonceTransaction ? transaction.instructions.slice(1) : transaction.instructions
140
- ],
180
+ instructions: newInstructions,
141
181
  lifetimeConstraint: {
142
182
  nonce
143
183
  }
@@ -161,21 +201,172 @@ function setTransactionFeePayer(feePayer, transaction) {
161
201
 
162
202
  // src/instructions.ts
163
203
  function appendTransactionInstruction(instruction, transaction) {
204
+ return appendTransactionInstructions([instruction], transaction);
205
+ }
206
+ function appendTransactionInstructions(instructions, transaction) {
164
207
  const out = {
165
208
  ...getUnsignedTransaction(transaction),
166
- instructions: [...transaction.instructions, instruction]
209
+ instructions: [...transaction.instructions, ...instructions]
167
210
  };
168
211
  Object.freeze(out);
169
212
  return out;
170
213
  }
171
214
  function prependTransactionInstruction(instruction, transaction) {
215
+ return prependTransactionInstructions([instruction], transaction);
216
+ }
217
+ function prependTransactionInstructions(instructions, transaction) {
172
218
  const out = {
173
219
  ...getUnsignedTransaction(transaction),
174
- instructions: [instruction, ...transaction.instructions]
220
+ instructions: [...instructions, ...transaction.instructions]
175
221
  };
176
222
  Object.freeze(out);
177
223
  return out;
178
224
  }
225
+
226
+ // src/decompile-transaction.ts
227
+ function getAccountMetas(message) {
228
+ const { header } = message;
229
+ const numWritableSignerAccounts = header.numSignerAccounts - header.numReadonlySignerAccounts;
230
+ const numWritableNonSignerAccounts = message.staticAccounts.length - header.numSignerAccounts - header.numReadonlyNonSignerAccounts;
231
+ const accountMetas = [];
232
+ let accountIndex = 0;
233
+ for (let i = 0; i < numWritableSignerAccounts; i++) {
234
+ accountMetas.push({
235
+ address: message.staticAccounts[accountIndex],
236
+ role: AccountRole.WRITABLE_SIGNER
237
+ });
238
+ accountIndex++;
239
+ }
240
+ for (let i = 0; i < header.numReadonlySignerAccounts; i++) {
241
+ accountMetas.push({
242
+ address: message.staticAccounts[accountIndex],
243
+ role: AccountRole.READONLY_SIGNER
244
+ });
245
+ accountIndex++;
246
+ }
247
+ for (let i = 0; i < numWritableNonSignerAccounts; i++) {
248
+ accountMetas.push({
249
+ address: message.staticAccounts[accountIndex],
250
+ role: AccountRole.WRITABLE
251
+ });
252
+ accountIndex++;
253
+ }
254
+ for (let i = 0; i < header.numReadonlyNonSignerAccounts; i++) {
255
+ accountMetas.push({
256
+ address: message.staticAccounts[accountIndex],
257
+ role: AccountRole.READONLY
258
+ });
259
+ accountIndex++;
260
+ }
261
+ return accountMetas;
262
+ }
263
+ function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTableAddress) {
264
+ const compiledAddressTableLookupAddresses = compiledAddressTableLookups.map((l) => l.lookupTableAddress);
265
+ const missing = compiledAddressTableLookupAddresses.filter((a) => addressesByLookupTableAddress[a] === void 0);
266
+ if (missing.length > 0) {
267
+ const missingAddresses = missing.join(", ");
268
+ throw new Error(`Addresses not provided for lookup tables: [${missingAddresses}]`);
269
+ }
270
+ const readOnlyMetas = [];
271
+ const writableMetas = [];
272
+ for (const lookup of compiledAddressTableLookups) {
273
+ const addresses = addressesByLookupTableAddress[lookup.lookupTableAddress];
274
+ const highestIndex = Math.max(...lookup.readableIndices, ...lookup.writableIndices);
275
+ if (highestIndex >= addresses.length) {
276
+ throw new Error(
277
+ `Cannot look up index ${highestIndex} in lookup table [${lookup.lookupTableAddress}]. The lookup table may have been extended since the addresses provided were retrieved.`
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 Error(`Could not find program address at index ${instruction.programAddressIndex}`);
301
+ }
302
+ const accounts = instruction.accountIndices?.map((accountIndex) => accountMetas[accountIndex]);
303
+ const { data } = instruction;
304
+ return {
305
+ programAddress,
306
+ ...accounts && accounts.length ? { accounts } : {},
307
+ ...data && data.length ? { data } : {}
308
+ };
309
+ }
310
+ function getLifetimeConstraint(messageLifetimeToken, firstInstruction, lastValidBlockHeight) {
311
+ if (!firstInstruction || !isAdvanceNonceAccountInstruction(firstInstruction)) {
312
+ return {
313
+ blockhash: messageLifetimeToken,
314
+ lastValidBlockHeight: lastValidBlockHeight ?? 2n ** 64n - 1n
315
+ // U64 MAX
316
+ };
317
+ } else {
318
+ const nonceAccountAddress = firstInstruction.accounts[0].address;
319
+ assertIsAddress(nonceAccountAddress);
320
+ const nonceAuthorityAddress = firstInstruction.accounts[2].address;
321
+ assertIsAddress(nonceAuthorityAddress);
322
+ return {
323
+ nonce: messageLifetimeToken,
324
+ nonceAccountAddress,
325
+ nonceAuthorityAddress
326
+ };
327
+ }
328
+ }
329
+ function convertSignatures(compiledTransaction) {
330
+ const {
331
+ compiledMessage: { staticAccounts },
332
+ signatures
333
+ } = compiledTransaction;
334
+ return signatures.reduce((acc, sig, index) => {
335
+ const allZeros = sig.every((byte) => byte === 0);
336
+ if (allZeros)
337
+ return acc;
338
+ const address = staticAccounts[index];
339
+ return { ...acc, [address]: sig };
340
+ }, {});
341
+ }
342
+ function decompileTransaction(compiledTransaction, config) {
343
+ const { compiledMessage } = compiledTransaction;
344
+ const feePayer = compiledMessage.staticAccounts[0];
345
+ if (!feePayer)
346
+ throw new Error("No fee payer set in CompiledTransaction");
347
+ const accountMetas = getAccountMetas(compiledMessage);
348
+ const accountLookupMetas = "addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups !== void 0 && compiledMessage.addressTableLookups.length > 0 ? getAddressLookupMetas(compiledMessage.addressTableLookups, config?.addressesByLookupTableAddress ?? {}) : [];
349
+ const transactionMetas = [...accountMetas, ...accountLookupMetas];
350
+ const instructions = compiledMessage.instructions.map(
351
+ (compiledInstruction) => convertInstruction(compiledInstruction, transactionMetas)
352
+ );
353
+ const firstInstruction = instructions[0];
354
+ const lifetimeConstraint = getLifetimeConstraint(
355
+ compiledMessage.lifetimeToken,
356
+ firstInstruction,
357
+ config?.lastValidBlockHeight
358
+ );
359
+ const signatures = convertSignatures(compiledTransaction);
360
+ return pipe(
361
+ createTransaction({ version: compiledMessage.version }),
362
+ (tx) => setTransactionFeePayer(feePayer, tx),
363
+ (tx) => instructions.reduce((acc, instruction) => {
364
+ return appendTransactionInstruction(instruction, acc);
365
+ }, tx),
366
+ (tx) => "blockhash" in lifetimeConstraint ? setTransactionLifetimeUsingBlockhash(lifetimeConstraint, tx) : setTransactionLifetimeUsingDurableNonce(lifetimeConstraint, tx),
367
+ (tx) => Object.keys(signatures).length > 0 ? { ...tx, signatures } : tx
368
+ );
369
+ }
179
370
  function upsert(addressMap, address, update) {
180
371
  addressMap[address] = update(addressMap[address] ?? { role: AccountRole.READONLY });
181
372
  }
@@ -228,7 +419,7 @@ function getAddressMapFromInstructions(feePayer, instructions) {
228
419
  const shouldReplaceEntry = (
229
420
  // Consider using the new LOOKUP_TABLE if its address is different...
230
421
  entry.lookupTableAddress !== accountMeta.lookupTableAddress && // ...and sorts before the existing one.
231
- (addressComparator || (addressComparator = getBase58EncodedAddressComparator()))(
422
+ (addressComparator ||= getAddressComparator())(
232
423
  accountMeta.lookupTableAddress,
233
424
  entry.lookupTableAddress
234
425
  ) < 0
@@ -334,7 +525,7 @@ function getOrderedAccountsFromAddressMap(addressMap) {
334
525
  if (leftIsWritable !== isWritableRole(rightEntry.role)) {
335
526
  return leftIsWritable ? -1 : 1;
336
527
  }
337
- addressComparator || (addressComparator = getBase58EncodedAddressComparator());
528
+ addressComparator ||= getAddressComparator();
338
529
  if (leftEntry[TYPE] === 1 /* LOOKUP_TABLE */ && rightEntry[TYPE] === 1 /* LOOKUP_TABLE */ && leftEntry.lookupTableAddress !== rightEntry.lookupTableAddress) {
339
530
  return addressComparator(leftEntry.lookupTableAddress, rightEntry.lookupTableAddress);
340
531
  } else {
@@ -347,23 +538,22 @@ function getOrderedAccountsFromAddressMap(addressMap) {
347
538
  return orderedAccounts;
348
539
  }
349
540
  function getCompiledAddressTableLookups(orderedAccounts) {
350
- var _a;
351
541
  const index = {};
352
542
  for (const account of orderedAccounts) {
353
543
  if (!("lookupTableAddress" in account)) {
354
544
  continue;
355
545
  }
356
- const entry = index[_a = account.lookupTableAddress] || (index[_a] = {
546
+ const entry = index[account.lookupTableAddress] ||= {
357
547
  readableIndices: [],
358
548
  writableIndices: []
359
- });
549
+ };
360
550
  if (account.role === AccountRole.WRITABLE) {
361
551
  entry.writableIndices.push(account.addressIndex);
362
552
  } else {
363
553
  entry.readableIndices.push(account.addressIndex);
364
554
  }
365
555
  }
366
- return Object.keys(index).sort(getBase58EncodedAddressComparator()).map((lookupTableAddress) => ({
556
+ return Object.keys(index).sort(getAddressComparator()).map((lookupTableAddress) => ({
367
557
  lookupTableAddress,
368
558
  ...index[lookupTableAddress]
369
559
  }));
@@ -442,259 +632,286 @@ function compileMessage(transaction) {
442
632
  version: transaction.version
443
633
  };
444
634
  }
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
- ],
635
+ var memoizedAddressTableLookupEncoder;
636
+ function getAddressTableLookupEncoder() {
637
+ if (!memoizedAddressTableLookupEncoder) {
638
+ memoizedAddressTableLookupEncoder = getStructEncoder([
639
+ ["lookupTableAddress", getAddressEncoder()],
456
640
  [
457
641
  "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
- })
642
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
464
643
  ],
465
644
  [
466
645
  "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
- })
646
+ getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })
473
647
  ]
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
- );
648
+ ]);
649
+ }
650
+ return memoizedAddressTableLookupEncoder;
651
+ }
652
+ var memoizedAddressTableLookupDecoder;
653
+ function getAddressTableLookupDecoder() {
654
+ if (!memoizedAddressTableLookupDecoder) {
655
+ memoizedAddressTableLookupDecoder = getStructDecoder([
656
+ ["lookupTableAddress", getAddressDecoder()],
657
+ ["writableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
658
+ ["readableIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })]
659
+ ]);
660
+ }
661
+ return memoizedAddressTableLookupDecoder;
662
+ }
663
+ var memoizedU8Encoder;
664
+ function getMemoizedU8Encoder() {
665
+ if (!memoizedU8Encoder)
666
+ memoizedU8Encoder = getU8Encoder();
667
+ return memoizedU8Encoder;
668
+ }
669
+ var memoizedU8Decoder;
670
+ function getMemoizedU8Decoder() {
671
+ if (!memoizedU8Decoder)
672
+ memoizedU8Decoder = getU8Decoder();
673
+ return memoizedU8Decoder;
674
+ }
675
+ function getMessageHeaderEncoder() {
676
+ return getStructEncoder([
677
+ ["numSignerAccounts", getMemoizedU8Encoder()],
678
+ ["numReadonlySignerAccounts", getMemoizedU8Encoder()],
679
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Encoder()]
680
+ ]);
681
+ }
682
+ function getMessageHeaderDecoder() {
683
+ return getStructDecoder([
684
+ ["numSignerAccounts", getMemoizedU8Decoder()],
685
+ ["numReadonlySignerAccounts", getMemoizedU8Decoder()],
686
+ ["numReadonlyNonSignerAccounts", getMemoizedU8Decoder()]
687
+ ]);
688
+ }
689
+ var memoizedGetInstructionEncoder;
690
+ function getInstructionEncoder() {
691
+ if (!memoizedGetInstructionEncoder) {
692
+ memoizedGetInstructionEncoder = mapEncoder(
693
+ getStructEncoder([
694
+ ["programAddressIndex", getU8Encoder()],
695
+ ["accountIndices", getArrayEncoder(getU8Encoder(), { size: getShortU16Encoder() })],
696
+ ["data", getBytesEncoder({ size: getShortU16Encoder() })]
697
+ ]),
698
+ // Convert an instruction to have all fields defined
699
+ (instruction) => {
700
+ if (instruction.accountIndices !== void 0 && instruction.data !== void 0) {
701
+ return instruction;
702
+ }
703
+ return {
704
+ ...instruction,
705
+ accountIndices: instruction.accountIndices ?? [],
706
+ data: instruction.data ?? new Uint8Array(0)
707
+ };
708
+ }
709
+ );
710
+ }
711
+ return memoizedGetInstructionEncoder;
712
+ }
713
+ var memoizedGetInstructionDecoder;
714
+ function getInstructionDecoder() {
715
+ if (!memoizedGetInstructionDecoder) {
716
+ memoizedGetInstructionDecoder = mapDecoder(
717
+ getStructDecoder([
718
+ ["programAddressIndex", getU8Decoder()],
719
+ ["accountIndices", getArrayDecoder(getU8Decoder(), { size: getShortU16Decoder() })],
720
+ ["data", getBytesDecoder({ size: getShortU16Decoder() })]
721
+ ]),
722
+ // Convert an instruction to exclude optional fields if they are empty
723
+ (instruction) => {
724
+ if (instruction.accountIndices.length && instruction.data.byteLength) {
725
+ return instruction;
726
+ }
727
+ const { accountIndices, data, ...rest } = instruction;
728
+ return {
729
+ ...rest,
730
+ ...accountIndices.length ? { accountIndices } : null,
731
+ ...data.byteLength ? { data } : null
732
+ };
733
+ }
734
+ );
735
+ }
736
+ return memoizedGetInstructionDecoder;
479
737
  }
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
- );
738
+ var VERSION_FLAG_MASK = 128;
739
+ function getTransactionVersionEncoder() {
740
+ return createEncoder({
741
+ getSizeFromValue: (value) => value === "legacy" ? 0 : 1,
742
+ maxSize: 1,
743
+ write: (value, bytes, offset) => {
744
+ if (value === "legacy") {
745
+ return offset;
746
+ }
747
+ if (value < 0 || value > 127) {
748
+ throw new Error(`Transaction version must be in the range [0, 127]. \`${value}\` given.`);
749
+ }
750
+ bytes.set([value | VERSION_FLAG_MASK], offset);
751
+ return offset + 1;
752
+ }
753
+ });
512
754
  }
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
- ]
755
+ function getTransactionVersionDecoder() {
756
+ return createDecoder({
757
+ maxSize: 1,
758
+ read: (bytes, offset) => {
759
+ const firstByte = bytes[offset];
760
+ if ((firstByte & VERSION_FLAG_MASK) === 0) {
761
+ return ["legacy", offset];
762
+ } else {
763
+ const version = firstByte ^ VERSION_FLAG_MASK;
764
+ return [version, offset + 1];
765
+ }
766
+ }
767
+ });
768
+ }
769
+
770
+ // src/serializers/message.ts
771
+ function getCompiledMessageLegacyEncoder() {
772
+ return getStructEncoder(getPreludeStructEncoderTuple());
773
+ }
774
+ function getCompiledMessageVersionedEncoder() {
775
+ return mapEncoder(
776
+ getStructEncoder([
777
+ ...getPreludeStructEncoderTuple(),
778
+ ["addressTableLookups", getAddressTableLookupArrayEncoder()]
543
779
  ]),
544
780
  (value) => {
545
- if (value.accountIndices !== void 0 && value.data !== void 0) {
781
+ if (value.version === "legacy") {
546
782
  return value;
547
783
  }
548
784
  return {
549
785
  ...value,
550
- accountIndices: value.accountIndices ?? [],
551
- data: value.data ?? new Uint8Array(0)
786
+ addressTableLookups: value.addressTableLookups ?? []
552
787
  };
788
+ }
789
+ );
790
+ }
791
+ function getPreludeStructEncoderTuple() {
792
+ return [
793
+ ["version", getTransactionVersionEncoder()],
794
+ ["header", getMessageHeaderEncoder()],
795
+ ["staticAccounts", getArrayEncoder(getAddressEncoder(), { size: getShortU16Encoder() })],
796
+ ["lifetimeToken", getStringEncoder({ encoding: getBase58Encoder(), size: 32 })],
797
+ ["instructions", getArrayEncoder(getInstructionEncoder(), { size: getShortU16Encoder() })]
798
+ ];
799
+ }
800
+ function getPreludeStructDecoderTuple() {
801
+ return [
802
+ ["version", getTransactionVersionDecoder()],
803
+ ["header", getMessageHeaderDecoder()],
804
+ ["staticAccounts", getArrayDecoder(getAddressDecoder(), { size: getShortU16Decoder() })],
805
+ ["lifetimeToken", getStringDecoder({ encoding: getBase58Decoder(), size: 32 })],
806
+ ["instructions", getArrayDecoder(getInstructionDecoder(), { size: getShortU16Decoder() })],
807
+ ["addressTableLookups", getAddressTableLookupArrayDecoder()]
808
+ ];
809
+ }
810
+ function getAddressTableLookupArrayEncoder() {
811
+ return getArrayEncoder(getAddressTableLookupEncoder(), { size: getShortU16Encoder() });
812
+ }
813
+ function getAddressTableLookupArrayDecoder() {
814
+ return getArrayDecoder(getAddressTableLookupDecoder(), { size: getShortU16Decoder() });
815
+ }
816
+ function getCompiledMessageEncoder() {
817
+ return createEncoder({
818
+ getSizeFromValue: (compiledMessage) => {
819
+ if (compiledMessage.version === "legacy") {
820
+ return getCompiledMessageLegacyEncoder().getSizeFromValue(compiledMessage);
821
+ } else {
822
+ return getCompiledMessageVersionedEncoder().getSizeFromValue(compiledMessage);
823
+ }
553
824
  },
554
- (value) => {
555
- if (value.accountIndices.length && value.data.byteLength) {
556
- return value;
825
+ write: (compiledMessage, bytes, offset) => {
826
+ if (compiledMessage.version === "legacy") {
827
+ return getCompiledMessageLegacyEncoder().write(compiledMessage, bytes, offset);
828
+ } else {
829
+ return getCompiledMessageVersionedEncoder().write(compiledMessage, bytes, offset);
557
830
  }
558
- const { accountIndices, data, ...rest } = value;
559
- return {
560
- ...rest,
561
- ...accountIndices.length ? { accountIndices } : null,
562
- ...data.byteLength ? { data } : null
563
- };
564
831
  }
565
- );
832
+ });
566
833
  }
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}`
834
+ function getCompiledMessageDecoder() {
835
+ return mapDecoder(
836
+ getStructDecoder(getPreludeStructDecoderTuple()),
837
+ ({ addressTableLookups, ...restOfMessage }) => {
838
+ if (restOfMessage.version === "legacy" || !addressTableLookups?.length) {
839
+ return restOfMessage;
840
+ }
841
+ return { ...restOfMessage, addressTableLookups };
842
+ }
573
843
  );
574
844
  }
575
- function getUnimplementedDecoder(name) {
576
- return () => {
577
- throw getError("decoder", name);
578
- };
845
+ function getCompiledMessageCodec() {
846
+ return combineCodec(getCompiledMessageEncoder(), getCompiledMessageDecoder());
579
847
  }
580
848
 
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];
849
+ // src/compile-transaction.ts
850
+ function getCompiledTransaction(transaction) {
851
+ const compiledMessage = compileMessage(transaction);
852
+ let signatures;
853
+ if ("signatures" in transaction) {
854
+ signatures = [];
855
+ for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
856
+ signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
857
+ }
592
858
  } 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.`);
859
+ signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
603
860
  }
604
- return new Uint8Array([value | VERSION_FLAG_MASK]);
605
- }
606
- function getTransactionVersionCodec() {
607
861
  return {
608
- ...BASE_CONFIG,
609
- deserialize,
610
- serialize
862
+ compiledMessage,
863
+ signatures
611
864
  };
612
865
  }
613
866
 
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
- }
867
+ // src/serializers/transaction.ts
868
+ function getCompiledTransactionEncoder() {
869
+ return getStructEncoder([
870
+ ["signatures", getArrayEncoder(getBytesEncoder({ size: 64 }), { size: getShortU16Encoder() })],
871
+ ["compiledMessage", getCompiledMessageEncoder()]
872
+ ]);
640
873
  }
641
- function getPreludeStructSerializerTuple() {
642
- return [
643
- ["version", getTransactionVersionCodec()],
644
- ["header", getMessageHeaderCodec()],
645
- [
646
- "staticAccounts",
647
- array(getBase58EncodedAddressCodec(), {
648
- description: __DEV__ ? "A compact-array of static account addresses belonging to this transaction" : "",
649
- size: shortU16()
650
- })
651
- ],
874
+ function getCompiledTransactionDecoder() {
875
+ return getStructDecoder([
652
876
  [
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
877
+ "signatures",
878
+ getArrayDecoder(getBytesDecoder({ size: 64 }), {
879
+ size: getShortU16Decoder()
658
880
  })
659
881
  ],
660
- [
661
- "instructions",
662
- array(getInstructionCodec(), {
663
- description: __DEV__ ? "A compact-array of instructions belonging to this transaction" : "",
664
- size: shortU16()
665
- })
666
- ]
667
- ];
882
+ ["compiledMessage", getCompiledMessageDecoder()]
883
+ ]);
668
884
  }
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
- });
885
+ function getTransactionEncoder() {
886
+ return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
674
887
  }
675
- function getCompiledMessageEncoder() {
676
- return {
677
- ...BASE_CONFIG2,
678
- deserialize: getUnimplementedDecoder("CompiledMessage"),
679
- serialize: serialize2
680
- };
888
+ function getTransactionDecoder(config) {
889
+ return mapDecoder(
890
+ getCompiledTransactionDecoder(),
891
+ (compiledTransaction) => decompileTransaction(compiledTransaction, config)
892
+ );
681
893
  }
682
-
683
- // src/signatures.ts
684
- async function getCompiledMessageSignature(message, secretKey) {
685
- const wireMessageBytes = getCompiledMessageEncoder().serialize(message);
686
- const signature = await signBytes(secretKey, wireMessageBytes);
687
- return signature;
894
+ function getTransactionCodec(config) {
895
+ return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
688
896
  }
689
- async function signTransaction(keyPairs, transaction) {
897
+ var base58Decoder;
898
+ function getSignatureFromTransaction(transaction) {
899
+ if (!base58Decoder)
900
+ base58Decoder = getBase58Decoder();
901
+ const signatureBytes = transaction.signatures[transaction.feePayer];
902
+ if (!signatureBytes) {
903
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_SIGNATURE_NOT_COMPUTABLE);
904
+ }
905
+ const transactionSignature = base58Decoder.decode(signatureBytes);
906
+ return transactionSignature;
907
+ }
908
+ async function partiallySignTransaction(keyPairs, transaction) {
690
909
  const compiledMessage = compileMessage(transaction);
691
910
  const nextSignatures = "signatures" in transaction ? { ...transaction.signatures } : {};
911
+ const wireMessageBytes = getCompiledMessageEncoder().encode(compiledMessage);
692
912
  const publicKeySignaturePairs = await Promise.all(
693
913
  keyPairs.map(
694
- (keyPair) => Promise.all([
695
- getAddressFromPublicKey(keyPair.publicKey),
696
- getCompiledMessageSignature(compiledMessage, keyPair.privateKey)
697
- ])
914
+ (keyPair) => Promise.all([getAddressFromPublicKey(keyPair.publicKey), signBytes(keyPair.privateKey, wireMessageBytes)])
698
915
  )
699
916
  );
700
917
  for (const [signerPublicKey, signature] of publicKeySignaturePairs) {
@@ -707,60 +924,32 @@ async function signTransaction(keyPairs, transaction) {
707
924
  Object.freeze(out);
708
925
  return out;
709
926
  }
710
-
711
- // src/compile-transaction.ts
712
- function getCompiledTransaction(transaction) {
713
- const compiledMessage = compileMessage(transaction);
714
- let signatures;
715
- if ("signatures" in transaction) {
716
- signatures = [];
717
- for (let ii = 0; ii < compiledMessage.header.numSignerAccounts; ii++) {
718
- signatures[ii] = transaction.signatures[compiledMessage.staticAccounts[ii]] ?? new Uint8Array(Array(64).fill(0));
927
+ async function signTransaction(keyPairs, transaction) {
928
+ const out = await partiallySignTransaction(keyPairs, transaction);
929
+ assertTransactionIsFullySigned(out);
930
+ Object.freeze(out);
931
+ return out;
932
+ }
933
+ function assertTransactionIsFullySigned(transaction) {
934
+ const signerAddressesFromInstructions = transaction.instructions.flatMap((i) => i.accounts?.filter((a) => isSignerRole(a.role)) ?? []).map((a) => a.address);
935
+ const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
936
+ const missingSigs = [];
937
+ requiredSigners.forEach((address) => {
938
+ if (!transaction.signatures[address]) {
939
+ missingSigs.push(address);
719
940
  }
720
- } else {
721
- signatures = Array(compiledMessage.header.numSignerAccounts).fill(new Uint8Array(Array(64).fill(0)));
941
+ });
942
+ if (missingSigs.length > 0) {
943
+ throw new SolanaError(SOLANA_ERROR__TRANSACTION_MISSING_SIGNATURES, {
944
+ addresses: missingSigs
945
+ });
722
946
  }
723
- return {
724
- compiledMessage,
725
- signatures
726
- };
727
947
  }
728
-
729
- // src/serializers/transaction.ts
730
- var BASE_CONFIG3 = {
731
- description: __DEV__ ? "The wire format of a Solana transaction" : "",
732
- fixedSize: null,
733
- maxSize: null
734
- };
735
- function serialize3(transaction) {
736
- const compiledTransaction = getCompiledTransaction(transaction);
737
- return struct([
738
- [
739
- "signatures",
740
- array(bytes({ size: 64 }), {
741
- ...__DEV__ ? { description: "A compact array of 64-byte, base-64 encoded Ed25519 signatures" } : null,
742
- size: shortU16()
743
- })
744
- ],
745
- ["compiledMessage", getCompiledMessageEncoder()]
746
- ]).serialize(compiledTransaction);
747
- }
748
- function getTransactionEncoder() {
749
- return {
750
- ...BASE_CONFIG3,
751
- deserialize: getUnimplementedDecoder("CompiledMessage"),
752
- serialize: serialize3
753
- };
754
- }
755
-
756
- // src/wire-transaction.ts
757
948
  function getBase64EncodedWireTransaction(transaction) {
758
- const wireTransactionBytes = getTransactionEncoder().serialize(transaction);
759
- {
760
- return btoa(String.fromCharCode(...wireTransactionBytes));
761
- }
949
+ const wireTransactionBytes = getTransactionEncoder().encode(transaction);
950
+ return getBase64Decoder().decode(wireTransactionBytes);
762
951
  }
763
952
 
764
- export { appendTransactionInstruction, assertIsBlockhash, assertIsDurableNonceTransaction, createTransaction, getBase64EncodedWireTransaction, prependTransactionInstruction, setTransactionFeePayer, setTransactionLifetimeUsingBlockhash, setTransactionLifetimeUsingDurableNonce, signTransaction };
953
+ 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 };
765
954
  //# sourceMappingURL=out.js.map
766
955
  //# sourceMappingURL=index.browser.js.map