@pushchain/core 5.1.5-alpha.1 → 5.1.5

package/src/lib/utils.js

@@ -78,22 +78,17 @@ Utils.account = {
     resolveControllerAccount: account_1.resolveControllerAccount,
 };
 /**
- * SVM (Solana) utilities for registering program Anchor IDLs.
+ * SVM (Solana) escape-hatch utilities.
  *
- * Register your program's Anchor IDL once per process; `prepareTransaction`
- * then resolves accounts, PDAs, and signers from the IDL so you only need
- * to pass `data` (discriminator + Borsh args), the same shape used for EVM.
+ * `PushChain.utils.helpers.encodeTxData({ abi: idl, ... })` auto-registers
+ * the Anchor IDL internally, so normal callers never need these.
  *
- * @example
- * PushChain.utils.svm.registerIdl(
- *   PROGRAM_ADDRESS_HEX,
- *   testCounterIdl
- * );
+ * Use `registerIdl` directly only when you build `data` manually (raw
+ * Anchor discriminator + Borsh bytes) and bypass `encodeTxData`.
  */
 Utils.svm = {
     registerIdl: registry_1.registerIdl,
     getRegisteredIdls: registry_1.getRegisteredIdls,
-    getIdl: registry_1.getIdl,
 };
 Utils.signer = {
     /**
@@ -227,22 +222,47 @@ Utils.helpers = {
             return Utils.chains.getChainName(chainName);
         };
     })(),
-    encodeTxData({ abi, functionName, args = [], }) {
-        if ((0, ix_encoder_1.isAnchorIdl)(abi)) {
-            if (!Array.isArray(args)) {
-                throw new Error('Arguments must be an array');
-            }
-            const bytes = (0, ix_encoder_1.encodeAnchorIxData)(abi, functionName, args);
-            return `0x${buffer_1.Buffer.from(bytes).toString('hex')}`;
+    /**
+     * Encode calldata for a universal tx.
+     *
+     * Pass `abi` for EVM targets, or `idl` for SVM (Anchor) targets. Exactly
+     * one of the two is required.
+     *
+     * @example EVM
+     * PushChain.utils.helpers.encodeTxData({
+     *   abi: erc20Abi,
+     *   functionName: 'transfer',
+     *   args: [to, amount],
+     * });
+     *
+     * @example SVM (Anchor)
+     * PushChain.utils.helpers.encodeTxData({
+     *   idl: counterIdl,
+     *   functionName: 'increment',
+     *   args: [],
+     * });
+     */
+    encodeTxData({ abi, idl, functionName, args = [], }) {
+        if (abi !== undefined && idl !== undefined) {
+            throw new Error("encodeTxData: pass either 'abi' (EVM) or 'idl' (SVM), not both");
         }
-        // Validate inputs
-        if (!Array.isArray(abi)) {
-            throw new Error('ABI must be an array');
+        if (abi === undefined && idl === undefined) {
+            throw new Error("encodeTxData: either 'abi' (EVM) or 'idl' (SVM) must be provided");
         }
         if (!Array.isArray(args)) {
             throw new Error('Arguments must be an array');
         }
-        // Find the function in the ABI
+        // SVM path: explicit idl, or legacy abi-as-IDL for backward compat.
+        const svmIdl = idl !== null && idl !== void 0 ? idl : ((0, ix_encoder_1.isAnchorIdl)(abi) ? abi : undefined);
+        if (svmIdl) {
+            (0, registry_1.registerIdl)(svmIdl);
+            const bytes = (0, ix_encoder_1.encodeAnchorIxData)(svmIdl, functionName, args);
+            return `0x${buffer_1.Buffer.from(bytes).toString('hex')}`;
+        }
+        // EVM path
+        if (!Array.isArray(abi)) {
+            throw new Error('ABI must be an array');
+        }
         const functionAbi = abi.find((f) => f.name === functionName);
         if (!functionAbi) {
             throw new Error(`Function '${functionName}' not found in ABI`);
@@ -600,6 +620,12 @@ Utils.tokens = {
      */
     getPRC20Address(token, options) {
         var _a, _b;
+        // PushChainMoveableToken (pETH, pSOL, pUSDT(BNB), …) carries its PRC-20 address
+        // directly. Return it as-is — no registry lookup needed.
+        const maybePrc20 = token.prc20Address;
+        if (maybePrc20) {
+            return maybePrc20;
+        }
         // Infer origin chain and symbol by matching against the MOVEABLE_TOKENS registry
         let originChain;
         let tokenSymbol;