@toon-protocol/connector 3.8.1 → 3.9.1

package/dist/core/connector-node.js

@@ -32,6 +32,9 @@ const in_memory_ledger_client_1 = require("../settlement/in-memory-ledger-client
 const per_packet_claim_service_1 = require("../settlement/per-packet-claim-service");
 const chain_provider_registry_1 = require("../settlement/provider/chain-provider-registry");
 const evm_payment_channel_provider_1 = require("../settlement/provider/evm-payment-channel-provider");
+const mina_payment_channel_provider_1 = require("../settlement/provider/mina-payment-channel-provider");
+const signer_resolution_1 = require("../settlement/provider/signer-resolution");
+const solana_payment_channel_provider_1 = require("../settlement/provider/solana-payment-channel-provider");
 const claim_sender_db_schema_1 = require("../settlement/claim-sender-db-schema");
 const inbound_claim_validator_1 = require("../btp/inbound-claim-validator");
 const nip59_claim_wrapper_1 = require("../settlement/privacy/nip59-claim-wrapper");
@@ -54,6 +57,7 @@ class ConnectorNode {
     _claimReceiver = null;
     _settlementMonitor = null;
     _settlementExecutor = null;
+    _chainRegistry = null;
     _tigerBeetleClient = null;
     _inMemoryLedgerClient = null;
     _settlementPeers = new Map();
@@ -282,93 +286,133 @@ class ConnectorNode {
             const registryAddress = evmProviderConfig?.registryAddress;
             const m2mTokenAddress = evmProviderConfig?.tokenAddress;
             const treasuryPrivateKey = evmProviderConfig?.keyId;
-            if (evmProviderConfig &&
+            const chainProviderConfigs = this._config.chainProviders ?? [];
+            const hasAnySettlementChain = chainProviderConfigs.some((p) => (p.chainType === 'evm' && p.rpcUrl && p.registryAddress && p.tokenAddress && p.keyId) ||
+                (p.chainType === 'solana' &&
+                    p.rpcUrl &&
+                    p.programId &&
+                    (p.keyId || process.env.SOLANA_PRIVATE_KEY)) ||
+                (p.chainType === 'mina' &&
+                    p.graphqlUrl &&
+                    p.zkAppAddress &&
+                    (p.keyId || process.env.MINA_PRIVATE_KEY)));
+            const hasEvm = !!(evmProviderConfig &&
                 baseRpcUrl &&
                 registryAddress &&
                 m2mTokenAddress &&
-                treasuryPrivateKey) {
+                treasuryPrivateKey);
+            if (hasAnySettlementChain) {
                 try {
-                    const keyManager = new key_manager_1.KeyManager({
-                        backend: 'env',
-                        nodeId: this._config.nodeId,
-                        evmPrivateKey: treasuryPrivateKey,
-                    }, this._logger);
-                    const evmKeyId = 'evm';
-                    const { ethers } = await (0, optional_require_1.requireOptional)('ethers', 'EVM settlement');
-                    const provider = new ethers.JsonRpcProvider(baseRpcUrl);
-                    this._paymentChannelSDK = new payment_channel_sdk_1.PaymentChannelSDK(provider, keyManager, evmKeyId, registryAddress, this._logger);
-                    try {
-                        const resolvedSymbol = await this._paymentChannelSDK.getTokenSymbol(m2mTokenAddress);
-                        if (resolvedSymbol) {
-                            this._defaultSettlementTokenId = resolvedSymbol;
-                            this._logger.info({
-                                event: 'token_symbol_resolved',
-                                symbol: resolvedSymbol,
+                    let primaryChainId;
+                    if (hasEvm) {
+                        const keyManager = new key_manager_1.KeyManager({
+                            backend: 'env',
+                            nodeId: this._config.nodeId,
+                            evmPrivateKey: treasuryPrivateKey,
+                        }, this._logger);
+                        const evmKeyId = 'evm';
+                        const { ethers } = await (0, optional_require_1.requireOptional)('ethers', 'EVM settlement');
+                        const provider = new ethers.JsonRpcProvider(baseRpcUrl);
+                        this._paymentChannelSDK = new payment_channel_sdk_1.PaymentChannelSDK(provider, keyManager, evmKeyId, registryAddress, this._logger);
+                        try {
+                            const resolvedSymbol = await this._paymentChannelSDK.getTokenSymbol(m2mTokenAddress);
+                            if (resolvedSymbol) {
+                                this._defaultSettlementTokenId = resolvedSymbol;
+                                this._logger.info({
+                                    event: 'token_symbol_resolved',
+                                    symbol: resolvedSymbol,
+                                    tokenAddress: m2mTokenAddress,
+                                }, `Resolved on-chain token symbol: ${resolvedSymbol}`);
+                            }
+                            else {
+                                this._logger.warn({ event: 'token_symbol_empty', tokenAddress: m2mTokenAddress }, 'ERC-20 symbol() returned empty string, falling back to M2M');
+                            }
+                        }
+                        catch (symbolError) {
+                            this._logger.warn({
+                                event: 'token_symbol_resolution_failed',
                                 tokenAddress: m2mTokenAddress,
-                            }, `Resolved on-chain token symbol: ${resolvedSymbol}`);
+                                error: symbolError instanceof Error ? symbolError.message : String(symbolError),
+                            }, 'Failed to resolve on-chain token symbol, falling back to M2M');
                         }
-                        else {
-                            this._logger.warn({ event: 'token_symbol_empty', tokenAddress: m2mTokenAddress }, 'ERC-20 symbol() returned empty string, falling back to M2M');
+                        primaryChainId =
+                            this._config.blockchain?.base?.chainId ?? this._config.blockchain?.arbitrum?.chainId;
+                        if (primaryChainId) {
+                            this._chainSDKs.set(primaryChainId, this._paymentChannelSDK);
+                        }
+                        const enabledChains = [];
+                        if (this._config.blockchain?.base?.enabled && this._config.blockchain.base) {
+                            enabledChains.push({ name: 'Base', config: this._config.blockchain.base });
+                        }
+                        if (this._config.blockchain?.arbitrum?.enabled && this._config.blockchain.arbitrum) {
+                            enabledChains.push({ name: 'Arbitrum', config: this._config.blockchain.arbitrum });
+                        }
+                        for (const chain of enabledChains) {
+                            if (this._chainSDKs.has(chain.config.chainId)) {
+                                continue;
+                            }
+                            const chainRpcUrl = chain.config.rpcUrl;
+                            const chainRegistryAddress = chain.config.registryAddress ?? registryAddress;
+                            const chainPrivateKey = chain.config.privateKey ?? treasuryPrivateKey;
+                            const chainKeyManager = chainPrivateKey !== treasuryPrivateKey
+                                ? new key_manager_1.KeyManager({
+                                    backend: 'env',
+                                    nodeId: this._config.nodeId,
+                                    evmPrivateKey: chainPrivateKey,
+                                }, this._logger)
+                                : keyManager;
+                            const chainProvider = new ethers.JsonRpcProvider(chainRpcUrl);
+                            const chainSDK = new payment_channel_sdk_1.PaymentChannelSDK(chainProvider, chainKeyManager, evmKeyId, chainRegistryAddress, this._logger);
+                            this._chainSDKs.set(chain.config.chainId, chainSDK);
+                            this._logger.info({
+                                event: 'chain_sdk_initialized',
+                                chain: chain.name,
+                                chainId: chain.config.chainId,
+                                rpcUrl: chainRpcUrl,
+                            }, `PaymentChannelSDK initialized for ${chain.name} (chainId: ${chain.config.chainId})`);
                         }
                     }
-                    catch (symbolError) {
-                        this._logger.warn({
-                            event: 'token_symbol_resolution_failed',
-                            tokenAddress: m2mTokenAddress,
-                            error: symbolError instanceof Error ? symbolError.message : String(symbolError),
-                        }, 'Failed to resolve on-chain token symbol, falling back to M2M');
-                    }
-                    const primaryChainId = this._config.blockchain?.base?.chainId ?? this._config.blockchain?.arbitrum?.chainId;
-                    if (primaryChainId) {
-                        this._chainSDKs.set(primaryChainId, this._paymentChannelSDK);
-                    }
-                    const enabledChains = [];
-                    if (this._config.blockchain?.base?.enabled && this._config.blockchain.base) {
-                        enabledChains.push({ name: 'Base', config: this._config.blockchain.base });
-                    }
-                    if (this._config.blockchain?.arbitrum?.enabled && this._config.blockchain.arbitrum) {
-                        enabledChains.push({ name: 'Arbitrum', config: this._config.blockchain.arbitrum });
-                    }
-                    for (const chain of enabledChains) {
-                        if (this._chainSDKs.has(chain.config.chainId)) {
-                            continue;
+                    const firstNonEvmConfig = chainProviderConfigs.find((p) => p.chainType === 'solana' || p.chainType === 'mina');
+                    if (!hasEvm && firstNonEvmConfig) {
+                        if (firstNonEvmConfig.chainType === 'solana') {
+                            this._defaultSettlementTokenId = firstNonEvmConfig.tokenMint ?? 'SOL';
+                        }
+                        else if (firstNonEvmConfig.chainType === 'mina') {
+                            this._defaultSettlementTokenId = firstNonEvmConfig.tokenId ?? 'MINA';
                         }
-                        const chainRpcUrl = chain.config.rpcUrl;
-                        const chainRegistryAddress = chain.config.registryAddress ?? registryAddress;
-                        const chainPrivateKey = chain.config.privateKey ?? treasuryPrivateKey;
-                        const chainKeyManager = chainPrivateKey !== treasuryPrivateKey
-                            ? new key_manager_1.KeyManager({ backend: 'env', nodeId: this._config.nodeId, evmPrivateKey: chainPrivateKey }, this._logger)
-                            : keyManager;
-                        const chainProvider = new ethers.JsonRpcProvider(chainRpcUrl);
-                        const chainSDK = new payment_channel_sdk_1.PaymentChannelSDK(chainProvider, chainKeyManager, evmKeyId, chainRegistryAddress, this._logger);
-                        this._chainSDKs.set(chain.config.chainId, chainSDK);
-                        this._logger.info({
-                            event: 'chain_sdk_initialized',
-                            chain: chain.name,
-                            chainId: chain.config.chainId,
-                            rpcUrl: chainRpcUrl,
-                        }, `PaymentChannelSDK initialized for ${chain.name} (chainId: ${chain.config.chainId})`);
                     }
                     const peerIdToAddressMap = new Map();
                     for (const peer of this._config.peers) {
-                        if (peer.evmAddress) {
-                            peerIdToAddressMap.set(peer.id, peer.evmAddress);
-                            this._logger.debug({ peerId: peer.id, address: peer.evmAddress }, 'Loaded peer EVM address from config');
+                        const peerAddr = peer.evmAddress ?? peer.settlementAddress;
+                        if (peerAddr) {
+                            peerIdToAddressMap.set(peer.id, peerAddr);
+                            this._logger.debug({ peerId: peer.id, address: peerAddr }, 'Loaded peer settlement address from config');
                         }
                     }
-                    for (let i = 1; i <= 10; i++) {
-                        const peerAddress = process.env[`PEER${i}_EVM_ADDRESS`];
-                        const peerId = `peer${i}`;
-                        if (peerAddress && !peerIdToAddressMap.has(peerId)) {
-                            peerIdToAddressMap.set(peerId, peerAddress);
-                            this._logger.debug({ peerId, address: peerAddress }, 'Loaded peer EVM address from env var (fallback)');
+                    if (hasEvm) {
+                        for (let i = 1; i <= 10; i++) {
+                            const peerAddress = process.env[`PEER${i}_EVM_ADDRESS`];
+                            const peerId = `peer${i}`;
+                            if (peerAddress && !peerIdToAddressMap.has(peerId)) {
+                                peerIdToAddressMap.set(peerId, peerAddress);
+                                this._logger.debug({ peerId, address: peerAddress }, 'Loaded peer EVM address from env var (fallback)');
+                            }
                         }
                     }
                     const tokenAddressMap = new Map();
-                    tokenAddressMap.set(this._defaultSettlementTokenId, m2mTokenAddress);
-                    tokenAddressMap.set(m2mTokenAddress, m2mTokenAddress);
-                    const defaultSettlementTimeout = evmProviderConfig.settlementOptions?.settlementTimeoutSecs ?? 86400;
-                    const initialDepositMultiplier = evmProviderConfig.settlementOptions?.initialDepositMultiplier ?? 1;
+                    if (hasEvm) {
+                        tokenAddressMap.set(this._defaultSettlementTokenId, m2mTokenAddress);
+                        tokenAddressMap.set(m2mTokenAddress, m2mTokenAddress);
+                    }
+                    else if (firstNonEvmConfig) {
+                        const nonEvmTokenRef = firstNonEvmConfig.chainType === 'solana'
+                            ? (firstNonEvmConfig.tokenMint ?? this._defaultSettlementTokenId)
+                            : firstNonEvmConfig.zkAppAddress;
+                        tokenAddressMap.set(this._defaultSettlementTokenId, nonEvmTokenRef);
+                    }
+                    const firstSettlementOptions = chainProviderConfigs.find((p) => p.chainType === 'evm' && !!p.settlementOptions)?.settlementOptions;
+                    const defaultSettlementTimeout = firstSettlementOptions?.settlementTimeoutSecs ?? 86400;
+                    const initialDepositMultiplier = firstSettlementOptions?.initialDepositMultiplier ?? 1;
                     let accountManager;
                     const tigerBeetleClusterId = process.env.TIGERBEETLE_CLUSTER_ID;
                     const tigerBeetleReplicas = process.env.TIGERBEETLE_REPLICAS;
@@ -427,7 +471,7 @@ class ConnectorNode {
                         this._accountManager = accountManager;
                     }
                     const peerIds = Array.from(peerIdToAddressMap.keys());
-                    const settlementThreshold = BigInt(evmProviderConfig.settlementOptions?.threshold ?? '1000000');
+                    const settlementThreshold = BigInt(firstSettlementOptions?.threshold ?? '1000000');
                     this._logger.info({
                         event: 'settlement_monitor_config',
                         peerIds,
@@ -441,25 +485,92 @@ class ConnectorNode {
                         tokenIds: [this._defaultSettlementTokenId],
                     }, this._logger);
                     this._settlementMonitor = settlementMonitor;
+                    const chainRegistry = new chain_provider_registry_1.ChainProviderRegistry();
+                    this._chainRegistry = chainRegistry;
                     const chainProviderChainId = this._config.chainProviders?.find((cp) => cp.chainType === 'evm')?.chainId;
-                    const primaryChainIdStr = primaryChainId
+                    const evmChainIdStr = primaryChainId
                         ? `evm:${primaryChainId}`
                         : (chainProviderChainId ?? 'evm:unknown');
-                    const chainRegistry = new chain_provider_registry_1.ChainProviderRegistry();
-                    const evmProvider = new evm_payment_channel_provider_1.EVMPaymentChannelProvider(this._paymentChannelSDK, primaryChainIdStr, m2mTokenAddress, this._logger);
-                    chainRegistry.register(evmProvider);
+                    if (hasEvm) {
+                        const evmProvider = new evm_payment_channel_provider_1.EVMPaymentChannelProvider(this._paymentChannelSDK, evmChainIdStr, m2mTokenAddress, this._logger);
+                        chainRegistry.register(evmProvider);
+                        this._logger.info({ event: 'chain_provider_registered', chainType: 'evm', chainId: evmChainIdStr }, `EVM payment channel provider registered (${evmChainIdStr})`);
+                    }
+                    for (const cfg of chainProviderConfigs) {
+                        if (cfg.chainType !== 'solana')
+                            continue;
+                        try {
+                            const solanaCfg = cfg;
+                            const signer = await (0, signer_resolution_1.resolveSolanaSigner)(solanaCfg.keyId, this._logger);
+                            const tokenMint = solanaCfg.tokenMint ?? this._defaultSettlementTokenId;
+                            const provider = (0, solana_payment_channel_provider_1.createSolanaProviderFactory)(this._logger, signer, tokenMint)(solanaCfg);
+                            chainRegistry.register(provider);
+                            this._logger.info({
+                                event: 'chain_provider_registered',
+                                chainType: 'solana',
+                                chainId: provider.chainId,
+                            }, `Solana payment channel provider registered (${provider.chainId})`);
+                        }
+                        catch (error) {
+                            const errorMessage = error instanceof Error ? error.message : String(error);
+                            this._logger.error({
+                                event: 'chain_provider_registration_failed',
+                                chainType: 'solana',
+                                chainId: cfg.chainId,
+                                error: errorMessage,
+                            }, 'Failed to register Solana payment channel provider');
+                        }
+                    }
+                    for (const cfg of chainProviderConfigs) {
+                        if (cfg.chainType !== 'mina')
+                            continue;
+                        try {
+                            const minaCfg = cfg;
+                            const key = (0, signer_resolution_1.resolveMinaSignerKey)(minaCfg.keyId);
+                            const provider = (0, mina_payment_channel_provider_1.createMinaProviderFactory)(this._logger, key)(minaCfg);
+                            chainRegistry.register(provider);
+                            this._logger.info({
+                                event: 'chain_provider_registered',
+                                chainType: 'mina',
+                                chainId: provider.chainId,
+                            }, `Mina payment channel provider registered (${provider.chainId})`);
+                        }
+                        catch (error) {
+                            const errorMessage = error instanceof Error ? error.message : String(error);
+                            this._logger.error({
+                                event: 'chain_provider_registration_failed',
+                                chainType: 'mina',
+                                chainId: cfg.chainId,
+                                error: errorMessage,
+                            }, 'Failed to register Mina payment channel provider');
+                        }
+                    }
+                    const registeredChainIds = chainRegistry.getAllProviders().map((p) => p.chainId);
+                    const nonEvmChainIds = registeredChainIds.filter((id) => !id.startsWith('evm:'));
+                    const primaryChainIdStr = hasEvm
+                        ? evmChainIdStr
+                        : nonEvmChainIds.length === 1
+                            ? nonEvmChainIds[0]
+                            : undefined;
                     const peerIdToChainMap = new Map();
                     for (const peer of this._config.peers) {
                         if (peer.chain) {
                             peerIdToChainMap.set(peer.id, peer.chain);
                         }
                         else if (peerIdToAddressMap.has(peer.id)) {
-                            peerIdToChainMap.set(peer.id, primaryChainIdStr);
+                            if (primaryChainIdStr) {
+                                peerIdToChainMap.set(peer.id, primaryChainIdStr);
+                            }
+                            else {
+                                this._logger.warn({ event: 'peer_chain_ambiguous', peerId: peer.id, chains: nonEvmChainIds }, 'Peer has no explicit chain and multiple non-EVM chains are registered; skipping default chain mapping');
+                            }
                         }
                     }
-                    for (const peerId of peerIdToAddressMap.keys()) {
-                        if (!peerIdToChainMap.has(peerId)) {
-                            peerIdToChainMap.set(peerId, primaryChainIdStr);
+                    if (primaryChainIdStr) {
+                        for (const peerId of peerIdToAddressMap.keys()) {
+                            if (!peerIdToChainMap.has(peerId)) {
+                                peerIdToChainMap.set(peerId, primaryChainIdStr);
+                            }
                         }
                     }
                     const nip59Enabled = this._config.nip59?.enabled ?? false;
@@ -467,7 +578,7 @@ class ConnectorNode {
                         nip59Enabled,
                         logger: this._logger,
                     });
-                    const nodeSecp256k1PrivKey = treasuryPrivateKey
+                    const nodeSecp256k1PrivKey = hasEvm && treasuryPrivateKey
                         ? (0, utils_1.hexToBytes)(treasuryPrivateKey.replace(/^0x/, ''))
                         : undefined;
                     const peerIdToNip59PubKey = new Map();
@@ -498,20 +609,22 @@ class ConnectorNode {
                         threshold: settlementThreshold.toString(),
                         peerCount: peerIds.length,
                     }, 'Event-driven settlement monitoring started');
-                    this._channelManager = new channel_manager_1.ChannelManager({
-                        nodeId: this._config.nodeId,
-                        defaultSettlementTimeout,
-                        initialDepositMultiplier,
-                        idleChannelThreshold: 86400,
-                        minDepositThreshold: 0.5,
-                        idleCheckInterval: 3600,
-                        tokenAddressMap,
-                        peerIdToAddressMap,
-                        registryAddress,
-                        rpcUrl: baseRpcUrl,
-                        privateKey: treasuryPrivateKey,
-                    }, this._paymentChannelSDK, this._settlementExecutor, this._logger);
-                    this._settlementExecutor.setChannelManager(this._channelManager);
+                    if (hasEvm) {
+                        this._channelManager = new channel_manager_1.ChannelManager({
+                            nodeId: this._config.nodeId,
+                            defaultSettlementTimeout,
+                            initialDepositMultiplier,
+                            idleChannelThreshold: 86400,
+                            minDepositThreshold: 0.5,
+                            idleCheckInterval: 3600,
+                            tokenAddressMap,
+                            peerIdToAddressMap,
+                            registryAddress: registryAddress,
+                            rpcUrl: baseRpcUrl,
+                            privateKey: treasuryPrivateKey,
+                        }, this._paymentChannelSDK, this._settlementExecutor, this._logger);
+                        this._settlementExecutor.setChannelManager(this._channelManager);
+                    }
                     this._logger.info({
                         event: 'payment_channel_sdk_initialized',
                         registryAddress,
@@ -539,10 +652,10 @@ class ConnectorNode {
                             throw error;
                         }
                     }
-                    const inboundClaimValidator = new inbound_claim_validator_1.InboundClaimValidator(this._paymentChannelSDK, this._config.nodeId, this._logger, this._channelManager ?? undefined, nip59Wrapper, nodeSecp256k1PrivKey, (peerId) => this._packetHandler.getPeerRelation(peerId));
+                    const inboundClaimValidator = new inbound_claim_validator_1.InboundClaimValidator(this._paymentChannelSDK ?? undefined, this._config.nodeId, this._logger, this._channelManager ?? undefined, nip59Wrapper, nodeSecp256k1PrivKey, (peerId) => this._packetHandler.getPeerRelation(peerId), chainRegistry);
                     this._btpServer.setInboundClaimValidator((protocolData, ilpPacket, peerId) => inboundClaimValidator.validate(protocolData, ilpPacket, peerId));
                     this._logger.info({ event: 'inbound_claim_validator_enabled' }, 'Inbound claim validator wired to BTP server');
-                    if (this._paymentChannelSDK) {
+                    if (chainRegistry.getAllProviders().length > 0) {
                         try {
                             const LibsqlModule = await (0, optional_require_1.requireOptional)('libsql', 'claim receiver persistence');
                             const LibsqlDatabase = LibsqlModule.default;
@@ -767,6 +880,7 @@ class ConnectorNode {
                 this._logger.info({ event: 'payment_channel_sdk_stopped' }, 'Payment channel SDK stopped');
                 this._paymentChannelSDK = null;
             }
+            this._chainRegistry = null;
             if (this._tigerBeetleClient) {
                 await this._tigerBeetleClient.close();
                 this._logger.info({ event: 'tigerbeetle_client_closed' }, 'TigerBeetle client closed');
@@ -982,6 +1096,9 @@ class ConnectorNode {
     get paymentChannelSDK() {
         return this._paymentChannelSDK;
     }
+    get chainRegistry() {
+        return this._chainRegistry;
+    }
     get channelManager() {
         return this._channelManager;
     }