@portal-hq/web 3.13.2 → 3.14.0-alpha.0

package/lib/commonjs/index.js

@@ -48,15 +48,23 @@ const passkeys_1 = __importDefault(require("./passkeys"));
 const evmAccountType_1 = require("./namespaces/evmAccountType");
 const logger_1 = require("./logger");
 const trace_1 = require("./shared/trace");
+const waitForEvmOrUserOpConfirmation_1 = require("./internal/waitForEvmOrUserOpConfirmation");
+const waitForSolanaTxConfirmation_1 = require("./internal/waitForSolanaTxConfirmation");
 class Portal {
     get ready() {
         return this.mpc.ready;
     }
+    get rpcConfig() {
+        return this._rpcConfig;
+    }
+    get iframeRpcConfig() {
+        return this._iframeRpcConfig;
+    }
     constructor({ 
     // Required
     rpcConfig, 
     // Optional
-    apiKey, authToken, authUrl, autoApprove = false, gdrive, passkey, host = 'web.portalhq.io', mpcVersion = 'v6', mpcHost = 'mpc-client.portalhq.io', featureFlags = {}, chainId, logLevel = 'none', logger = console, }) {
+    iframeRpcConfig, apiKey, authToken, authUrl, autoApprove = false, gdrive, passkey, host = 'web.portalhq.io', mpcVersion = 'v6', mpcHost = 'mpc-client.portalhq.io', featureFlags = {}, chainId, logLevel = 'none', logger = console, }) {
         this.errorCallbacks = [];
         this.readyCallbacks = [];
         this.logger = console;
@@ -77,7 +85,8 @@ class Portal {
         this.authToken = authToken;
         this.authUrl = authUrl;
         this.autoApprove = autoApprove;
-        this.rpcConfig = rpcConfig;
+        this._rpcConfig = rpcConfig;
+        this._iframeRpcConfig = iframeRpcConfig;
         this.host = host;
         this.mpcHost = mpcHost;
         this.mpcVersion = mpcVersion;
@@ -95,15 +104,43 @@ class Portal {
         this.mpc = new mpc_1.default({
             portal: this,
         });
-        this.yield = new yield_1.default({ mpc: this.mpc });
         this.ramps = new ramps_1.default({ mpc: this.mpc });
-        this.trading = new trading_1.default({ mpc: this.mpc });
         this.security = new security_1.default({ mpc: this.mpc });
-        this.delegations = new delegations_1.default({ mpc: this.mpc });
         this.provider = new provider_1.default({
             portal: this,
             chainId: chainId ? Number(chainId) : undefined,
         });
+        const signAndSendTransaction = (transaction, network) => __awaiter(this, void 0, void 0, function* () {
+            const method = network.startsWith('solana')
+                ? provider_1.RequestMethod.sol_signAndSendTransaction
+                : provider_1.RequestMethod.eth_sendTransaction;
+            const hash = yield this.provider.request({
+                chainId: network,
+                method,
+                params: [transaction],
+            });
+            if (typeof hash !== 'string' || hash.length === 0) {
+                throw new Error('[Portal] Signing request did not return a transaction hash. The user may have rejected the request, or the provider did not complete signing.');
+            }
+            return hash;
+        });
+        const evmRequestFn = (method, params, network) => this.provider.request({ chainId: network, method, params });
+        this.yield = new yield_1.default({
+            mpc: this.mpc,
+            waitForConfirmation: this.waitForConfirmation.bind(this),
+            evmRequestFn,
+        });
+        this.trading = new trading_1.default({
+            mpc: this.mpc,
+            signAndSendTransaction,
+            waitForConfirmation: this.waitForConfirmation.bind(this),
+            evmRequestFn,
+        });
+        this.yield.yieldXyz.setSignAndSendTransaction(signAndSendTransaction);
+        this.delegations = new delegations_1.default({
+            mpc: this.mpc,
+            signAndSendTransaction,
+        });
         this.evmAccountType = new evmAccountType_1.EvmAccountType({ mpc: this.mpc });
     }
     /***********************************
@@ -522,6 +559,44 @@ class Portal {
             }
         });
     }
+    /**
+     * Wait until a transaction is confirmed on-chain, or until timeout.
+     *
+     * - **EVM (`eip155:*`):** Polls both `eth_getTransactionReceipt` and
+     *   `eth_getUserOperationReceipt` (auto-detect, locks after first hit).
+     * - **Solana (`solana:*`):** Polls `getSignatureStatuses` until the
+     *   commitment level from `options.commitment`
+     *   is met (default `confirmed`).
+     * - **Other networks:** Returns `false` (unsupported for polling).
+     *
+     * Optional `options` tune poll/timeout for all polled chains; EVM also accepts
+     * `onTimeout` (default `resolve_false`) and `lockModeAfterDetection` (default `true`) for dual-receipt polling and timeout handling.
+     *
+     * All RPC calls are routed through the iframe proxy to avoid CORS issues.
+     */
+    waitForConfirmation(txHash, network, options) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestFn = (method, params, chainId) => this.provider.request({ chainId, method, params });
+            if (network.startsWith('eip155:')) {
+                return (0, waitForEvmOrUserOpConfirmation_1.waitForEvmOrUserOpConfirmation)(txHash, network, requestFn, {
+                    pollIntervalMs: (_a = options === null || options === void 0 ? void 0 : options.pollIntervalMs) !== null && _a !== void 0 ? _a : 4000,
+                    timeoutMs: (_b = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _b !== void 0 ? _b : 900000,
+                    onTimeout: (_c = options === null || options === void 0 ? void 0 : options.onTimeout) !== null && _c !== void 0 ? _c : 'resolve_false',
+                    lockModeAfterDetection: (_d = options === null || options === void 0 ? void 0 : options.lockModeAfterDetection) !== null && _d !== void 0 ? _d : true,
+                });
+            }
+            if (network.toLowerCase().startsWith('solana:')) {
+                return (0, waitForSolanaTxConfirmation_1.waitForSolanaTxConfirmation)(txHash, network, requestFn, {
+                    pollIntervalMs: (_e = options === null || options === void 0 ? void 0 : options.pollIntervalMs) !== null && _e !== void 0 ? _e : 4000,
+                    timeoutMs: (_f = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _f !== void 0 ? _f : 900000,
+                    commitment: (_g = options === null || options === void 0 ? void 0 : options.commitment) !== null && _g !== void 0 ? _g : 'confirmed',
+                });
+            }
+            logger_1.sdkLogger.warn(`[Portal.waitForConfirmation] Unsupported network: "${network}". Returning false (cannot verify confirmation).`, { txHash, network });
+            return false;
+        });
+    }
     /****************************
      * Provider Methods
      ****************************/
@@ -811,12 +886,57 @@ class Portal {
             return (_a = this.mpc) === null || _a === void 0 ? void 0 : _a.getNFTs(chainId);
         });
     }
