@continuumdao/continuum-node-sdk 1.3.41 → 1.3.43

package/dist/core/mpc/mpa-payment-tokens.d.ts

@@ -0,0 +1,38 @@
+import { type Address } from 'viem';
+export type MpaPaymentTokenKind = 'fee' | 'ctm';
+export type MpaPaymentTokenMeta = {
+    feeTokenAddress: Address;
+    feeTokenSymbol: string;
+    feeTokenDecimals: number;
+    ctmTokenAddress: Address;
+    ctmTokenSymbol: string;
+    ctmTokenDecimals: number;
+    ctmPaymentsPaused: boolean;
+};
+/** Live FEE_TOKEN / CTM metadata. Cached briefly so UIs and MCP tools reuse the on-chain symbols. */
+export declare function fetchMpaPaymentTokenMeta(): Promise<MpaPaymentTokenMeta>;
+/** Display the stored on-chain fee-token symbol; never assume USDC. */
+export declare function storedFeeTokenSymbol(symbol?: string | null): string;
+/** Matches MultiSignAgentWallet `CTM_FEE_RATE_SCALE`. */
+export declare const CTM_FEE_RATE_SCALE = 1000n;
+export declare function ctmAmountForFee(feeAmount: bigint, ctmPerFeeToken: bigint): bigint;
+export declare function feeAmountForCtm(ctmCredit: bigint, ctmPerFeeToken: bigint): bigint;
+export type VpnMonthShortfall = {
+    requiredMinimumTopUpWei: bigint;
+    requiredMinimumTopUpCtmWei: bigint;
+};
+/** Fee-token and CTM shortfalls after existing fee+CTM coverage (same debit order as `_debitNodeFee`). */
+export declare function vpnMonthShortfalls(input: {
+    feeCreditWei: bigint;
+    ctmCreditWei: bigint;
+    monthlyFeeWei: bigint;
+    ctmPerFeeToken: bigint;
+    ctmPaymentsPaused: boolean;
+}): VpnMonthShortfall;
+export type VpnMonthCoverage = VpnMonthShortfall & {
+    meta: MpaPaymentTokenMeta;
+    ctmCreditWei: bigint;
+    ctmPerFeeToken: bigint;
+};
+export declare function fetchVpnMonthCoverage(nodeKey: string, feeCreditWei: bigint, monthlyFeeWei: bigint): Promise<VpnMonthCoverage>;
+//# sourceMappingURL=mpa-payment-tokens.d.ts.map

package/dist/core/mpc/mpa-payment-tokens.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mpa-payment-tokens.d.ts","sourceRoot":"","sources":["../../../src/core/mpc/mpa-payment-tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,OAAO,EAAoB,MAAM,MAAM,CAAC;AAG5F,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,KAAK,CAAC;AAEhD,MAAM,MAAM,mBAAmB,GAAG;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAoDF,qGAAqG;AACrG,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAyB7E;AAED,uEAAuE;AACvE,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGnE;AAED,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,QAAQ,CAAC;AAExC,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAGjF;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAGjF;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,0BAA0B,EAAE,MAAM,CAAC;CACnC,CAAC;AAEF,0GAA0G;AAC1G,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;CAC3B,GAAG,iBAAiB,CAkBpB;AAED,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAClD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAsB,qBAAqB,CAC1C,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAyB3B"}

package/dist/core/mpc/mpa-payment-tokens.js

