@pushchain/core 2.0.2 → 2.0.5

package/src/lib/vm-client/svm-client.js

@@ -115,10 +115,89 @@ class SvmClient {
             const provider = this.createProvider(connection);
             // 3. Instantiate the program (Anchor v0.31 will infer programId from IDL.metadata.address)
             const program = new anchor_1.Program(abi, provider);
-            // 4. Convert any BigInt args into BN for Anchor
-            const convertedArgs = args.map((arg) => typeof arg === 'bigint' ? new anchor_1.BN(arg.toString()) : arg);
+            // 4. Deep-convert arguments into Anchor-friendly types
+            //    - BigInt -> BN
+            //    - hex strings (0x...) -> Buffer
+            //    - Uint8Array -> Buffer
+            //    - UniversalPayload object normalization (to/data/vType)
+            const anchorify = (value) => {
+                // Preserve BN, Buffer, PublicKey, null/undefined
+                if (value === null ||
+                    value === undefined ||
+                    value instanceof anchor_1.BN ||
+                    Buffer.isBuffer(value) ||
+                    value instanceof web3_js_1.PublicKey)
+                    return value;
+                // BigInt -> BN
+                if (typeof value === 'bigint')
+                    return new anchor_1.BN(value.toString());
+                // Hex string -> Buffer
+                if (typeof value === 'string' && value.startsWith('0x')) {
+                    const hex = value.slice(2);
+                    if (hex.length === 0)
+                        return Buffer.alloc(0);
+                    // If odd length, left-pad a 0
+                    const normalized = hex.length % 2 === 1 ? `0${hex}` : hex;
+                    return Buffer.from(normalized, 'hex');
+                }
+                // Uint8Array -> Buffer
+                if (value instanceof Uint8Array)
+                    return Buffer.from(value);
+                // Array -> map recursively
+                if (Array.isArray(value))
+                    return value.map((v) => anchorify(v));
+                // Plain object -> recurse and normalize UniversalPayload shape
+                if (typeof value === 'object') {
+                    const obj = value;
+                    const out = {};
+                    for (const [k, v] of Object.entries(obj)) {
+                        out[k] = anchorify(v);
+                    }
+                    // Heuristic: normalize UniversalPayload fields expected by Anchor IDL
+                    const hasUniversalPayloadKeys = 'to' in out &&
+                        'value' in out &&
+                        'data' in out &&
+                        'gasLimit' in out &&
+                        'maxFeePerGas' in out &&
+                        'maxPriorityFeePerGas' in out &&
+                        'nonce' in out &&
+                        'deadline' in out &&
+                        'vType' in out;
+                    if (hasUniversalPayloadKeys) {
+                        // to: address(20 bytes) -> Buffer(20)
+                        if (typeof obj['to'] === 'string' && obj['to'].startsWith('0x')) {
+                            const hex = obj['to'].slice(2).padStart(40, '0');
+                            out['to'] = Buffer.from(hex, 'hex');
+                        }
+                        // data: bytes -> Buffer
+                        if (typeof obj['data'] === 'string' && obj['data'].startsWith('0x')) {
+                            const hex = obj['data'].slice(2);
+                            out['data'] = hex.length
+                                ? Buffer.from(hex, 'hex')
+                                : Buffer.alloc(0);
+                        }
+                        // vType: enum -> Anchor enum object
+                        if (typeof obj['vType'] === 'number') {
+                            out['vType'] =
+                                obj['vType'] === 0
+                                    ? { signedVerification: {} }
+                                    : { universalTxVerification: {} };
+                        }
+                        else if (typeof obj['vType'] === 'string') {
+                            const vt = obj['vType'].toLowerCase();
+                            if (vt.includes('signed'))
+                                out['vType'] = { signedVerification: {} };
+                            else
+                                out['vType'] = { universalTxVerification: {} };
+                        }
+                    }
+                    return out;
+                }
+                return value;
+            };
+            const convertedArgs = anchorify(args);
             // 5. Build the method call
-            let builder = convertedArgs.length > 0
+            let builder = Array.isArray(convertedArgs) && convertedArgs.length > 0
                 ? program.methods[functionName](...convertedArgs)
                 : program.methods[functionName]();
             if (Object.keys(accounts).length > 0) {
@@ -157,7 +236,7 @@ class SvmClient {
             if (!signer.signAndSendTransaction) {
                 throw new Error('signer.signTransaction is undefined');
             }
-            const txHashBytes = yield signer.signAndSendTransaction(txBytes);
+            const txHashBytes = yield signer.signAndSendTransaction(new Uint8Array(txBytes));
             return anchor_2.utils.bytes.bs58.encode(txHashBytes); // Clean, readable tx hash
         });
     }

package/src/lib/vm-client/svm-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"svm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/svm-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"svm-client.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/vm-client/svm-client.ts"],"names":[],"mappings":"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"}