@fibscope/agent 0.1.5 → 0.1.6

package/README.md

@@ -74,7 +74,7 @@ The agent pushes to `POST /agent/v1/report` with:
 
 ```json
 {
-  "agentVersion": "0.1.5",
+  "agentVersion": "0.1.6",
   "chain": "testnet",
   "collectedAt": 1710000000000,
   "publicIp": "54.179.226.154",
@@ -102,7 +102,7 @@ The command result includes provider and receiver balance views before payment,
 
 ## Owner N2N Test Lifecycle
 
-`N2N_PAYMENT` is an owner-authorized test command. It never confirms or charges an API test-wallet deposit. The selected source node checks its own funding wallet and existing routes, connects the receiving peer, opens a direct channel from its own funding when needed, sends over Fiber, and optionally closes only the channel created by that test.
+`N2N_PAYMENT` is an owner-authorized test command. It never confirms or charges an API test-wallet deposit. The selected source node checks its own funding wallet and existing routes, connects the receiving peer, opens a private one-way direct channel when needed, sends over Fiber, and optionally closes only the channel created by that test. FNN v0.8.1 uses dual-funded CKB channel construction, so the receiving node wallet must still provide its configured reserved capacity (commonly about 99 CKB) when a new channel is opened.
 
 When both FNN instances publish the same public IPv4 address, the agent dials the receiving P2P port through loopback so same-VPS nodes can complete the Fiber handshake. Command results include structured source selection, peer connection, channel creation, balance movement, Fiber transfer, optional close, and partial failure steps.
 

package/index.mjs

@@ -33,7 +33,7 @@ import { virtualizePayment } from "./lib/route/route.mjs";
 import { chooseFnnInstance, describeFnnInstance, discoverFnnInstances, rpcResponds } from "./lib/fnn-discovery.mjs";
 import { buildObservedPeerAddress, discoverPublicIpv4, publishablePeerAddresses } from "./lib/public-peer-address.mjs";
 
-const AGENT_VERSION = "0.1.5";
+const AGENT_VERSION = "0.1.6";
 const DEFAULT_CONFIG_PATH = ".fiber/agent.json";
 const DEFAULT_STATUS_PATH = ".fiber/agent-status.json";
 const DEFAULT_PUSH_INTERVAL_MS = 15_000;
@@ -1599,11 +1599,14 @@ async function acceptApiNodePayment(runtime, params, options = {}) {
         peerPubkey: targetPubkey,
         peerAddress,
         fundingAmount: firstTextValue(params.channelFundingAmount, params.totalDebit, params.amountShannons, params.amount),
+        oneWay: ownerFunded ? true : params.oneWay,
         connectFirst: true,
         waitUntilReady: true,
         waitTimeoutMs: positiveNumber(params.channelReadyTimeoutMs, 10 * 60_000),
         pollMs: positiveNumber(params.channelPollMs, 5_000),
-        public: true,
+        // FNN v0.8.1 rejects public one-way channels. N2N tests only need a
+        // direct source-to-receiver path, so keep their temporary channel private.
+        public: ownerFunded ? false : true,
       });
       paymentChannel = channelOpen.channel ?? await findReadyChannelForPeer(config.fiberRpcUrl, targetPubkey, config.timeoutMs);
     }
@@ -1616,14 +1619,28 @@ async function acceptApiNodePayment(runtime, params, options = {}) {
     });
   } catch (error) {
     const partialOpen = error?.commandResult && typeof error.commandResult === "object" ? error.commandResult : undefined;
+    if (!channelOpen && partialOpen) channelOpen = partialOpen;
+    if (!paymentChannel && partialOpen?.channel) paymentChannel = partialOpen.channel;
     if (ownerFunded) {
       let recovery;
       let recoveryError;
       try {
         const openedChannelId = channelIdOf(paymentChannel);
         if (channelOpen && openedChannelId) {
-          recovery = await settleFiberChannel(runtime, { channelId: openedChannelId, force: false, feeRate: "1000" });
-          await waitForChannelClosed(config.fiberRpcUrl, openedChannelId, 10 * 60_000, 5_000);
+          const openedState = channelStateName(paymentChannel);
+          if (isChannelReadyState(openedState)) {
+            recovery = await settleFiberChannel(runtime, { channelId: openedChannelId, force: false, feeRate: "1000" });
+            await waitForChannelClosed(config.fiberRpcUrl, openedChannelId, 10 * 60_000, 5_000);
+          } else {
+            const result = await rpcCall(config.fiberRpcUrl, "abandon_channel", [{ channel_id: openedChannelId }], config.timeoutMs);
+            recovery = {
+              ok: true,
+              action: "ABANDON_CHANNEL",
+              channelId: openedChannelId,
+              previousState: openedState || undefined,
+              result,
+            };
+          }
         }
       } catch (failure) {
         recoveryError = message(failure);
@@ -1791,12 +1808,17 @@ async function acceptApiNodePayment(runtime, params, options = {}) {
 export function nodePaymentLifecycle(input) {
   const channelOpen = input.channelOpen && typeof input.channelOpen === "object" ? input.channelOpen : undefined;
   const connectResult = channelOpen?.connectResult;
-  const channelId = input.paymentChannelId || channelIdOf(input.paymentChannel) || channelIdOf(channelOpen?.channel);
+  const observedChannel = input.paymentChannel ?? channelOpen?.channel;
+  const channelId = input.paymentChannelId || channelIdOf(observedChannel);
+  const observedChannelState = channelStateName(observedChannel);
   const existingRoute = Boolean(input.existingChannel) || input.routeProbe?.status === "success";
   const peerStatus = existingRoute ? "skipped" : connectResult ? "completed" : input.failure ? "failed" : "pending";
-  const channelStatus = existingRoute ? "skipped" : channelId || channelOpen?.openResult ? "completed" : input.failure ? "failed" : "pending";
+  const channelStatus = existingRoute ? "skipped" : isChannelReadyState(observedChannelState) ? "completed" : input.failure ? "failed" : "pending";
   const paymentStatus = input.fiberPayment ? "completed" : input.failure ? "failed" : "pending";
-  const closeStatus = !input.closeChannelAfterPayment
+  const failedChannelAbandoned = input.recovery?.action === "ABANDON_CHANNEL" && input.recovery?.ok !== false;
+  const closeStatus = failedChannelAbandoned
+    ? "completed"
+    : !input.closeChannelAfterPayment
     ? "skipped"
     : input.channelClosed ? "completed"
       : input.channelClose?.status === "failed" || input.failure ? "failed" : "pending";
@@ -1835,9 +1857,13 @@ export function nodePaymentLifecycle(input) {
     steps: [
       { key: "source_selected", label: "Source node selected", status: "completed", detail: input.source?.displayName || shortText(input.source?.pubkey, 10, 8) },
       { key: "peer_connect", label: "Receiving peer connected", status: peerStatus, detail: existingRoute ? "Existing route does not require a new direct peer connection." : input.failure && !connectResult ? input.failure : input.peerAddress },
-      { key: "channel_open", label: "Channel ready", status: channelStatus, detail: existingRoute ? "Existing Fiber liquidity selected." : channelId ? `Channel ${shortText(channelId, 10, 8)}` : input.failure },
+      { key: "channel_open", label: "Channel ready", status: channelStatus, detail: existingRoute ? "Existing Fiber liquidity selected." : channelStatus === "completed" && channelId ? `Channel ${shortText(channelId, 10, 8)}` : input.failure },
       { key: "fiber_transfer", label: "Funds moved over Fiber", status: paymentStatus, detail: input.fiberPayment ? `Payment ${shortText(input.fiberPayment.paymentHash ?? input.fiberPayment.payment_hash ?? input.fiberPayment.targetPubkey, 10, 8)}` : input.failure },
-      ...(input.closeChannelAfterPayment ? [{ key: "channel_close", label: "Provisioned channel closed", status: closeStatus, detail: input.channelClose?.error ?? input.channelClosed?.state } ] : []),
+      ...(failedChannelAbandoned
+        ? [{ key: "channel_cleanup", label: "Failed channel abandoned", status: closeStatus, detail: `Released pending channel ${shortText(channelId, 10, 8)}` }]
+        : input.closeChannelAfterPayment
+          ? [{ key: "channel_close", label: "Provisioned channel closed", status: closeStatus, detail: input.channelClose?.error ?? input.channelClosed?.state ?? (input.failure ? "Not attempted because the channel never became ready." : undefined) }]
+          : []),
     ],
   });
 }
@@ -2201,6 +2227,9 @@ async function openFiberChannel(config, params) {
     public: boolValue(params.public ?? params.publicChannel, true),
   };
   if (params.oneWay !== undefined || params.one_way !== undefined) openRequest.one_way = boolValue(params.oneWay ?? params.one_way, false);
+  if (openRequest.one_way && openRequest.public) {
+    throw new Error("FNN does not allow a channel to be both public and one-way.");
+  }
   if (params.fundingUdtTypeScript ?? params.funding_udt_type_script) openRequest.funding_udt_type_script = params.fundingUdtTypeScript ?? params.funding_udt_type_script;
   if (params.commitmentFeeRate ?? params.commitment_fee_rate) openRequest.commitment_fee_rate = quantity(params.commitmentFeeRate ?? params.commitment_fee_rate);
   if (params.fundingFeeRate ?? params.funding_fee_rate) openRequest.funding_fee_rate = quantity(params.fundingFeeRate ?? params.funding_fee_rate);
@@ -2234,6 +2263,7 @@ async function openFiberChannel(config, params) {
       peerAddress: peer.address,
       fundingAmount: openRequest.funding_amount,
       public: openRequest.public,
+      oneWay: openRequest.one_way === true,
       fundingCheck,
       connectResult,
       openResult,
@@ -2244,6 +2274,7 @@ async function openFiberChannel(config, params) {
     }
     return result;
   } catch (error) {
+    const observed = error?.commandResult && typeof error.commandResult === "object" ? error.commandResult : undefined;
     throw commandResultError(message(error), {
       ok: false,
       action: "OPEN_CHANNEL",
@@ -2252,10 +2283,12 @@ async function openFiberChannel(config, params) {
       peerAddress: peer.address,
       fundingAmount: openRequest.funding_amount,
       public: openRequest.public,
+      oneWay: openRequest.one_way === true,
       fundingCheck,
       connectResult,
       openResult,
       channelWatch,
+      channel: observed?.channel,
       failure: message(error),
     });
   }
@@ -3159,7 +3192,25 @@ async function waitForChannel(rpcUrl, pubkey, timeoutMs, pollMs) {
     if (failed) throw new Error(describeChannelTerminalFailure(failed));
     await sleep(pollMs);
   }
-  throw new Error(`Timed out waiting for channel readiness. Last channel: ${JSON.stringify(lastChannel ?? null)}`);
+  const fundingHint = isAwaitingRemoteFundingCollaboration(lastChannel)
+    ? " The receiving FNN did not complete funding collaboration. A CKB channel acceptor must provide its configured reserved capacity (commonly about 99 CKB), even for a private one-way channel. Fund the receiving node wallet and inspect its FNN logs."
+    : "";
+  throw commandResultError(`Timed out waiting for channel readiness.${fundingHint} Last channel: ${JSON.stringify(lastChannel ?? null)}`, {
+    channel: lastChannel,
+    channelId: channelIdOf(lastChannel) || undefined,
+  });
+}
+
+function isAwaitingRemoteFundingCollaboration(channel) {
+  const state = channel?.state && typeof channel.state === "object" ? channel.state : {};
+  const name = textValue(state.state_name ?? state.stateName ?? channel?.state_name ?? channel?.stateName).toLowerCase();
+  const flags = textValue(state.state_flags ?? state.stateFlags ?? channel?.state_flags ?? channel?.stateFlags).toLowerCase();
+  return name === "collaboratingfundingtx" && flags.includes("awaiting_remote_tx_collaboration_msg");
+}
+
+function isChannelReadyState(state) {
+  const normalized = textValue(state).toLowerCase();
+  return normalized === "channelready" || normalized === "open";
 }
 
 async function watchForImmediateChannelFailure(rpcUrl, pubkey, timeoutMs, pollMs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibscope/agent",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "description": "Fibscope Agent for Fiber node owners.",
   "bin": {