@@ -0,0 +1,135 @@
+import { createPublicClient, defineChain, http } from 'viem';
+import { MPA_WALLET_CONTRACT_CONFIG, MPA_WALLET_READ_ABI } from '../../config/mpa-wallet.js';
+const ERC20_SYMBOL_DECIMALS_ABI = [
+    {
+        inputs: [],
+        name: 'symbol',
+        outputs: [{ name: '', type: 'string', internalType: 'string' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+    {
+        inputs: [],
+        name: 'decimals',
+        outputs: [{ name: '', type: 'uint8', internalType: 'uint8' }],
+        stateMutability: 'view',
+        type: 'function',
+    },
+];
+let cachedMeta = null;
+let cachedMetaAt = 0;
+const META_TTL_MS = 5 * 60 * 1000;
+function getMpaPublicClient() {
+    const chain = defineChain({
+        id: MPA_WALLET_CONTRACT_CONFIG.chainId,
+        name: MPA_WALLET_CONTRACT_CONFIG.chainName,
+        nativeCurrency: { decimals: 18, name: 'Ether', symbol: 'ETH' },
+        rpcUrls: { default: { http: [MPA_WALLET_CONTRACT_CONFIG.rpcUrl] } },
+    });
+    return createPublicClient({
+        chain,
+        transport: http(MPA_WALLET_CONTRACT_CONFIG.rpcUrl),
+    });
+}
+async function readErc20Meta(client, token, fallbackSymbol) {
+    try {
+        const [symbol, decimals] = await Promise.all([
+            client.readContract({ address: token, abi: ERC20_SYMBOL_DECIMALS_ABI, functionName: 'symbol' }),
+            client.readContract({ address: token, abi: ERC20_SYMBOL_DECIMALS_ABI, functionName: 'decimals' }),
+        ]);
+        return { symbol: symbol?.trim() || fallbackSymbol, decimals: Number(decimals ?? 18) };
+    }
+    catch {
+        return { symbol: fallbackSymbol, decimals: 18 };
+    }
+}
+/** Live FEE_TOKEN / CTM metadata. Cached briefly so UIs and MCP tools reuse the on-chain symbols. */
+export async function fetchMpaPaymentTokenMeta() {
+    const now = Date.now();
+    if (cachedMeta && now - cachedMetaAt < META_TTL_MS)
+        return cachedMeta;
+    const client = getMpaPublicClient();
+    const mpa = MPA_WALLET_CONTRACT_CONFIG.contractAddress;
+    const [feeTokenAddress, ctmTokenAddress, ctmPaymentsPaused] = await Promise.all([
+        client.readContract({ address: mpa, abi: MPA_WALLET_READ_ABI, functionName: 'FEE_TOKEN' }),
+        client.readContract({ address: mpa, abi: MPA_WALLET_READ_ABI, functionName: 'ctm' }),
+        client.readContract({ address: mpa, abi: MPA_WALLET_READ_ABI, functionName: 'ctmPaymentsPaused' }),
+    ]);
+    const [fee, ctm] = await Promise.all([
+        readErc20Meta(client, feeTokenAddress, 'fee token'),
+        readErc20Meta(client, ctmTokenAddress, 'CTM'),
+    ]);
+    cachedMeta = {
+        feeTokenAddress,
+        feeTokenSymbol: fee.symbol,
+        feeTokenDecimals: fee.decimals,
+        ctmTokenAddress,
+        ctmTokenSymbol: ctm.symbol,
+        ctmTokenDecimals: ctm.decimals,
+        ctmPaymentsPaused: Boolean(ctmPaymentsPaused),
+    };
+    cachedMetaAt = now;
+    return cachedMeta;
+}
+/** Display the stored on-chain fee-token symbol; never assume USDC. */
+export function storedFeeTokenSymbol(symbol) {
+    const trimmed = symbol?.trim();
+    return trimmed ? trimmed : 'fee token';
+}
+/** Matches MultiSignAgentWallet `CTM_FEE_RATE_SCALE`. */
+export const CTM_FEE_RATE_SCALE = 1000n;
+export function ctmAmountForFee(feeAmount, ctmPerFeeToken) {
+    if (feeAmount === 0n || ctmPerFeeToken === 0n)
+        return 0n;
+    return (feeAmount * ctmPerFeeToken) / CTM_FEE_RATE_SCALE;
+}
+export function feeAmountForCtm(ctmCredit, ctmPerFeeToken) {
+    if (ctmCredit === 0n || ctmPerFeeToken === 0n)
+        return 0n;
+    return (ctmCredit * CTM_FEE_RATE_SCALE) / ctmPerFeeToken;
+}
+/** Fee-token and CTM shortfalls after existing fee+CTM coverage (same debit order as `_debitNodeFee`). */
+export function vpnMonthShortfalls(input) {
+    if (input.monthlyFeeWei === 0n) {
+        return { requiredMinimumTopUpWei: 0n, requiredMinimumTopUpCtmWei: 0n };
+    }
+    const ctmCovered = !input.ctmPaymentsPaused && input.ctmPerFeeToken !== 0n
+        ? feeAmountForCtm(input.ctmCreditWei, input.ctmPerFeeToken)
+        : 0n;
+    const covered = input.feeCreditWei + ctmCovered;
+    if (covered >= input.monthlyFeeWei) {
+        return { requiredMinimumTopUpWei: 0n, requiredMinimumTopUpCtmWei: 0n };
+    }
+    const feeShort = input.monthlyFeeWei - covered;
+    const ctmShort = input.ctmPaymentsPaused || input.ctmPerFeeToken === 0n
+        ? 0n
+        : ctmAmountForFee(feeShort, input.ctmPerFeeToken);
+    return { requiredMinimumTopUpWei: feeShort, requiredMinimumTopUpCtmWei: ctmShort };
+}
+export async function fetchVpnMonthCoverage(nodeKey, feeCreditWei, monthlyFeeWei) {
+    const meta = await fetchMpaPaymentTokenMeta();
+    const client = getMpaPublicClient();
+    const mpa = MPA_WALLET_CONTRACT_CONFIG.contractAddress;
+    const [ctmCreditWei, ctmPerFeeToken] = await Promise.all([
+        client.readContract({
+            address: mpa,
+            abi: MPA_WALLET_READ_ABI,
+            functionName: 'getNodeCtmCreditBalance',
+            args: [nodeKey],
+        }),
+        client.readContract({
+            address: mpa,
+            abi: MPA_WALLET_READ_ABI,
+            functionName: 'ctmPerFeeToken',
+        }),
+    ]);
+    const shorts = vpnMonthShortfalls({
+        feeCreditWei,
+        ctmCreditWei,
+        monthlyFeeWei,
+        ctmPerFeeToken,
+        ctmPaymentsPaused: meta.ctmPaymentsPaused,
+    });
+    return { ...shorts, meta, ctmCreditWei, ctmPerFeeToken };
+}
+//# sourceMappingURL=mpa-payment-tokens.js.map

package/dist/core/mpc/mpa-payment-tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mpa-payment-tokens.js","sourceRoot":"","sources":["../../../src/core/mpc/mpa-payment-tokens.ts"],"names":[],"mappings":"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"}

package/dist/core/mpc/mpa-top-up.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mpa-top-up.d.ts","sourceRoot":"","sources":["../../../src/core/mpc/mpa-top-up.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAQ1D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAM5C,OAAO,EAA6B,KAAK,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAiCzF,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CA4BzC;AAcD,wBAAsB,8BAA8B,CACnD,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC,CAoIzC"}
+{"version":3,"file":"mpa-top-up.d.ts","sourceRoot":"","sources":["../../../src/core/mpc/mpa-top-up.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAM5C,OAAO,EAA6B,KAAK,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAGzF,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAyBzC;AAED,wBAAsB,8BAA8B,CACnD,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC,CAmDzC"}

package/dist/core/mpc/mpa-top-up.js

@@ -1,40 +1,11 @@
-import { createPublicClient, defineChain, formatUnits, getAddress, http, } from 'viem';
-import { ERC20_ALLOWANCE_ABI, KEY_GEN_ADDRESS_KIND_ETHEREUM, MPA_DEPOSIT_ONLY_NONCE, MPA_WALLET_CONTRACT_CONFIG, MPA_WALLET_READ_ABI, } from '../../config/mpa-wallet.js';
+import { MPA_WALLET_CONTRACT_CONFIG } from '../../config/mpa-wallet.js';
 import { MpaTopUpInputSchema, MpaWalletStatusInputSchema } from './schemas.js';
-import { fetchGlobalNonceByKeyGenId, fetchKeyGenResult } from '../keygen.js';
+import { fetchKeyGenResult } from '../keygen.js';
 import { buildMultiSignProposal } from '../../evm/proposal-builder.js';
 import { signAndSubmitMultiSignRequest } from './sign-request-body.js';
 import { assertExecutorNativeSufficientForProposal } from './gas-preflight.js';
 import { fetchMergedMpaWalletStatus } from './mpa-fee-status.js';
-import { shouldSyncKeyGenMonthAfterDeposit } from './mpa-billing-helpers.js';
-const ERC20_SYMBOL_DECIMALS_ABI = [
-    {
-        inputs: [],
-        name: 'symbol',
-        outputs: [{ name: '', type: 'string', internalType: 'string' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-    {
-        inputs: [],
-        name: 'decimals',
-        outputs: [{ name: '', type: 'uint8', internalType: 'uint8' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-];
-function getMpaPublicClient() {
-    const chain = defineChain({
-        id: MPA_WALLET_CONTRACT_CONFIG.chainId,
-        name: 'Linea Mainnet',
-        nativeCurrency: { decimals: 18, name: 'Ether', symbol: 'ETH' },
-        rpcUrls: { default: { http: [MPA_WALLET_CONTRACT_CONFIG.rpcUrl] } },
-    });
-    return createPublicClient({
-        chain,
-        transport: http(MPA_WALLET_CONTRACT_CONFIG.rpcUrl),
-    });
-}
+import { prepareMpaKeyGenDepositActions } from './mpa-billing-actions.js';
 export async function getMpaWalletStatus(config, input) {
     const parsed = MpaWalletStatusInputSchema.safeParse(input);
     if (!parsed.success) {
@@ -46,10 +17,7 @@ export async function getMpaWalletStatus(config, input) {
     const kg = await fetchKeyGenResult(config, parsed.data.keyGenId);
     if (!kg.ok)
         return kg;
-    const eth = kg.data.ethereumaddress?.trim();
-    if (!eth) {
-        return { ok: false, reason: 'KeyGen has no ethereum address.' };
-    }
+    const eth = kg.data.ethereumaddress?.trim() ?? '';
     try {
         const data = await fetchMergedMpaWalletStatus(config, parsed.data.keyGenId, eth);
         return { ok: true, data };
@@ -64,14 +32,6 @@ export async function getMpaWalletStatus(config, input) {
         };
     }
 }
-async function resolveGlobalNonceForSync(config, keyGenId, billingAddress) {
-    const fromNode = await fetchGlobalNonceByKeyGenId(config, keyGenId);
-    if (fromNode.ok)
-        return fromNode;
-    const client = getMpaPublicClient();
-    const nonce = await client.getTransactionCount({ address: billingAddress, blockTag: 'pending' });
-    return { ok: true, data: nonce };
-}
 export async function createMpaTopUpMultiSignRequest(config, input) {
     const parsed = MpaTopUpInputSchema.safeParse(input);
     if (!parsed.success) {
@@ -84,90 +44,21 @@ export async function createMpaTopUpMultiSignRequest(config, input) {
     if (!eth) {
         return { ok: false, reason: 'KeyGen has no ethereum address.' };
     }
-    const client = getMpaPublicClient();
-    const billingAddress = getAddress(eth.startsWith('0x') ? eth : `0x${eth}`);
-    const mpa = MPA_WALLET_CONTRACT_CONFIG.contractAddress;
-    const keyGenId = parsed.data.keyGenId;
-    const amountWei = BigInt(parsed.data.amountWei);
-    const walletStatus = await fetchMergedMpaWalletStatus(config, keyGenId, eth);
-    const sub = await client.readContract({
-        address: mpa,
-        abi: MPA_WALLET_READ_ABI,
-        functionName: 'getSubscriptionStatus',
-        args: [keyGenId, KEY_GEN_ADDRESS_KIND_ETHEREUM],
-    });
-    const monthlyFee = sub[4];
-    const requiredTopUp = await client.readContract({
-        address: mpa,
-        abi: MPA_WALLET_READ_ABI,
-        functionName: 'getRequiredMinimumTopUp',
-        args: [keyGenId, KEY_GEN_ADDRESS_KIND_ETHEREUM],
-    });
-    const feeToken = await client.readContract({
-        address: mpa,
-        abi: MPA_WALLET_READ_ABI,
-        functionName: 'FEE_TOKEN',
+    const prepared = await prepareMpaKeyGenDepositActions(config, {
+        keyGenId: parsed.data.keyGenId,
+        amountWei: parsed.data.amountWei,
+        activateBillingMonthAfterDeposit: parsed.data.activateBillingMonthAfterDeposit,
+        paymentToken: parsed.data.paymentToken,
     });
-    const decimals = await client.readContract({
-        address: feeToken,
-        abi: ERC20_SYMBOL_DECIMALS_ABI,
-        functionName: 'decimals',
-    });
-    const minWei = requiredTopUp > 0n ? requiredTopUp : monthlyFee;
-    if (amountWei < minWei) {
-        return {
-            ok: false,
-            reason: `Amount below required minimum top-up (${formatUnits(minWei, Number(decimals ?? 18))}).`,
-        };
-    }
-    const globalNonceAtActivation = MPA_DEPOSIT_ONLY_NONCE;
-    const allowance = await client.readContract({
-        address: feeToken,
-        abi: ERC20_ALLOWANCE_ABI,
-        functionName: 'allowance',
-        args: [billingAddress, mpa],
-    });
-    const actions = [];
-    if (allowance < amountWei) {
-        actions.push({
-            signature: 'approve(address,uint256)',
-            contractAddress: feeToken,
-            args: [
-                { name: 'spender', type: 'address', value: mpa },
-                { name: 'amount', type: 'uint256', value: amountWei.toString() },
-            ],
-        });
-    }
-    actions.push({
-        signature: 'deposit(string,string,uint256,uint256)',
-        contractAddress: mpa,
-        args: [
-            { name: 'keyGenId', type: 'string', value: keyGenId },
-            { name: 'addressKind', type: 'string', value: KEY_GEN_ADDRESS_KIND_ETHEREUM },
-            { name: 'amount', type: 'uint256', value: amountWei.toString() },
-            { name: 'globalNonceAtActivation', type: 'uint256', value: globalNonceAtActivation },
-        ],
-    });
-    const syncAfterDeposit = parsed.data.activateBillingMonthAfterDeposit === true &&
-        shouldSyncKeyGenMonthAfterDeposit(walletStatus, amountWei);
-    if (syncAfterDeposit) {
-        const globalNonce = await resolveGlobalNonceForSync(config, keyGenId, billingAddress);
-        if (!globalNonce.ok)
-            return globalNonce;
-        actions.push({
-            signature: 'syncBilling(string,string,uint256)',
-            contractAddress: mpa,
-            args: [
-                { name: 'keyGenId', type: 'string', value: keyGenId },
-                { name: 'addressKind', type: 'string', value: KEY_GEN_ADDRESS_KIND_ETHEREUM },
-                { name: 'globalNonceAtActivation', type: 'uint256', value: String(globalNonce.data) },
-            ],
-        });
-    }
+    if (!prepared.ok)
+        return prepared;
+    const syncAfterDeposit = prepared.data.actions.some((a) => a.signature === 'syncBilling(string,string,string,uint256)');
+    const tokenLabel = parsed.data.paymentToken === 'ctm' ? 'CTM' : 'fee token';
     const purpose = parsed.data.purpose ??
         (syncAfterDeposit
-            ? 'Top up MPA signing credits and activate billing month'
-            : 'Top up MPA signing credits');
+            ? `Top up MPA signing credits in ${tokenLabel} and activate billing month`
+            : `Top up MPA signing credits in ${tokenLabel}`);
+    const actions = prepared.data.actions;
     const built = await buildMultiSignProposal(config, {
         keyGenResult: kg.data,
         chainId: MPA_WALLET_CONTRACT_CONFIG.chainId,

package/dist/core/mpc/mpa-top-up.js.map

@@ -1 +1 @@
-{"version":3,"file":"mpa-top-up.js","sourceRoot":"","sources":["../../../src/core/mpc/mpa-top-up.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mpa-top-up.js","sourceRoot":"","sources":["../../../src/core/mpc/mpa-top-up.ts"],"names":[],"mappings":"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"}

package/dist/core/mpc/register-keygen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-keygen.d.ts","sourceRoot":"","sources":["../../../src/core/mpc/register-keygen.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAS5C,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC,CAoCzC"}
+{"version":3,"file":"register-keygen.d.ts","sourceRoot":"","sources":["../../../src/core/mpc/register-keygen.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAyB5C,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,OAAO,GACZ,OAAO,CAAC,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC,CAAC,CA+IzC"}

package/dist/core/mpc/register-keygen.js

@@ -1,10 +1,26 @@
-import { KEY_GEN_ADDRESS_KIND_ETHEREUM, MPA_WALLET_CONTRACT_CONFIG, } from '../../config/mpa-wallet.js';
+import { createPublicClient, defineChain, getAddress, http, zeroAddress } from 'viem';
+import { MPA_WALLET_CONTRACT_CONFIG, MPA_WALLET_READ_ABI } from '../../config/mpa-wallet.js';
 import { RegisterKeyGenInputSchema } from './schemas.js';
-import { fetchKeyGenResult } from '../keygen.js';
+import { fetchKeyGenResult, fetchGlobalNonceByKeyGenId, getKeyGenParentGroupId } from '../keygen.js';
 import { buildMultiSignProposal } from '../../evm/proposal-builder.js';
 import { signAndSubmitMultiSignRequest } from './sign-request-body.js';
 import { assertExecutorNativeSufficientForProposal } from './gas-preflight.js';
+import { feeAddressKindForKeyGen } from './address-kind.js';
+import { nodeId } from '../general.js';
+import { appendFeeTokenApproveIfNeeded, buildRegisterKeyGenActions } from './mpa-billing-actions.js';
 const REGISTER_PURPOSE = 'Register KeyGen with MultiSignAgentWallet on Linea';
+function getMpaPublicClient() {
+    const chain = defineChain({
+        id: MPA_WALLET_CONTRACT_CONFIG.chainId,
+        name: MPA_WALLET_CONTRACT_CONFIG.chainName,
+        nativeCurrency: { decimals: 18, name: 'Ether', symbol: 'ETH' },
+        rpcUrls: { default: { http: [MPA_WALLET_CONTRACT_CONFIG.rpcUrl] } },
+    });
+    return createPublicClient({
+        chain,
+        transport: http(MPA_WALLET_CONTRACT_CONFIG.rpcUrl),
+    });
+}
 export async function registerKeyGenOnLinea(config, input) {
     const parsed = RegisterKeyGenInputSchema.safeParse(input);
     if (!parsed.success) {
@@ -13,27 +29,130 @@ export async function registerKeyGenOnLinea(config, input) {
     const kg = await fetchKeyGenResult(config, parsed.data.keyGenId);
     if (!kg.ok)
         return kg;
+    const self = await nodeId(config);
+    if (!self.ok)
+        return self;
+    const nodeKey = self.data.nodeId;
+    const addressKind = feeAddressKindForKeyGen(kg.data);
+    const client = getMpaPublicClient();
+    const mpa = MPA_WALLET_CONTRACT_CONFIG.contractAddress;
+    const authority = await client.readContract({
+        address: mpa,
+        abi: MPA_WALLET_READ_ABI,
+        functionName: 'getNodeWithdrawAuthority',
+        args: [nodeKey],
+    });
+    if (authority === zeroAddress) {
+        return {
+            ok: false,
+            reason: 'Node withdraw authority is not claimed. Call claim_node_withdraw_authority first.',
+        };
+    }
+    const executorId = parsed.data.executorKeyGenId?.trim() || parsed.data.keyGenId;
+    const executorKg = executorId === parsed.data.keyGenId ? kg : await fetchKeyGenResult(config, executorId);
+    if (!executorKg.ok)
+        return executorKg;
+    const eth = executorKg.data.ethereumaddress?.trim();
+    if (!eth) {
+        return {
+            ok: false,
+            reason: 'Register must be composed from the claimed authority secp256k1 KeyGen (ethereum address).',
+        };
+    }
+    const executor = getAddress(eth.startsWith('0x') ? eth : `0x${eth}`);
+    if (executor.toLowerCase() !== authority.toLowerCase()) {
+        return {
+            ok: false,
+            reason: `Compose from the claimed authority KeyGen (${authority}), not ${executor}.`,
+        };
+    }
+    const nonceRes = await fetchGlobalNonceByKeyGenId(config, parsed.data.keyGenId);
+    const globalNonce = nonceRes.ok ? nonceRes.data : 0;
+    let groupId = parsed.data.groupId?.trim() ?? '';
+    if (!groupId) {
+        const parent = await getKeyGenParentGroupId(config, { id: parsed.data.keyGenId });
+        if (parent.ok)
+            groupId = parent.data.groupId;
+    }
+    const nodeIdBytes = await client.readContract({
+        address: mpa,
+        abi: MPA_WALLET_READ_ABI,
+        functionName: 'nodeIdOfNodeKey',
+        args: [nodeKey],
+    });
+    const [trial, rates] = await Promise.all([
+        client.readContract({
+            address: mpa,
+            abi: MPA_WALLET_READ_ABI,
+            functionName: 'qualifiesForNodeTrial',
+            args: [nodeIdBytes],
+        }),
+        client.readContract({
+            address: mpa,
+            abi: MPA_WALLET_READ_ABI,
+            functionName: 'getActiveRates',
+        }),
+    ]);
+    let waiver = false;
+    if (groupId) {
+        try {
+            waiver = Boolean(await client.readContract({
+                address: mpa,
+                abi: MPA_WALLET_READ_ABI,
+                functionName: 'qualifiesForVeCtmWaiver',
+                args: [parsed.data.keyGenId, addressKind, nodeKey],
+            }));
+        }
+        catch {
+            waiver = false;
+        }
+        if (!waiver) {
+            try {
+                const nodeProperties = await client.readContract({
+                    address: mpa,
+                    abi: MPA_WALLET_READ_ABI,
+                    functionName: 'nodeProperties',
+                });
+                const attached = await client.readContract({
+                    address: nodeProperties,
+                    abi: [
+                        {
+                            inputs: [{ name: 'keyGen', type: 'address' }],
+                            name: 'attachedTokenId',
+                            outputs: [{ name: '', type: 'uint256' }],
+                            stateMutability: 'view',
+                            type: 'function',
+                        },
+                    ],
+                    functionName: 'attachedTokenId',
+                    args: [authority],
+                });
+                waiver = attached > 0n;
+            }
+            catch {
+                /* pre-register view is false until the account exists */
+            }
+        }
+    }
+    const waived = Boolean(trial || waiver);
+    const monthlyFee = rates[0];
+    const actions = [];
+    if (!waived && monthlyFee > 0n) {
+        await appendFeeTokenApproveIfNeeded(client, actions, executor, monthlyFee);
+    }
+    actions.push(...buildRegisterKeyGenActions(parsed.data.keyGenId, addressKind, nodeKey, globalNonce, groupId));
     const built = await buildMultiSignProposal(config, {
-        keyGenResult: kg.data,
+        keyGenResult: executorKg.data,
         chainId: MPA_WALLET_CONTRACT_CONFIG.chainId,
         purpose: parsed.data.purpose ?? REGISTER_PURPOSE,
         useCustomGas: parsed.data.useCustomGas,
         startingNonce: parsed.data.startingNonce,
-        actions: [
-            {
-                signature: 'register(string,string)',
-                contractAddress: MPA_WALLET_CONTRACT_CONFIG.contractAddress,
-                args: [
-                    { name: 'keyGenId', type: 'string', value: parsed.data.keyGenId },
-                    { name: 'addressKind', type: 'string', value: KEY_GEN_ADDRESS_KIND_ETHEREUM },
-                ],
-            },
-        ],
+        actions,
     });
     if (!built.ok)
         return built;
     const preflight = await assertExecutorNativeSufficientForProposal(config, {
-        keyGenResult: kg.data,
+        keyGenResult: executorKg.data,
         chainId: MPA_WALLET_CONTRACT_CONFIG.chainId,
         proposal: built.data,
     });

package/dist/core/mpc/register-keygen.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-keygen.js","sourceRoot":"","sources":["../../../src/core/mpc/register-keygen.ts"],"names":[],"mappings":"AACA,OAAO,EACN,6BAA6B,EAC7B,0BAA0B,GAC1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,yBAAyB,EAAC,MAAM,cAAc,CAAC;AACvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,6BAA6B,EAAC,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAC,yCAAyC,EAAC,MAAM,oBAAoB,CAAC;AAE7E,MAAM,gBAAgB,GAAG,oDAAoD,CAAC;AAE9E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAC1C,MAAqB,EACrB,KAAc;IAEd,MAAM,MAAM,GAAG,yBAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC1D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,EAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gCAAgC,EAAC,CAAC;IAC9D,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,IAAI,CAAC,EAAE,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC;IAEtB,MAAM,KAAK,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE;QAClD,YAAY,EAAE,EAAE,CAAC,IAAI;QACrB,OAAO,EAAE,0BAA0B,CAAC,OAAO;QAC3C,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,gBAAgB;QAChD,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY;QACtC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa;QACxC,OAAO,EAAE;YACR;gBACC,SAAS,EAAE,yBAAyB;gBACpC,eAAe,EAAE,0BAA0B,CAAC,eAAe;gBAC3D,IAAI,EAAE;oBACL,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC;oBAC/D,EAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,6BAA6B,EAAC;iBAC3E;aACD;SACD;KACD,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IAE5B,MAAM,SAAS,GAAG,MAAM,yCAAyC,CAAC,MAAM,EAAE;QACzE,YAAY,EAAE,EAAE,CAAC,IAAI;QACrB,OAAO,EAAE,0BAA0B,CAAC,OAAO;QAC3C,QAAQ,EAAE,KAAK,CAAC,IAAI;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAEpC,OAAO,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"register-keygen.js","sourceRoot":"","sources":["../../../src/core/mpc/register-keygen.ts"],"names":[],"mappings":"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"}