+    /**
+     * @deprecated This method is deprecated and will be removed in a future version.
+     * Please use `getTransactionHistory()` instead, which uses the new Portal v3 API
+     * endpoint and returns the unified transaction format across all chains.
+     *
+     * Legacy endpoint: /api/v3/clients/me/transactions?chainId={chainId}
+     * New endpoint: /api/v3/clients/me/chains/{chain}/transactions
+     */
     getTransactions(chainId, limit, offset, order) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             return (_a = this.mpc) === null || _a === void 0 ? void 0 : _a.getTransactions(chainId, limit, offset, order);
         });
     }
+    /**
+     * Retrieves transaction history for the client's wallet on the specified chain.
+     *
+     * This method uses the new Portal v3 API endpoint and returns the unified
+     * transaction format. Supports EVM (EIP-155), Solana, Bitcoin, Tron, and Stellar chains.
+     *
+     * Response format varies by chain:
+     * - Solana returns the legacy format (will be migrated in a future release)
+     * - All other chains return the unified TransactionHistoryItem format
+     *
+     * @param params - Request parameters
+     * @param params.chainId - Chain ID in CAIP-2 format (e.g., 'eip155:1', 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp')
+     * @param params.limit - Maximum number of transactions to return (default: 50, max: 1000 for EVM, 15 for Solana)
+     * @param params.offset - Number of transactions to skip (default: 0)
+     * @param params.order - Sort order ('asc' or 'desc')
+     * @param params.address - Override wallet address (EVM only, must match client's known addresses)
+     * @param params.userOperations - Filter for ERC-4337 UserOperations (EVM only): 'include', 'only', or 'exclude'
+     * @returns Promise resolving to transaction history response
+     *
+     * @example
+     * ```typescript
+     * // Fetch latest 100 transactions for Ethereum mainnet
+     * const response = await portal.getTransactionHistory({
+     *   chainId: 'eip155:1',
+     *   limit: 100,
+     *   order: 'desc'
+     * });
+     *
+     * console.log(response.data.transactions); // Array of TransactionHistoryItem
+     * ```
+     */
+    getTransactionHistory(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return (_a = this.mpc) === null || _a === void 0 ? void 0 : _a.getTransactionHistory(params);
+        });
+    }
     /**
      * @deprecated This method is deprecated. Use `portal.evaluateTransaction` instead.
      */
