@solana/connector 0.1.8 → 0.1.9

package/dist/{chunk-FTXIXM43.js → chunk-5HRJKCIL.js}

@@ -5,8 +5,8 @@ var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
 var webcryptoEd25519Polyfill = require('@solana/webcrypto-ed25519-polyfill');
 var addresses = require('@solana/addresses');
-var transactions = require('@solana/transactions');
 var codecs = require('@solana/codecs');
+var transactions = require('@solana/transactions');
 
 // src/lib/wallet/standard-shim.ts
 var registry = null, registryInitPromise = null, registryInitResolve = null, ready = new Promise((resolve, reject) => {
@@ -2080,9 +2080,28 @@ var logger8 = chunkDSUCH44G_js.createLogger("TransactionValidator"), MAX_TRANSAC
     return transactions.map((tx, index) => (logger8.debug(`Validating transaction ${index + 1}/${transactions.length}`), this.validate(tx, options)));
   }
 };
-
-// src/lib/transaction/transaction-signer.ts
 var logger9 = chunkDSUCH44G_js.createLogger("TransactionSigner");
+function signatureBytesToBase58(bytes) {
+  if (bytes.length !== 64)
+    throw new Error(`Invalid signature length: expected 64 bytes, got ${bytes.length}`);
+  return codecs.getBase58Decoder().decode(bytes);
+}
+function extractSignatureString(result) {
+  if (typeof result == "string")
+    return result;
+  if (result instanceof Uint8Array)
+    return signatureBytesToBase58(result);
+  if (Array.isArray(result) && result.length > 0)
+    return extractSignatureString(result[0]);
+  if (result && typeof result == "object") {
+    let record = result;
+    if ("signature" in record)
+      return extractSignatureString(record.signature);
+    if (Array.isArray(record.signatures) && record.signatures.length > 0)
+      return extractSignatureString(record.signatures[0]);
+  }
+  throw new Error("Unexpected wallet response format for signAndSendTransaction");
+}
 function createTransactionSigner(config) {
   let { wallet, account, cluster, eventEmitter } = config;
   if (!wallet || !account)
@@ -2242,7 +2261,7 @@ function createTransactionSigner(config) {
             transaction: serialized
           });
         }
-        let signature = typeof result == "object" && result.signature ? result.signature : String(result);
+        let signature = extractSignatureString(result);
         return eventEmitter && eventEmitter.emit({
           type: "transaction:sent",
           signature,
@@ -2320,6 +2339,29 @@ function decodeShortVecLength(data) {
   }
   return { length, bytesConsumed: size };
 }
+function parseMessageSigners(messageBytes) {
+  let offset = 0;
+  if (messageBytes.length < 4)
+    throw new Error("Invalid message: too short for header");
+  if (messageBytes[0] === 128 && (offset = 1), offset + 3 > messageBytes.length)
+    throw new Error("Invalid message: incomplete header");
+  let numSignerAccounts = messageBytes[offset];
+  if (offset += 3, offset >= messageBytes.length)
+    throw new Error("Invalid message: no static accounts section");
+  let { length: numStaticAccounts, bytesConsumed } = decodeShortVecLength(messageBytes.subarray(offset));
+  offset += bytesConsumed;
+  let staticAccounts = [], base58Decoder = codecs.getBase58Decoder();
+  for (let i = 0; i < numStaticAccounts && i < numSignerAccounts; i++) {
+    if (offset + 32 > messageBytes.length)
+      throw new Error(`Invalid message: incomplete account ${i}`);
+    let accountBytes = messageBytes.subarray(offset, offset + 32), accountAddress = base58Decoder.decode(accountBytes);
+    staticAccounts.push(accountAddress), offset += 32;
+  }
+  return {
+    numSigners: numSignerAccounts,
+    staticAccounts
+  };
+}
 function createTransactionBytesForSigning(messageBytes, numSigners) {
   let numSignaturesBytes = encodeShortVecLength(numSigners), signatureSlots = new Uint8Array(numSigners * 64), totalLength = numSignaturesBytes.length + signatureSlots.length + messageBytes.length, transactionBytes = new Uint8Array(totalLength), offset = 0;
   return transactionBytes.set(numSignaturesBytes, offset), offset += numSignaturesBytes.length, transactionBytes.set(signatureSlots, offset), offset += signatureSlots.length, transactionBytes.set(messageBytes, offset), transactionBytes;
@@ -2351,7 +2393,7 @@ function createKitTransactionSigner(connectorSigner) {
     address: signerAddress,
     async modifyAndSignTransactions(transactions$1) {
       let transactionData = transactions$1.map((tx) => {
-        let messageBytes = new Uint8Array(tx.messageBytes), numSigners = Object.keys(tx.signatures).length, wireFormat = createTransactionBytesForSigning(messageBytes, numSigners);
+        let messageBytes = new Uint8Array(tx.messageBytes), { numSigners } = parseMessageSigners(messageBytes), wireFormat = createTransactionBytesForSigning(messageBytes, numSigners);
         return logger10.debug("Preparing wire format for wallet", {
           signerAddress,
           messageBytesLength: messageBytes.length,
@@ -2481,5 +2523,5 @@ exports.ready = ready;
 exports.toClusterId = toClusterId;
 exports.truncate = truncate;
 exports.withErrorBoundary = withErrorBoundary;
-//# sourceMappingURL=chunk-FTXIXM43.js.map
-//# sourceMappingURL=chunk-FTXIXM43.js.map
+//# sourceMappingURL=chunk-5HRJKCIL.js.map
+//# sourceMappingURL=chunk-5HRJKCIL.js.map