@secondlayer/stacks 6.5.3 → 6.6.0

package/dist/src/bns/index.js

@@ -17,8 +17,8 @@ import {
   getContract2,
   resolveNetworkContract,
   ContractResponseError2
-} from "../../shared/stacks-esm-s3natb0x.js";
-import"../../shared/stacks-esm-jm688fhe.js";
+} from "../../shared/stacks-esm-75qv0d9h.js";
+import"../../shared/stacks-esm-8chm2wtn.js";
 import"../../shared/stacks-esm-hm7kb2cp.js";
 
 // src/bns/abi.ts

package/dist/src/index.cjs

@@ -3322,6 +3322,13 @@ function assertNoFeeTierForProvider(fee) {
     throw new Error(`Fee tier '${fee}' requires local signing; provider (wallet) accounts set their own fee`);
   }
 }
+function resolveCallArgs(params) {
+  const { args, functionArgs } = params;
+  if (args !== undefined && functionArgs !== undefined) {
+    throw new Error("Pass args or functionArgs, not both (functionArgs is deprecated)");
+  }
+  return args ?? functionArgs ?? [];
+}
 
 // src/actions/wallet/callContract.ts
 async function callContract(client, params) {
@@ -3329,12 +3336,13 @@ async function callContract(client, params) {
   if (!account)
     throw new Error("Account required");
   const [contractAddress, contractName] = parseContractId(params.contract);
+  const args = resolveCallArgs(params);
   if (isProviderAccount(account)) {
     assertNoFeeTierForProvider(params.fee);
     const result = await account.provider.request("stx_callContract", {
       contract: params.contract,
       functionName: params.functionName,
-      functionArgs: params.functionArgs ?? []
+      functionArgs: args
     });
     return result.txid;
   }
@@ -3346,7 +3354,7 @@ async function callContract(client, params) {
       contractAddress,
       contractName,
       functionName: params.functionName,
-      functionArgs: params.functionArgs ?? [],
+      functionArgs: args,
       fee: needsFeeResolution ? 0n : params.fee,
       nonce,
       publicKey: account.publicKey,
@@ -3601,8 +3609,27 @@ function walletActions(client) {
 }
 
 // src/clients/createWalletClient.ts
+function alignAccountToChain(account, chain) {
+  if (!chain || account.type === "provider")
+    return account;
+  try {
+    const [version, hash] = c32addressDecode(account.address);
+    const keyHash = bytesToHex(hash160(hexToBytes(account.publicKey)));
+    if (hash !== keyHash)
+      return account;
+    const target = chain.addressVersion.singleSig;
+    if (version === target)
+      return account;
+    return { ...account, address: c32address(target, hash) };
+  } catch {
+    return account;
+  }
+}
 function createWalletClient(config) {
-  return createClient(config).extend(walletActions);
+  return createClient({
+    ...config,
+    account: alignAccountToChain(config.account, config.chain)
+  }).extend(walletActions);
 }
 // src/clients/decorators/multisig.ts
 function multisigActions(client) {
@@ -3650,7 +3677,7 @@ function multisigActions(client) {
         contractAddress,
         contractName,
         functionName: params.functionName,
-        functionArgs: params.functionArgs ?? [],
+        functionArgs: resolveCallArgs(params),
         fee: params.fee ?? 0n,
         nonce,
         publicKeys: signers,
@@ -4603,5 +4630,5 @@ function parseStx(stx) {
   return parseUnits(stx, 6);
 }
 
-//# debugId=371D4F170108B2A564756E2164756E21
+//# debugId=C6D5879CCBDF8CEC64756E2164756E21
 //# sourceMappingURL=index.cjs.map