@@ -888,13 +1008,11 @@ class Portal {
         if (!chainId) {
             throw new Error('[Portal] No chainId provided. Please provide a chainId to get the RPC endpoint');
         }
-        // Ensure the chainId is configured in the rpcConfig.
         // eslint-disable-next-line no-prototype-builtins
-        if (!this.rpcConfig.hasOwnProperty(chainId)) {
+        if (!this._rpcConfig.hasOwnProperty(chainId)) {
             throw new Error(`[Portal] No RPC endpoint configured for chainId: ${chainId}`);
         }
-        // Derive the RPC endpoint from the rpcConfig.
-        const gatewayUrl = this.rpcConfig[chainId];
+        const gatewayUrl = this._rpcConfig[chainId];
         // If the RPC endpoint is a string, return it as-is.
         if (typeof gatewayUrl === 'string') {
             return gatewayUrl;

package/lib/commonjs/index.test.js

@@ -731,5 +731,18 @@ describe('Portal', () => {
         it('should throw an error if the chainId is not present in the rpc config', () => {
             expect(() => portal.getRpcUrl('incorrect-config')).toThrow(new Error('[Portal] Could not find a valid rpcConfig entry for chainId: incorrect-config'));
         });
+        it('should use rpcConfig for getRpcUrl when iframeRpcConfig is also set', () => {
+            const iframeRpcConfig = {
+                'eip155:1': 'http://localhost:9999/rpc/v1/eip155/1',
+            };
+            portal = new _1.default({
+                rpcConfig: constants_1.mockRpcConfig,
+                iframeRpcConfig,
+            });
+            portal.mpc = mpc_1.default;
+            portal.provider = provider_1.default;
+            expect(portal.getRpcUrl('eip155:1')).toEqual(constants_1.mockEthRpcUrl);
+            expect(portal.iframeRpcConfig).toEqual(iframeRpcConfig);
+        });
     });
 });

package/lib/commonjs/integrations/delegations/index.js

@@ -9,9 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const DELEGATIONS_SUBMIT_CONFIG_ERROR = '[Delegations] No signer configured. Call setSignAndSendTransaction() on the instance or pass signAndSendTransaction in options.';
 class Delegations {
-    constructor({ mpc }) {
-        this.mpc = mpc;
+    constructor(options) {
+        this.mpc = options.mpc;
+        this.signAndSendTransaction = options.signAndSendTransaction;
+    }
+    setSignAndSendTransaction(fn) {
+        this.signAndSendTransaction = fn;
     }
     /**
      * Approves a delegation for a specified token on a given chain.
@@ -61,5 +66,107 @@ class Delegations {
             return (_a = this.mpc) === null || _a === void 0 ? void 0 : _a.delegationsTransferFrom(params);
         });
     }
+    /**
+     * Approves a delegation, then signs and broadcasts each returned transaction via
+     * {@link DelegationsOptions.signAndSendTransaction}.
+     *
+     * Requires `signAndSendTransaction` (provided by default on `Portal.delegations`).
+     * Confirming transactions on-chain remains the application's responsibility.
+     *
+     * @param params - Same as {@link Delegations.approve}
+     * @param options - Optional progress callbacks
+     * @returns Transaction hashes in submission order
+     */
+    approveAndSubmit(params, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const signAndSend = (_a = options === null || options === void 0 ? void 0 : options.signAndSendTransaction) !== null && _a !== void 0 ? _a : this.signAndSendTransaction;
+            if (!signAndSend) {
+                throw new Error(DELEGATIONS_SUBMIT_CONFIG_ERROR);
+            }
+            const response = yield this.approve(params);
+            return this.executeAndTrack(response, params.chain, signAndSend, options === null || options === void 0 ? void 0 : options.onProgress);
+        });
+    }
+    /**
+     * Revokes a delegation, then signs and broadcasts each returned transaction.
+     *
+     * Requires `signAndSendTransaction` (provided by default on `Portal.delegations`).
+     *
+     * @param params - Same as {@link Delegations.revoke}
+     * @param options - Optional progress callbacks
+     * @returns Transaction hashes in submission order
+     */
+    revokeAndSubmit(params, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const signAndSend = (_a = options === null || options === void 0 ? void 0 : options.signAndSendTransaction) !== null && _a !== void 0 ? _a : this.signAndSendTransaction;
+            if (!signAndSend) {
+                throw new Error(DELEGATIONS_SUBMIT_CONFIG_ERROR);
+            }
+            const response = yield this.revoke(params);
+            return this.executeAndTrack(response, params.chain, signAndSend, options === null || options === void 0 ? void 0 : options.onProgress);
+        });
+    }
+    /**
+     * Executes a delegated transfer, then signs and broadcasts each returned transaction.
+     *
+     * Requires `signAndSendTransaction` (provided by default on `Portal.delegations`).
+     *
+     * @param params - Same as {@link Delegations.transferFrom}
+     * @param options - Optional progress callbacks
+     * @returns Transaction hashes in submission order
+     */
+    transferAndSubmit(params, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const signAndSend = (_a = options === null || options === void 0 ? void 0 : options.signAndSendTransaction) !== null && _a !== void 0 ? _a : this.signAndSendTransaction;
+            if (!signAndSend) {
+                throw new Error(DELEGATIONS_SUBMIT_CONFIG_ERROR);
+            }
+            const response = yield this.transferFrom(params);
+            return this.executeAndTrack(response, params.chain, signAndSend, options === null || options === void 0 ? void 0 : options.onProgress);
+        });
+    }
+    normalizeToTransactionList(response) {
+        const transactions = Array.isArray(response.transactions)
+            ? response.transactions
+            : [];
+        const encodedTransactions = Array.isArray(response.encodedTransactions)
+            ? response.encodedTransactions
+            : [];
+        if (transactions.length > 0) {
+            return transactions;
+        }
+        if (encodedTransactions.length > 0) {
+            return encodedTransactions;
+        }
+        return [];
+    }
+    executeAndTrack(response, chainId, signAndSend, onProgress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const transactions = this.normalizeToTransactionList(response);
+            if (transactions.length === 0) {
+                throw new Error('No transactions in delegation response.');
+            }
+            const total = transactions.length;
+            const hashes = [];
+            for (let index = 0; index < transactions.length; index++) {
+                const tx = transactions[index];
+                // Validate transaction exists (defensive check for sparse arrays)
+                if (!tx) {
+                    throw new Error(`Transaction at index ${index} is undefined or null. This indicates a malformed API response.`);
+                }
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress({ step: 'signing', index, total });
+                const hash = yield signAndSend(tx, chainId);
+                if (typeof hash !== 'string' || hash.trim().length === 0) {
+                    throw new Error(`Invalid transaction hash returned from signAndSendTransaction at index ${index} for chain ${chainId}.`);
+                }
+                hashes.push(hash);
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress({ step: 'submitted', index, total, hash });
+            }
+            return { hashes };
+        });
+    }
 }
 exports.default = Delegations;

