From 6d2d41bc195c6e75818a3efc12c8bbab2b1b2010 Mon Sep 17 00:00:00 2001 From: 0xPatrick Date: Mon, 25 Mar 2024 12:46:58 -0400 Subject: [PATCH] debug: add logs --- packages/network/src/network.js | 34 ++++++++++++++++--- packages/network/src/router.js | 9 +++++ .../vats/src/proposals/network-proposal.js | 12 ++++--- 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/packages/network/src/network.js b/packages/network/src/network.js index 58e7be86ff54..490a718524ec 100644 --- a/packages/network/src/network.js +++ b/packages/network/src/network.js @@ -475,6 +475,7 @@ const prepareInboundAttempt = (zone, makeConnection, { watch }) => { * @param {import('@agoric/network/src/types.js').ConnectionHandler} opts.handler */ async accept({ localAddress, remoteAddress, handler: rchandler }) { + console.log('@@@accept', localAddress, remoteAddress); const { consummated, localAddr, remoteAddr } = this.state; const { listening, listenPrefix, currentConnections } = this.state; if (consummated) { @@ -492,6 +493,8 @@ const prepareInboundAttempt = (zone, makeConnection, { watch }) => { const [port, listener] = listening.get(listenPrefix); const current = currentConnections.get(port); + console.log('@@@accept::port', port); + console.log('@@@accept::port', listenPrefix); current.delete(this.facets.inboundAttempt); @@ -511,7 +514,11 @@ const prepareInboundAttempt = (zone, makeConnection, { watch }) => { onFulfilled(lchandler, watchContext) { const { localAddress, rchandler, remoteAddress, current } = watchContext; - + console.log( + '@@@inboundAttemptAcceptWatcher::onFulfilled', + localAddress, + remoteAddress, + ); return crossoverConnection( zone, lchandler, @@ -615,11 +622,13 @@ const preparePort = (zone, powers) => { }, /** @param {ListenHandler} listenHandler */ async addListener(listenHandler) { + console.log('@@@port:addListener fired'); const { revoked, listening, localAddr, protocolHandler } = this.state; !revoked || Fail`Port ${this.state.localAddr} is revoked`; listenHandler || Fail`listenHandler is not defined`; + console.log('@@@port:addListener', localAddr); if (listening.has(localAddr)) { // Last one wins. const [lport, lhandler] = listening.get(localAddr); @@ -919,7 +928,7 @@ const prepareBinder = (zone, powers) => { const prefixes = getPrefixes(listenAddr); let listenPrefixIndex = 0; let listenPrefix; - + console.log('@@@inbound:prefixes', prefixes); while (listenPrefixIndex < prefixes.length) { listenPrefix = prefixes[listenPrefixIndex]; if (!listening.has(listenPrefix)) { @@ -929,8 +938,10 @@ const prepareBinder = (zone, powers) => { break; } - + console.log('@@@inbound:listenPrefixIndex', listenPrefixIndex); + console.log('@@@inbound:listenPrefix', listenPrefix); if (listenPrefixIndex >= prefixes.length) { + // XXX this throws throw Error(`No listeners for ${listenAddr}`); } @@ -972,7 +983,7 @@ const prepareBinder = (zone, powers) => { const { protocolHandler } = this.state; const localAddr = await E(port).getLocalAddress(); - + console.log('@@@outbound:localAddr', localAddr); // Allocate a local address. const instantiateInnerVow = watch( E(protocolHandler).onInstantiate( @@ -1161,6 +1172,7 @@ const prepareBinder = (zone, powers) => { }, binderOutboundCatchWatcher: { onRejected(e, watchContext) { + console.log('@@@binderOutboundCatchWatcher'); let lastFailure; try { @@ -1200,6 +1212,19 @@ const prepareBinder = (zone, powers) => { initialLocalAddress = localAddr; } + console.log( + '@@@binderOutboundInboundWatcher::initialLocalAddress', + initialLocalAddress, + ); + console.log( + '@@@binderOutboundInboundWatcher::watchContext', + JSON.stringify(watchContext), + ); + console.log( + '@@@binderOutboundInboundWatcher::remoteAddr', + remoteAddr, + ); + // Attempt the loopback connection. return this.facets.protocolImpl.inbound( remoteAddr, @@ -1209,6 +1234,7 @@ const prepareBinder = (zone, powers) => { }, binderOutboundAcceptWatcher: { onFulfilled(attempt, watchContext) { + console.log('@@@binderOutboundAcceptWatcher', attempt); const { handler } = watchContext; return attempt.accept({ handler }); }, diff --git a/packages/network/src/router.js b/packages/network/src/router.js index 81e2cfbc757a..87126f56d61b 100644 --- a/packages/network/src/router.js +++ b/packages/network/src/router.js @@ -146,7 +146,16 @@ export const prepareRouterProtocol = (zone, powers, E = defaultE) => { * @param {ProtocolHandler} protocolHandler */ registerProtocolHandler(paths, protocolHandler) { + console.log( + '@@@registerProtocolHandler::args', + JSON.stringify(paths), + protocolHandler, + ); const protocol = makeNetworkProtocol(protocolHandler); + console.log( + '@@@registerProtocolHandler::makeNetworkProtocol', + protocol, + ); for (const prefix of paths) { this.state.router.register(prefix, protocol); this.state.protocols.init(prefix, protocol); diff --git a/packages/vats/src/proposals/network-proposal.js b/packages/vats/src/proposals/network-proposal.js index cac51ee37ff0..9e7531f4905e 100644 --- a/packages/vats/src/proposals/network-proposal.js +++ b/packages/vats/src/proposals/network-proposal.js @@ -21,7 +21,7 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => { const loopbackHandler = await E(vats.network).makeLoopbackProtocolHandler(); // Every vat has a loopback device. ps.push(E(vats.network).registerProtocolHandler(['/local'], loopbackHandler)); - + console.log('@@@dibcBridgeManager', dibcBridgeManager); if (dibcBridgeManager) { assert('ibc' in vats); // We have access to the bridge, and therefore IBC. @@ -33,15 +33,17 @@ export const registerNetworkProtocols = async (vats, dibcBridgeManager) => { .then(({ protocolHandler, bridgeHandler }) => E(dibcBridgeManager) .initHandler(bridgeHandler) - .then(() => - E(vats.network).registerProtocolHandler( + .then(() => { + console.log('@@@initHandler'); + return E(vats.network).registerProtocolHandler( ['/ibc-port', '/ibc-hop'], protocolHandler, - ), - ), + ); + }), ), ); } else { + console.log('@@@dibcBridgeManager::else'); const loHandler = await E(vats.network).makeLoopbackProtocolHandler( 'ibc-channel/channel-', );