@thru/thru-sdk 0.1.36 → 0.2.0

package/dist/{VersionInfo-BBuhryfs.d.ts → VersionInfo-Cw5HUNrn.d.ts}

@@ -54,6 +54,7 @@ interface TransactionHeaderInput extends ResourceLimits {
     nonce: bigint;
     startSlot: bigint;
     expiryAfter?: number;
+    chainId?: number;
     flags?: number;
 }
 interface TransactionAccountsInput {
@@ -75,12 +76,37 @@ interface FeePayerInput {
     publicKey: PubkeyInput;
     privateKey?: Uint8Array;
 }
+/**
+ * Function that builds instruction data with access to the final account ordering.
+ * Use this when your instruction data contains account indices.
+ */
+type InstructionDataBuilder = (context: InstructionContext) => Uint8Array | string;
 interface BuildTransactionParams {
     feePayer: FeePayerInput;
     program: PubkeyInput;
     header: TransactionHeaderInput;
     accounts?: TransactionAccountsInput;
+    /**
+     * Static instruction data. Use this when your instruction data does not
+     * contain account indices, or when you've pre-computed the indices.
+     */
     instructionData?: Uint8Array | string;
+    /**
+     * Builder function that receives the final account ordering.
+     * Use this when your instruction data contains account indices to ensure
+     * they match the post-sort transaction layout.
+     *
+     * @example
+     * ```typescript
+     * buildInstructionData: ({ getAccountIndex }) => {
+     *   return buildMyInstruction(
+     *     getAccountIndex(configAddress),
+     *     getAccountIndex(trancheAddress),
+     *   );
+     * }
+     * ```
+     */
+    buildInstructionData?: InstructionDataBuilder;
     proofs?: OptionalProofs;
 }
 interface BuiltTransactionResult {
@@ -123,6 +149,7 @@ declare class Transaction {
     readonly nonce: bigint;
     readonly startSlot: bigint;
     readonly expiryAfter: number;
+    readonly chainId: number;
     readonly requestedComputeUnits: number;
     readonly requestedStateUnits: number;
     readonly requestedMemoryUnits: number;
@@ -469,6 +496,7 @@ interface BlockHeaderParams {
     bondAmountLockUp?: bigint;
     weightSlot?: bigint;
     blockHash?: Uint8Array;
+    chainId?: number;
 }
 declare class BlockHeader {
     readonly slot: bigint;
@@ -484,6 +512,7 @@ declare class BlockHeader {
     readonly bondAmountLockUp?: bigint;
     readonly weightSlot?: bigint;
     readonly blockHash?: Uint8Array;
+    readonly chainId?: number;
     constructor(params: BlockHeaderParams);
     static fromProto(proto: BlockHeader$1): BlockHeader;
     withBlockHash(blockHash: Uint8Array): BlockHeader;
@@ -832,6 +861,7 @@ interface TransactionHeaderConfig {
     nonce?: bigint;
     startSlot?: bigint;
     expiryAfter?: number;
+    chainId?: number;
     computeUnits?: number;
     stateUnits?: number;
     memoryUnits?: number;
@@ -927,4 +957,4 @@ declare class VersionInfo {
     get(component: string): string | undefined;
 }
 
-export { type StreamAccountUpdatesResult as $, Account as A, type BuildTransactionParams as B, ChainEvent as C, type AccountQueryOptions as D, type CreateAccountOptions as E, Filter as F, type BlockList as G, HeightSnapshot as H, type BlockQueryOptions as I, type ListBlocksOptions as J, type RawBlockQueryOptions as K, type ListAccountsOptions as L, type GetEventOptions as M, type BlockSelector as N, type DeriveAddressInput as O, PageRequest as P, type DeriveAddressResult as Q, type RawAccountQueryOptions as R, type SignedTransactionResult as S, Transaction as T, type DeriveProgramAddressOptions as U, VersionInfo as V, type DeriveProgramAddressResult as W, type GeneratedKeyPair as X, type StreamAccountUpdate as Y, type HeightSnapshotParams as Z, type StreamAccountUpdatesOptions as _, accounts as a, type StreamBlocksOptions as a0, type StreamBlocksResult as a1, type StreamEventsOptions as a2, type StreamEventsResult as a3, type StreamTransactionsOptions as a4, type StreamTransactionsResult as a5, type StreamTransactionUpdate as a6, type TrackTransactionOptions as a7, type TrackTransactionUpdate as a8, type TransactionExecutionEvent as a9, getTransaction as aA, getRawTransaction as aB, getTransactionStatus as aC, listTransactions as aD, listTransactionsForAccount as aE, streamTransactions as aF, buildTransaction as aG, buildAndSignTransaction as aH, sendTransaction as aI, batchSendTransactions as aJ, trackTransaction as aK, getEvent as aL, listEvents as aM, streamEvents as aN, generateStateProof as aO, generateKeyPair as aP, fromPrivateKey as aQ, consensusStatusToString as aR, versionContext as aS, currentVersionContext as aT, currentOrHistoricalVersionContext as aU, slotVersionContext as aV, timestampVersionContext as aW, seqVersionContext as aX, type ThruClientConfig as aY, type TransactionExecutionResultData as aa, type InstructionContext as ab, type BatchSendTransactionsOptions as ac, type BuildAndSignTransactionOptions as ad, type BuildTransactionOptions as ae, type InstructionData as af, type ListTransactionsForAccountOptions as ag, type RawTransactionQueryOptions as ah, type TransactionAccountsConfig as ai, type TransactionFeePayerConfig as aj, type TransactionHeaderConfig as ak, type TransactionList as al, type TransactionQueryOptions as am, type GenerateStateProofOptions as an, type ThruClientContext as ao, getBlock as ap, getRawBlock as aq, listBlocks as ar, streamBlocks as as, getBlockHeight as at, streamHeight as au, getAccount as av, getRawAccount as aw, listAccounts as ax, streamAccountUpdates as ay, createAccount as az, blocks as b, consensus as c, Block as d, events as e, FilterParamValue as f, PageResponse as g, height as h, Pubkey as i, Signature as j, keys as k, StateProof as l, TransactionStatusSnapshot as m, deriveAddress as n, deriveProgramAddress as o, proofs as p, collectStream as q, firstStreamValue as r, streaming as s, transactions as t, forEachStreamValue as u, type PageRequestParams as v, type PageResponseParams as w, type PubkeyInput as x, type SignatureInput as y, type VersionContextInput as z };
+export { type StreamAccountUpdatesOptions as $, Account as A, type BuildTransactionParams as B, ChainEvent as C, type VersionContextInput as D, type AccountQueryOptions as E, Filter as F, type CreateAccountOptions as G, HeightSnapshot as H, type BlockList as I, type BlockQueryOptions as J, type ListBlocksOptions as K, type ListAccountsOptions as L, type RawBlockQueryOptions as M, type GetEventOptions as N, type BlockSelector as O, PageRequest as P, type DeriveAddressInput as Q, type RawAccountQueryOptions as R, type SignedTransactionResult as S, Transaction as T, type DeriveAddressResult as U, VersionInfo as V, type DeriveProgramAddressOptions as W, type DeriveProgramAddressResult as X, type GeneratedKeyPair as Y, type StreamAccountUpdate as Z, type HeightSnapshotParams as _, type ThruClientContext as a, type StreamAccountUpdatesResult as a0, type StreamBlocksOptions as a1, type StreamBlocksResult as a2, type StreamEventsOptions as a3, type StreamEventsResult as a4, type StreamTransactionsOptions as a5, type StreamTransactionsResult as a6, type StreamTransactionUpdate as a7, type TrackTransactionOptions as a8, type TrackTransactionUpdate as a9, getTransaction as aA, getRawTransaction as aB, getTransactionStatus as aC, listTransactions as aD, listTransactionsForAccount as aE, streamTransactions as aF, buildTransaction as aG, buildAndSignTransaction as aH, sendTransaction as aI, batchSendTransactions as aJ, trackTransaction as aK, getEvent as aL, listEvents as aM, streamEvents as aN, generateStateProof as aO, generateKeyPair as aP, fromPrivateKey as aQ, consensusStatusToString as aR, versionContext as aS, currentVersionContext as aT, currentOrHistoricalVersionContext as aU, slotVersionContext as aV, timestampVersionContext as aW, seqVersionContext as aX, type ThruClientConfig as aY, type TransactionExecutionEvent as aa, type TransactionExecutionResultData as ab, type InstructionContext as ac, type BatchSendTransactionsOptions as ad, type BuildAndSignTransactionOptions as ae, type BuildTransactionOptions as af, type InstructionData as ag, type ListTransactionsForAccountOptions as ah, type RawTransactionQueryOptions as ai, type TransactionAccountsConfig as aj, type TransactionFeePayerConfig as ak, type TransactionHeaderConfig as al, type TransactionList as am, type TransactionQueryOptions as an, type GenerateStateProofOptions as ao, getBlock as ap, getRawBlock as aq, listBlocks as ar, streamBlocks as as, getBlockHeight as at, streamHeight as au, getAccount as av, getRawAccount as aw, listAccounts as ax, streamAccountUpdates as ay, createAccount as az, accounts as b, blocks as c, consensus as d, events as e, Block as f, FilterParamValue as g, height as h, PageResponse as i, Pubkey as j, keys as k, Signature as l, StateProof as m, TransactionStatusSnapshot as n, deriveAddress as o, proofs as p, deriveProgramAddress as q, collectStream as r, streaming as s, transactions as t, firstStreamValue as u, forEachStreamValue as v, type PageRequestParams as w, type PageResponseParams as x, type PubkeyInput as y, type SignatureInput as z };

package/dist/{chunk-PU2M7EPY.js → chunk-YIQKZL4H.js}

@@ -1,7 +1,7 @@
 import { utils, etc, Point, CURVE, getPublicKeyAsync } from '@noble/ed25519';
 import { create } from '@bufbuild/protobuf';
 import { encodeAddress, decodeAddress, isHexString, hexToBytes, encodeSignature, decodeSignature, ensureBytes } from '@thru/helpers';
-import { AccountView, BlockView, TransactionView, ConsensusStatus, VersionContextSchema, CurrentVersionSchema, PubkeySchema, TaPubkeySchema, SignatureSchema, TsSignatureSchema, TransactionVmError, StreamingService, CommandService, QueryService, PageRequestSchema, PageResponseSchema, StateProofRequestSchema, GenerateStateProofRequestSchema, GetAccountRequestSchema, GetRawAccountRequestSchema, ListAccountsRequestSchema, StateProofType, ExecutionStatus, GetBlockRequestSchema, GetRawBlockRequestSchema, ListBlocksRequestSchema, CurrentOrHistoricalVersionSchema, GetEventRequestSchema, ListEventsRequestSchema, GetHeightRequestSchema, FilterParamValueSchema, FilterSchema, StreamBlocksRequestSchema, StreamAccountUpdatesRequestSchema, StreamTransactionsRequestSchema, StreamEventsRequestSchema, TrackTransactionRequestSchema, StreamHeightRequestSchema, GetTransactionRequestSchema, GetRawTransactionRequestSchema, GetTransactionStatusRequestSchema, ListTransactionsForAccountRequestSchema, ListTransactionsRequestSchema, BatchSendTransactionsRequestSchema, SendTransactionRequestSchema, BlockHashSchema } from '@thru/proto';
+import { AccountView, BlockView, TransactionView, ConsensusStatus, VersionContextSchema, CurrentVersionSchema, PubkeySchema, TaPubkeySchema, SignatureSchema, TsSignatureSchema, TransactionVmError, StreamingService, CommandService, QueryService, PageRequestSchema, PageResponseSchema, StateProofRequestSchema, GenerateStateProofRequestSchema, GetAccountRequestSchema, GetRawAccountRequestSchema, ListAccountsRequestSchema, StateProofType, ExecutionStatus, GetBlockRequestSchema, GetRawBlockRequestSchema, ListBlocksRequestSchema, GetChainInfoRequestSchema, CurrentOrHistoricalVersionSchema, GetEventRequestSchema, ListEventsRequestSchema, GetHeightRequestSchema, FilterParamValueSchema, FilterSchema, StreamBlocksRequestSchema, StreamAccountUpdatesRequestSchema, StreamTransactionsRequestSchema, StreamEventsRequestSchema, TrackTransactionRequestSchema, StreamHeightRequestSchema, GetTransactionRequestSchema, GetRawTransactionRequestSchema, GetTransactionStatusRequestSchema, ListTransactionsForAccountRequestSchema, ListTransactionsRequestSchema, BatchSendTransactionsRequestSchema, SendTransactionRequestSchema, BlockHashSchema } from '@thru/proto';
 import { createClient } from '@connectrpc/connect';
 import { createGrpcWebTransport } from '@connectrpc/connect-web';
 import { sha256 } from '@noble/hashes/sha2';
@@ -298,7 +298,7 @@ var HASH_SIZE = 32;
 var BLOCK_HEADER_SIZE = 168;
 var BLOCK_FOOTER_SIZE = 104;
 var BLOCK_VERSION_V1 = 1;
-var TXN_HEADER_SIZE = 176;
+var TXN_HEADER_SIZE = 112;
 var TXN_VERSION_V1 = 1;
 var TXN_MAX_ACCOUNTS = 1024;
 var STATE_PROOF_HEADER_SIZE = 40;
@@ -310,7 +310,6 @@ var STATE_PROOF_TYPE_CREATION = 2;
 
 // thru-ts-client-sdk/domain/transactions/Transaction.ts
 var DEFAULT_FLAGS = 0;
-var SIGNATURE_PREFIX_SIZE = SIGNATURE_SIZE2;
 var MAX_INSTRUCTION_DATA_LENGTH = 65535;
 var BYTE_POPCOUNT = new Uint8Array(256).map((_value, index) => {
   let v = index;
@@ -330,6 +329,7 @@ var Transaction = class _Transaction {
     this.nonce = params.header.nonce;
     this.startSlot = params.header.startSlot;
     this.expiryAfter = params.header.expiryAfter ?? 0;
+    this.chainId = params.header.chainId ?? 1;
     this.requestedComputeUnits = params.header.computeUnits ?? 0;
     this.requestedStateUnits = params.header.stateUnits ?? 0;
     this.requestedMemoryUnits = params.header.memoryUnits ?? 0;
@@ -354,15 +354,12 @@ var Transaction = class _Transaction {
     return transaction;
   }
   static parseWire(data, options = {}) {
-    if (data.length < TXN_HEADER_SIZE) {
-      throw new Error(`Transaction data too short: ${data.length} bytes (expected at least ${TXN_HEADER_SIZE})`);
+    if (data.length < TXN_HEADER_SIZE + SIGNATURE_SIZE2) {
+      throw new Error(`Transaction data too short: ${data.length} bytes (expected at least ${TXN_HEADER_SIZE + SIGNATURE_SIZE2})`);
     }
     const strict = options.strict ?? false;
     const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
     let offset = 0;
-    const signatureBytes = data.slice(offset, offset + SIGNATURE_SIZE2);
-    const hasSignature = hasNonZeroBytes(signatureBytes);
-    offset += SIGNATURE_SIZE2;
     const version = view.getUint8(offset);
     offset += 1;
     if (strict && version !== TXN_VERSION_V1) {
@@ -394,7 +391,9 @@ var Transaction = class _Transaction {
     offset += 8;
     const expiryAfter = view.getUint32(offset, true);
     offset += 4;
-    offset += 4;
+    const chainId = view.getUint16(offset, true);
+    offset += 2;
+    offset += 2;
     _Transaction.ensureAvailable(data.length, offset, PUBKEY_SIZE2, "fee payer account");
     const feePayer = data.slice(offset, offset + PUBKEY_SIZE2);
     offset += PUBKEY_SIZE2;
@@ -410,36 +409,63 @@ var Transaction = class _Transaction {
         `Transaction references ${totalAccountCount} accounts (maximum allowed ${TXN_MAX_ACCOUNTS})`
       );
     }
+    const accountsSize = totalAccountCount * PUBKEY_SIZE2;
+    let expectedBodySize = accountsSize + instructionDataSize;
+    if ((flags & TXN_FLAG_HAS_FEE_PAYER_PROOF) !== 0) {
+      const proofOffset = TXN_HEADER_SIZE + accountsSize + instructionDataSize;
+      _Transaction.ensureAvailable(data.length, proofOffset, STATE_PROOF_HEADER_SIZE, "state proof header");
+      const proofView = new DataView(data.buffer, data.byteOffset + proofOffset, STATE_PROOF_HEADER_SIZE);
+      const typeSlot = proofView.getBigUint64(0, true);
+      const proofType = Number(typeSlot >> 62n & 0x3n);
+      const pathBitset = data.subarray(proofOffset + 8, proofOffset + 40);
+      const siblingCount = countSetBits(pathBitset);
+      const bodyCount = proofType + siblingCount;
+      const proofFootprint = STATE_PROOF_HEADER_SIZE + bodyCount * HASH_SIZE;
+      expectedBodySize += proofFootprint;
+      if (proofType === STATE_PROOF_TYPE_EXISTING) {
+        expectedBodySize += ACCOUNT_META_FOOTPRINT;
+      }
+    }
+    const txnSize = TXN_HEADER_SIZE + expectedBodySize + SIGNATURE_SIZE2;
+    _Transaction.ensureAvailable(data.length, 0, txnSize, "full transaction");
+    const sigStart = TXN_HEADER_SIZE + expectedBodySize;
     const readWriteAccounts = [];
     for (let i = 0; i < readwriteAccountsCount; i++) {
-      _Transaction.ensureAvailable(data.length, offset, PUBKEY_SIZE2, "read-write accounts");
+      _Transaction.ensureAvailable(sigStart, offset, PUBKEY_SIZE2, "read-write accounts");
       readWriteAccounts.push(data.slice(offset, offset + PUBKEY_SIZE2));
       offset += PUBKEY_SIZE2;
     }
     const readOnlyAccounts = [];
     for (let i = 0; i < readonlyAccountsCount; i++) {
-      _Transaction.ensureAvailable(data.length, offset, PUBKEY_SIZE2, "read-only accounts");
+      _Transaction.ensureAvailable(sigStart, offset, PUBKEY_SIZE2, "read-only accounts");
       readOnlyAccounts.push(data.slice(offset, offset + PUBKEY_SIZE2));
       offset += PUBKEY_SIZE2;
     }
     let instructionData;
     if (instructionDataSize > 0) {
-      _Transaction.ensureAvailable(data.length, offset, instructionDataSize, "instruction data");
+      _Transaction.ensureAvailable(sigStart, offset, instructionDataSize, "instruction data");
       instructionData = data.slice(offset, offset + instructionDataSize);
       offset += instructionDataSize;
     }
     let feePayerStateProof;
     let feePayerAccountMetaRaw;
     if ((flags & TXN_FLAG_HAS_FEE_PAYER_PROOF) !== 0) {
-      const { proofBytes, footprint, proofType } = _Transaction.parseStateProof(data.subarray(offset));
+      const { proofBytes, footprint, proofType } = _Transaction.parseStateProof(data.subarray(offset, sigStart));
       feePayerStateProof = proofBytes;
       offset += footprint;
       if (proofType === STATE_PROOF_TYPE_EXISTING) {
-        _Transaction.ensureAvailable(data.length, offset, ACCOUNT_META_FOOTPRINT, "fee payer account metadata");
+        _Transaction.ensureAvailable(sigStart, offset, ACCOUNT_META_FOOTPRINT, "fee payer account metadata");
         feePayerAccountMetaRaw = data.slice(offset, offset + ACCOUNT_META_FOOTPRINT);
         offset += ACCOUNT_META_FOOTPRINT;
       }
     }
+    if (offset !== sigStart) {
+      throw new Error(
+        `Transaction body has trailing bytes: expected ${offset + SIGNATURE_SIZE2} bytes but found ${txnSize}`
+      );
+    }
+    const signatureBytes = data.slice(sigStart, sigStart + SIGNATURE_SIZE2);
+    const hasSignature = hasNonZeroBytes(signatureBytes);
     const transaction = new _Transaction({
       version,
       feePayer: Pubkey.from(feePayer),
@@ -449,6 +475,7 @@ var Transaction = class _Transaction {
         nonce,
         startSlot,
         expiryAfter,
+        chainId,
         computeUnits: requestedComputeUnits,
         stateUnits: requestedStateUnits,
         memoryUnits: requestedMemoryUnits,
@@ -468,7 +495,7 @@ var Transaction = class _Transaction {
     if (hasSignature) {
       transaction.setSignature(Signature.from(signatureBytes));
     }
-    return { transaction, size: offset };
+    return { transaction, size: offset + SIGNATURE_SIZE2 };
   }
   static fromProto(proto) {
     if (!proto.header) {
@@ -528,6 +555,7 @@ var Transaction = class _Transaction {
           nonce: header.nonce ?? 0n,
           startSlot: header.startSlot ?? 0n,
           expiryAfter: header.expiryAfter ?? 0,
+          chainId: header.chainId ?? 1,
           computeUnits: header.requestedComputeUnits ?? 0,
           stateUnits: header.requestedStateUnits ?? 0,
           memoryUnits: header.requestedMemoryUnits ?? 0,
@@ -585,27 +613,18 @@ var Transaction = class _Transaction {
     return this.signature;
   }
   toWireForSigning() {
-    const header = this.createHeader(void 0);
-    const view = new Uint8Array(header);
-    return this.buildWirePayload(view.subarray(SIGNATURE_PREFIX_SIZE));
+    const header = this.createHeader();
+    return this.buildWirePayload(new Uint8Array(header), false);
   }
   toWire() {
-    const header = this.createHeader(this.signature?.toBytes());
-    return this.buildWirePayload(new Uint8Array(header));
+    const header = this.createHeader();
+    return this.buildWirePayload(new Uint8Array(header), true);
   }
-  createHeader(signature) {
+  createHeader() {
     const buffer = new ArrayBuffer(TXN_HEADER_SIZE);
     const headerBytes = new Uint8Array(buffer);
     const view = new DataView(buffer);
-    if (signature) {
-      if (signature.length !== SIGNATURE_SIZE2) {
-        throw new Error(`Signature must contain ${SIGNATURE_SIZE2} bytes`);
-      }
-      headerBytes.set(signature, 0);
-    } else {
-      headerBytes.fill(0, 0, SIGNATURE_SIZE2);
-    }
-    let offset = SIGNATURE_PREFIX_SIZE;
+    let offset = 0;
     view.setUint8(offset, this.version & 255);
     offset += 1;
     view.setUint8(offset, this.flags & 255);
@@ -634,17 +653,20 @@ var Transaction = class _Transaction {
     offset += 8;
     view.setUint32(offset, ensureUint32(this.expiryAfter), true);
     offset += 4;
-    offset += 4;
+    view.setUint16(offset, ensureUint16(this.chainId), true);
+    offset += 2;
+    offset += 2;
     headerBytes.set(this.feePayer.toBytes(), offset);
     offset += PUBKEY_SIZE2;
     headerBytes.set(this.program.toBytes(), offset);
     return buffer;
   }
-  buildWirePayload(headerPrefix) {
+  buildWirePayload(headerBytes, includeSignature) {
     const dynamicLength = this.readWriteAccounts.length * PUBKEY_SIZE2 + this.readOnlyAccounts.length * PUBKEY_SIZE2 + (this.instructionData?.length ?? 0) + (this.feePayerStateProof?.length ?? 0) + (this.feePayerAccountMetaRaw?.length ?? 0);
-    const result = new Uint8Array(headerPrefix.length + dynamicLength);
-    result.set(headerPrefix, 0);
-    let offset = headerPrefix.length;
+    const signatureLength = includeSignature ? SIGNATURE_SIZE2 : 0;
+    const result = new Uint8Array(headerBytes.length + dynamicLength + signatureLength);
+    result.set(headerBytes, 0);
+    let offset = headerBytes.length;
     offset = appendAccountList(result, offset, this.readWriteAccounts.map((account) => account.toBytes()));
     offset = appendAccountList(result, offset, this.readOnlyAccounts.map((account) => account.toBytes()));
     if (this.instructionData) {
@@ -659,6 +681,11 @@ var Transaction = class _Transaction {
       result.set(this.feePayerAccountMetaRaw, offset);
       offset += this.feePayerAccountMetaRaw.length;
     }
+    if (includeSignature) {
+      if (this.signature) {
+        result.set(this.signature.toBytes(), offset);
+      }
+    }
     return result;
   }
   static parseBodySections(body, readwriteCount, readonlyCount, instructionDataSize, flags) {
@@ -862,18 +889,56 @@ function parseInstructionData(value) {
   }
   throw new Error("Instruction data must be provided as hex string or Uint8Array");
 }
+function createInstructionContext(feePayer, program, sortedReadWrite, sortedReadOnly) {
+  const accounts = [
+    feePayer,
+    program,
+    ...sortedReadWrite.map((bytes) => Pubkey.from(bytes)),
+    ...sortedReadOnly.map((bytes) => Pubkey.from(bytes))
+  ];
+  const indexMap = /* @__PURE__ */ new Map();
+  for (let i = 0; i < accounts.length; i++) {
+    const key = toHex(accounts[i].toBytes());
+    if (!indexMap.has(key)) {
+      indexMap.set(key, i);
+    }
+  }
+  return {
+    accounts,
+    getAccountIndex: (pubkey) => {
+      const bytes = Pubkey.from(pubkey).toBytes();
+      const key = toHex(bytes);
+      const index = indexMap.get(key);
+      if (index === void 0) {
+        throw new Error(`Account ${key} not found in transaction accounts`);
+      }
+      return index;
+    }
+  };
+}
 
 // thru-ts-client-sdk/domain/transactions/TransactionBuilder.ts
 var FLAG_HAS_FEE_PAYER_PROOF = 1 << 0;
 var TransactionBuilder = class {
   build(params) {
-    const accounts = this.normalizeAccounts(params.accounts);
+    const feePayer = Pubkey.from(params.feePayer.publicKey);
+    const program = Pubkey.from(params.program);
+    const sortedReadWrite = normalizeAccountList(params.accounts?.readWriteAccounts ?? []);
+    const sortedReadOnly = normalizeAccountList(params.accounts?.readOnlyAccounts ?? []);
+    let instructionData;
+    if (params.buildInstructionData) {
+      const context = createInstructionContext(feePayer, program, sortedReadWrite, sortedReadOnly);
+      const result = params.buildInstructionData(context);
+      instructionData = parseInstructionData(result);
+    } else {
+      instructionData = parseInstructionData(params.instructionData);
+    }
     const baseFlags = params.header.flags ?? 0;
     const flags = params.proofs?.feePayerStateProof ? baseFlags | FLAG_HAS_FEE_PAYER_PROOF : baseFlags;
-    const instructionData = parseInstructionData(params.instructionData);
+    const accounts = sortedReadWrite.length > 0 || sortedReadOnly.length > 0 ? { readWriteAccounts: sortedReadWrite, readOnlyAccounts: sortedReadOnly } : void 0;
     return new Transaction({
-      feePayer: Pubkey.from(params.feePayer.publicKey),
-      program: Pubkey.from(params.program),
+      feePayer,
+      program,
       header: {
         ...params.header,
         flags
@@ -883,15 +948,6 @@ var TransactionBuilder = class {
       proofs: params.proofs
     });
   }
-  normalizeAccounts(accounts) {
-    if (!accounts) {
-      return void 0;
-    }
-    return {
-      readWriteAccounts: normalizeAccountList(accounts.readWriteAccounts ?? []),
-      readOnlyAccounts: normalizeAccountList(accounts.readOnlyAccounts ?? [])
-    };
-  }
   async buildAndSign(params) {
     if (!params.feePayer.privateKey) {
       throw new Error("Fee payer private key is required to sign the transaction");
@@ -1429,6 +1485,7 @@ var BlockHeader = class _BlockHeader {
     this.bondAmountLockUp = params.bondAmountLockUp;
     this.weightSlot = params.weightSlot;
     this.blockHash = copyBytes6(params.blockHash);
+    this.chainId = params.chainId;
   }
   static fromProto(proto) {
     return new _BlockHeader({
@@ -1444,7 +1501,8 @@ var BlockHeader = class _BlockHeader {
       maxStateUnits: proto.maxStateUnits,
       bondAmountLockUp: proto.bondAmountLockUp,
       weightSlot: proto.weightSlot,
-      blockHash: proto.blockHash?.value
+      blockHash: proto.blockHash?.value,
+      chainId: proto.chainId
     });
   }
   withBlockHash(blockHash) {
@@ -1461,7 +1519,8 @@ var BlockHeader = class _BlockHeader {
       maxStateUnits: this.maxStateUnits,
       bondAmountLockUp: this.bondAmountLockUp,
       weightSlot: this.weightSlot,
-      blockHash
+      blockHash,
+      chainId: this.chainId
     });
   }
 };
@@ -1475,7 +1534,7 @@ function copyBytes6(bytes) {
 // thru-ts-client-sdk/domain/blocks/Block.ts
 var BLOCK_HASH_SIZE = 32;
 var RESERVED_FOOTER_PADDING = 0n;
-var SIGNATURE_PREFIX_SIZE2 = SIGNATURE_SIZE2;
+var SIGNATURE_PREFIX_SIZE = SIGNATURE_SIZE2;
 var Block = class _Block {
   constructor(params) {
     this.header = params.header;
@@ -1564,12 +1623,14 @@ var Block = class _Block {
     const view = new DataView(buffer);
     const signature = normalizeBytes(this.header.headerSignature, SIGNATURE_SIZE2);
     bytes.set(signature, 0);
-    let offset = SIGNATURE_PREFIX_SIZE2;
+    let offset = SIGNATURE_PREFIX_SIZE;
     const version = this.header.version ?? BLOCK_VERSION_V1;
     view.setUint8(offset, version & 255);
     offset += 1;
-    bytes.fill(0, offset, offset + 7);
-    offset += 7;
+    bytes.fill(0, offset, offset + 5);
+    offset += 5;
+    view.setUint16(offset, this.header.chainId ?? 0, true);
+    offset += 2;
     const producer = normalizeBytes(this.header.producer, PUBKEY_SIZE2);
     bytes.set(producer, offset);
     offset += PUBKEY_SIZE2;
@@ -1592,6 +1653,8 @@ var Block = class _Block {
     offset += 4;
     bytes.fill(0, offset, offset + 4);
     offset += 4;
+    view.setBigUint64(offset, this.header.weightSlot ?? 0n, true);
+    offset += 8;
     const blockTimeNs = this.blockTimeNs ?? 0n;
     view.setBigUint64(offset, blockTimeNs, true);
     return bytes;
@@ -1618,7 +1681,9 @@ var Block = class _Block {
     offset += SIGNATURE_SIZE2;
     const version = view.getUint8(offset);
     offset += 1;
-    offset += 7;
+    offset += 5;
+    const chainId = view.getUint16(offset, true);
+    offset += 2;
     const producer = bytes.slice(offset, offset + PUBKEY_SIZE2);
     offset += PUBKEY_SIZE2;
     const bondAmountLockUp = view.getBigUint64(offset, true);
@@ -1636,6 +1701,8 @@ var Block = class _Block {
     const maxStateUnits = view.getUint32(offset, true);
     offset += 4;
     offset += 4;
+    const weightSlot = view.getBigUint64(offset, true);
+    offset += 8;
     const blockTimeNs = view.getBigUint64(offset, true);
     const header = new BlockHeader({
       slot: startSlot,
@@ -1648,7 +1715,9 @@ var Block = class _Block {
       maxBlockSize,
       maxComputeUnits,
       maxStateUnits,
-      bondAmountLockUp
+      bondAmountLockUp,
+      weightSlot,
+      chainId
     });
     return { header, blockTimeNs };
   }
@@ -1828,6 +1897,17 @@ async function listBlocks(ctx, options = {}) {
   };
 }
 
+// thru-ts-client-sdk/modules/chain.ts
+var chain_exports = {};
+__export(chain_exports, {
+  getChainId: () => getChainId
+});
+async function getChainId(ctx) {
+  const request = create(GetChainInfoRequestSchema);
+  const response = await ctx.query.getChainInfo(request, withCallOptions(ctx));
+  return response.chainId;
+}
+
 // thru-ts-client-sdk/modules/consensus.ts
 var consensus_exports = {};
 __export(consensus_exports, {
@@ -2729,7 +2809,7 @@ async function createBuildParams(ctx, options) {
   const program = Pubkey.from(options.program).toBytes();
   const header = await createTransactionHeader(ctx, options.header ?? {}, feePayerPublicKey);
   const accounts = parseAccounts(options.accounts);
-  const context = createInstructionContext(feePayerPublicKey, program, accounts);
+  const context = createInstructionContext2(feePayerPublicKey, program, accounts);
   const instructionData = await resolveInstructionData(options.instructionData, context);
   const proofs = createProofs(options);
   return {
@@ -2747,11 +2827,13 @@ async function createBuildParams(ctx, options) {
 async function createTransactionHeader(ctx, header, feePayerPublicKey) {
   const nonce = header.nonce ?? await fetchFeePayerNonce(ctx, feePayerPublicKey);
   const startSlot = header.startSlot ?? await fetchFinalizedSlot(ctx);
+  const chainId = header.chainId ?? await fetchChainId(ctx);
   return {
     fee: header.fee ?? DEFAULT_FEE,
     nonce,
     startSlot,
     expiryAfter: header.expiryAfter ?? DEFAULT_EXPIRY_AFTER,
+    chainId,
     computeUnits: header.computeUnits ?? DEFAULT_COMPUTE_UNITS,
     stateUnits: header.stateUnits ?? DEFAULT_STATE_UNITS,
     memoryUnits: header.memoryUnits ?? DEFAULT_MEMORY_UNITS,
@@ -2780,7 +2862,7 @@ function parseAccounts(accounts) {
   }
   return result;
 }
-function createInstructionContext(feePayer, program, accounts) {
+function createInstructionContext2(feePayer, program, accounts) {
   const allAccounts = [
     Pubkey.from(feePayer),
     Pubkey.from(program),
@@ -2832,6 +2914,9 @@ async function fetchFinalizedSlot(ctx) {
   const height = await getBlockHeight(ctx);
   return height.finalized;
 }
+async function fetchChainId(ctx) {
+  return getChainId(ctx);
+}
 
 // thru-ts-client-sdk/domain/version/VersionInfo.ts
 var VersionInfo = class _VersionInfo {
@@ -2846,6 +2931,6 @@ var VersionInfo = class _VersionInfo {
   }
 };
 
-export { Account, Block, ChainEvent, Filter, FilterParamValue, HeightSnapshot, PageRequest, PageResponse, Pubkey, Signature, SignatureDomain, StateProof, Transaction, TransactionBuilder, TransactionStatusSnapshot, VersionInfo, accounts_exports, batchSendTransactions, blocks_exports, buildAndSignTransaction, buildTransaction, collectStream, consensusStatusToString, consensus_exports, createAccount, createThruClientContext, currentOrHistoricalVersionContext, currentVersionContext, deriveAddress, deriveProgramAddress, events_exports, firstStreamValue, forEachStreamValue, fromPrivateKey, generateKeyPair, generateStateProof, getAccount, getBlock, getBlockHeight, getEvent, getRawAccount, getRawBlock, getRawTransaction, getTransaction, getTransactionStatus, height_exports, keys_exports, listAccounts, listBlocks, listEvents, listTransactions, listTransactionsForAccount, proofs_exports, sendTransaction, seqVersionContext, signWithDomain, slotVersionContext, streamAccountUpdates, streamBlocks, streamEvents, streamHeight, streamTransactions, streaming_exports, timestampVersionContext, trackTransaction, transactions_exports, verifyWithDomain, versionContext, withCallOptions };
-//# sourceMappingURL=chunk-PU2M7EPY.js.map
-//# sourceMappingURL=chunk-PU2M7EPY.js.map
+export { Account, Block, ChainEvent, Filter, FilterParamValue, HeightSnapshot, PageRequest, PageResponse, Pubkey, Signature, SignatureDomain, StateProof, Transaction, TransactionBuilder, TransactionStatusSnapshot, VersionInfo, accounts_exports, batchSendTransactions, blocks_exports, buildAndSignTransaction, buildTransaction, chain_exports, collectStream, consensusStatusToString, consensus_exports, createAccount, createThruClientContext, currentOrHistoricalVersionContext, currentVersionContext, deriveAddress, deriveProgramAddress, events_exports, firstStreamValue, forEachStreamValue, fromPrivateKey, generateKeyPair, generateStateProof, getAccount, getBlock, getBlockHeight, getEvent, getRawAccount, getRawBlock, getRawTransaction, getTransaction, getTransactionStatus, height_exports, keys_exports, listAccounts, listBlocks, listEvents, listTransactions, listTransactionsForAccount, proofs_exports, sendTransaction, seqVersionContext, signWithDomain, slotVersionContext, streamAccountUpdates, streamBlocks, streamEvents, streamHeight, streamTransactions, streaming_exports, timestampVersionContext, trackTransaction, transactions_exports, verifyWithDomain, versionContext, withCallOptions };
+//# sourceMappingURL=chunk-YIQKZL4H.js.map
+//# sourceMappingURL=chunk-YIQKZL4H.js.map