package/lib/commonjs/integrations/delegations/index.test.js

@@ -90,4 +90,175 @@ describe('Delegations', () => {
             yield expect(delegations.transferFrom(delegations_1.mockTransferFromRequest)).rejects.toThrow('Test error');
         }));
     });
+    describe('approveAndSubmit, revokeAndSubmit, transferAndSubmit', () => {
+        const mockSignAndSend = jest.fn();
+        beforeEach(() => {
+            mockSignAndSend.mockResolvedValue('0xtxhash');
+        });
+        it('throws when signAndSendTransaction is not configured', () => __awaiter(void 0, void 0, void 0, function* () {
+            const d = new _1.default({ mpc });
+            yield expect(d.approveAndSubmit(delegations_1.mockEVMApproveRequest)).rejects.toThrow('[Delegations] No signer configured. Call setSignAndSendTransaction() on the instance or pass signAndSendTransaction in options.');
+            yield expect(d.revokeAndSubmit(delegations_1.mockEVMRevokeRequest)).rejects.toThrow('[Delegations] No signer configured. Call setSignAndSendTransaction() on the instance or pass signAndSendTransaction in options.');
+            yield expect(d.transferAndSubmit(delegations_1.mockTransferFromRequest)).rejects.toThrow('[Delegations] No signer configured. Call setSignAndSendTransaction() on the instance or pass signAndSendTransaction in options.');
+        }));
+        it('approveAndSubmit calls MPC then signAndSend per transaction', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(delegations_1.mockEVMApproveResponse);
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            const result = yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest);
+            expect(mpc.delegationsApprove).toHaveBeenCalledWith(delegations_1.mockEVMApproveRequest);
+            expect(mockSignAndSend).toHaveBeenCalledTimes(1);
+            expect(mockSignAndSend).toHaveBeenCalledWith(delegations_1.mockEVMApproveResponse.transactions[0], delegations_1.mockEVMApproveRequest.chain);
+            expect(result).toEqual({ hashes: ['0xtxhash'] });
+        }));
+        it('revokeAndSubmit calls delegationsRevoke then signAndSend per transaction', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsRevoke').mockResolvedValue(delegations_1.mockEVMRevokeResponse);
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            const result = yield d.revokeAndSubmit(delegations_1.mockEVMRevokeRequest);
+            expect(mpc.delegationsRevoke).toHaveBeenCalledWith(delegations_1.mockEVMRevokeRequest);
+            expect(mockSignAndSend).toHaveBeenCalledTimes(1);
+            expect(mockSignAndSend).toHaveBeenCalledWith(delegations_1.mockEVMRevokeResponse.transactions[0], delegations_1.mockEVMRevokeRequest.chain);
+            expect(result).toEqual({ hashes: ['0xtxhash'] });
+        }));
+        it('transferAndSubmit calls delegationsTransferFrom then signAndSend per transaction', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest
+                .spyOn(mpc, 'delegationsTransferFrom')
+                .mockResolvedValue(delegations_1.mockTransferFromResponse);
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            const result = yield d.transferAndSubmit(delegations_1.mockTransferFromRequest);
+            expect(mpc.delegationsTransferFrom).toHaveBeenCalledWith(delegations_1.mockTransferFromRequest);
+            expect(mockSignAndSend).toHaveBeenCalledTimes(1);
+            expect(mockSignAndSend).toHaveBeenCalledWith(delegations_1.mockTransferFromResponse.transactions[0], delegations_1.mockTransferFromRequest.chain);
+            expect(result).toEqual({ hashes: ['0xtxhash'] });
+        }));
+        it('uses encodedTransactions when transactions is empty', () => __awaiter(void 0, void 0, void 0, function* () {
+            const response = {
+                transactions: [],
+                encodedTransactions: ['solTxPayload'],
+                metadata: delegations_1.mockEVMApproveResponse.metadata,
+            };
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(response);
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest);
+            expect(mockSignAndSend).toHaveBeenCalledWith('solTxPayload', delegations_1.mockEVMApproveRequest.chain);
+        }));
+        it('invokes onProgress for each transaction', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(delegations_1.mockEVMApproveResponse);
+            const onProgress = jest.fn();
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest, { onProgress });
+            expect(onProgress).toHaveBeenCalledTimes(2);
+            expect(onProgress).toHaveBeenNthCalledWith(1, {
+                step: 'signing',
+                index: 0,
+                total: 1,
+            });
+            expect(onProgress).toHaveBeenNthCalledWith(2, {
+                step: 'submitted',
+                index: 0,
+                total: 1,
+                hash: '0xtxhash',
+            });
+        }));
+        it('throws when response has no transactions', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue({
+                metadata: delegations_1.mockEVMApproveResponse.metadata,
+            });
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            yield expect(d.approveAndSubmit(delegations_1.mockEVMApproveRequest)).rejects.toThrow('No transactions in delegation response.');
+            expect(mockSignAndSend).not.toHaveBeenCalled();
+        }));
+        it('submits multiple EVM transactions in order', () => __awaiter(void 0, void 0, void 0, function* () {
+            const txA = Object.assign({}, delegations_1.mockEVMApproveResponse.transactions[0]);
+            const txB = Object.assign(Object.assign({}, txA), { data: '0xbbbb' });
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(Object.assign(Object.assign({}, delegations_1.mockEVMApproveResponse), { transactions: [txA, txB] }));
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            mockSignAndSend.mockResolvedValueOnce('0xh1').mockResolvedValueOnce('0xh2');
+            const result = yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest);
+            expect(mockSignAndSend).toHaveBeenCalledTimes(2);
+            expect(mockSignAndSend).toHaveBeenNthCalledWith(1, txA, delegations_1.mockEVMApproveRequest.chain);
+            expect(mockSignAndSend).toHaveBeenNthCalledWith(2, txB, delegations_1.mockEVMApproveRequest.chain);
+            expect(result.hashes).toEqual(['0xh1', '0xh2']);
+        }));
+        it('propagates error after first tx succeeds (partial submit)', () => __awaiter(void 0, void 0, void 0, function* () {
+            const txA = Object.assign({}, delegations_1.mockEVMApproveResponse.transactions[0]);
+            const txB = Object.assign(Object.assign({}, txA), { data: '0xbbbb' });
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(Object.assign(Object.assign({}, delegations_1.mockEVMApproveResponse), { transactions: [txA, txB] }));
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            mockSignAndSend
+                .mockResolvedValueOnce('0xh1')
+                .mockRejectedValueOnce(new Error('second tx failed'));
+            yield expect(d.approveAndSubmit(delegations_1.mockEVMApproveRequest)).rejects.toThrow('second tx failed');
+            expect(mockSignAndSend).toHaveBeenCalledTimes(2);
+        }));
+        it('per-call signAndSendTransaction overrides constructor signer', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(delegations_1.mockEVMApproveResponse);
+            const instanceSigner = jest.fn().mockResolvedValue('0xinstance');
+            const perCallSigner = jest.fn().mockResolvedValue('0xpercall');
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: instanceSigner,
+            });
+            yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest, {
+                signAndSendTransaction: perCallSigner,
+            });
+            expect(instanceSigner).not.toHaveBeenCalled();
+            expect(perCallSigner).toHaveBeenCalledTimes(1);
+        }));
+        it('throws on whitespace-only hash from signer', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(delegations_1.mockEVMApproveResponse);
+            mockSignAndSend.mockResolvedValue('   ');
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            yield expect(d.approveAndSubmit(delegations_1.mockEVMApproveRequest)).rejects.toThrow('Invalid transaction hash');
+        }));
+        it('prefers transactions over encodedTransactions when both non-empty', () => __awaiter(void 0, void 0, void 0, function* () {
+            const evmTx = delegations_1.mockEVMApproveResponse.transactions[0];
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue({
+                transactions: [evmTx],
+                encodedTransactions: ['should-not-use'],
+                metadata: delegations_1.mockEVMApproveResponse.metadata,
+            });
+            const d = new _1.default({
+                mpc,
+                signAndSendTransaction: mockSignAndSend,
+            });
+            yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest);
+            expect(mockSignAndSend).toHaveBeenCalledWith(evmTx, delegations_1.mockEVMApproveRequest.chain);
+        }));
+        it('setSignAndSendTransaction enables submit after construction', () => __awaiter(void 0, void 0, void 0, function* () {
+            jest.spyOn(mpc, 'delegationsApprove').mockResolvedValue(delegations_1.mockEVMApproveResponse);
+            const d = new _1.default({ mpc });
+            const late = jest.fn().mockResolvedValue('0xlate');
+            d.setSignAndSendTransaction(late);
+            const result = yield d.approveAndSubmit(delegations_1.mockEVMApproveRequest);
+            expect(late).toHaveBeenCalledTimes(1);
+            expect(result).toEqual({ hashes: ['0xlate'] });
+        }));
+    });
 });

package/lib/commonjs/integrations/ramps/noah/index.test.js

@@ -67,7 +67,15 @@ describe('Noah', () => {
             destinationAddress: 'SoLAddr1111111111111111111111111111111111111',
         };
         const spy = jest.spyOn(mpc, 'initiatePayin').mockResolvedValue({
-            data: { payinId: 'p1', bankDetails: {} },
+            data: {
+                payinId: 'p1',
+                bankDetails: {
+                    paymentMethodId: 'pm-123',
+                    paymentMethodType: 'bank_account',
+                    accountNumber: '1234567890',
+                    network: 'solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
+                },
+            },
         });
         yield noah.initiatePayin(req);
         expect(spy).toHaveBeenCalledWith(req);
@@ -79,14 +87,14 @@ describe('Noah', () => {
             fiatCurrency: 'USD',
         };
         const spy = jest.spyOn(mpc, 'simulatePayin').mockResolvedValue({
-            data: {},
+            data: { fiatDepositId: 'deposit-123' },
         });
         yield noah.simulatePayin(sim);
         expect(spy).toHaveBeenCalledWith(sim);
     }));
     it('should call mpc.getPayoutCountries', () => __awaiter(void 0, void 0, void 0, function* () {
         const spy = jest.spyOn(mpc, 'getPayoutCountries').mockResolvedValue({
-            data: { countries: [] },
+            data: { countries: { US: ['USD'], MX: ['MXN', 'USD'] } },
         });
         yield noah.getPayoutCountries();
         expect(spy).toHaveBeenCalled();
@@ -99,7 +107,7 @@ describe('Noah', () => {
             fiatAmount: '10',
         };
         const spy = jest.spyOn(mpc, 'getPayoutChannels').mockResolvedValue({
-            data: [],
+            data: { items: [] },
         });
         yield noah.getPayoutChannels(req);
         expect(spy).toHaveBeenCalledWith(req);
@@ -107,7 +115,12 @@ describe('Noah', () => {
     it('should call mpc.getPayoutChannelForm', () => __awaiter(void 0, void 0, void 0, function* () {
         const spy = jest
             .spyOn(mpc, 'getPayoutChannelForm')
-            .mockResolvedValue({ data: {} });
+            .mockResolvedValue({
+            data: {
+                formSchema: { type: 'object', properties: {} },
+                formMetadata: { contentHash: 'abc123' },
+            },
+        });
         yield noah.getPayoutChannelForm('ch-1');
         expect(spy).toHaveBeenCalledWith('ch-1');
     }));

package/lib/commonjs/integrations/trading/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,13 +17,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const zero_x_1 = __importDefault(require("./zero-x"));
 const lifi_1 = __importDefault(require("./lifi"));
 /**
- * This class is a container for the LiFi class.
- * In the future, Trading domain logic should be here.
+ * Trading integrations (LiFi, 0x).
  */
 class Trading {
-    constructor({ mpc }) {
-        this.lifi = new lifi_1.default({ mpc });
-        this.zeroX = new zero_x_1.default({ mpc });
+    constructor(_a) {
+        var { mpc } = _a, defaults = __rest(_a, ["mpc"]);
+        this.lifi = new lifi_1.default(Object.assign({ mpc }, defaults));
+        this.zeroX = new zero_x_1.default(Object.assign({ mpc }, defaults));
     }
 }
 exports.default = Trading;