From 0603f10526e04df2266b7188c2c5585e3c53717f Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 14 Sep 2023 12:42:26 +0530 Subject: [PATCH 1/2] Remove voucher subscription for logs from Nitro setup --- packages/example-web-app/src/App.tsx | 10 ++++++++-- packages/nitro-node/src/node/node.ts | 3 ++- packages/nitro-node/src/utils/nitro.ts | 2 -- packages/server/src/index.ts | 4 +++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/example-web-app/src/App.tsx b/packages/example-web-app/src/App.tsx index fb423eaa..3dc89246 100644 --- a/packages/example-web-app/src/App.tsx +++ b/packages/example-web-app/src/App.tsx @@ -11,7 +11,8 @@ import './App.css'; const { ACTORS, createPeerIdFromKey, - createPeerAndInit + createPeerAndInit, + subscribeVoucherLogs } = utils; declare global { @@ -34,7 +35,7 @@ window.setupNode = async (name: string): Promise => { const peerIdObj = await createPeerIdFromKey(hex2Bytes(actor.privateKey)); const peer = await createPeerAndInit(process.env.REACT_APP_RELAY_MULTIADDR, {}, peerIdObj); - return utils.Nitro.setupNode( + const nitro = await utils.Nitro.setupNode( actor.privateKey, DEFAULT_CHAIN_URL, actor.chainPrivateKey, @@ -44,6 +45,11 @@ window.setupNode = async (name: string): Promise => { undefined, process.env.REACT_APP_ASSET_ADDRESS ); + + // Subscribe to vouchers and log them + subscribeVoucherLogs(nitro.node); + + return nitro; }; window.out = (jsonObject) => { diff --git a/packages/nitro-node/src/node/node.ts b/packages/nitro-node/src/node/node.ts index 54e5aea0..a44ad703 100644 --- a/packages/nitro-node/src/node/node.ts +++ b/packages/nitro-node/src/node/node.ts @@ -273,7 +273,8 @@ export class Node { // ReceivedVouchers returns a chan that receives a voucher every time we receive a payment voucher receivedVouchers(): ReadChannel { - return this._receivedVouchers!; + // TODO: Register listeners and send voucher to each instead + return this._receivedVouchers!.readOnly(); } // CreateVoucher creates and returns a voucher for the given channelId which increments the redeemable balance by amount. diff --git a/packages/nitro-node/src/utils/nitro.ts b/packages/nitro-node/src/utils/nitro.ts index fa67440c..ef03577a 100644 --- a/packages/nitro-node/src/utils/nitro.ts +++ b/packages/nitro-node/src/utils/nitro.ts @@ -83,7 +83,6 @@ export class Nitro { metricsApi, ); - subscribeVoucherLogs(node); return new Nitro(node, msgService, chainService, keySigner, store); } @@ -114,7 +113,6 @@ export class Nitro { metricsApi, ); - subscribeVoucherLogs(node); return new Nitro(node, msgService, chainService, snapSigner, store); } diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index a62d4705..eabbe2ed 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -18,6 +18,7 @@ const log = debug('ts-nitro:server'); const { createPeerIdFromKey, createPeerAndInit, + subscribeVoucherLogs, } = utils; const getArgv = () => yargs.parserConfiguration({ @@ -145,7 +146,8 @@ const main = async () => { asset, ); - log('Started P2PMessageService'); + subscribeVoucherLogs(nitro.node); + log('Started P2PMessageService and subscribed to vouchers'); const peersToConnect: string[] = argv.counterparty ? [argv.counterparty] : []; peersToConnect.push(...(argv.intermediaries as string[])); From 49e4f1baa4e6de67160c3f1413ea1a8885ac50af Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 14 Sep 2023 12:44:17 +0530 Subject: [PATCH 2/2] Update package versions --- lerna.json | 2 +- packages/example-web-app/package.json | 4 ++-- packages/nitro-node/package.json | 4 ++-- packages/nitro-util/package.json | 2 +- packages/server/package.json | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lerna.json b/lerna.json index a1f5636b..a066a097 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "0.1.9" + "version": "0.1.10" } diff --git a/packages/example-web-app/package.json b/packages/example-web-app/package.json index 7b4db2ee..8548bcfa 100644 --- a/packages/example-web-app/package.json +++ b/packages/example-web-app/package.json @@ -1,9 +1,9 @@ { "name": "@cerc-io/example-web-app", - "version": "0.1.9", + "version": "0.1.10", "private": true, "dependencies": { - "@cerc-io/nitro-node": "^0.1.9", + "@cerc-io/nitro-node": "^0.1.10", "@libp2p/crypto": "^1.0.4", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", diff --git a/packages/nitro-node/package.json b/packages/nitro-node/package.json index 4c2975e0..acea5146 100644 --- a/packages/nitro-node/package.json +++ b/packages/nitro-node/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/nitro-node", - "version": "0.1.9", + "version": "0.1.10", "main": "dist/index.js", "license": "MIT", "scripts": { @@ -50,7 +50,7 @@ "dependencies": { "@cerc-io/libp2p": "0.42.2-laconic-0.1.4", "@cerc-io/nitro-protocol": "^2.0.0-alpha.4-ts-port-0.1.2", - "@cerc-io/nitro-util": "^0.1.9", + "@cerc-io/nitro-util": "^0.1.10", "@cerc-io/peer": "^0.2.56", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@jpwilliams/waitgroup": "^2.1.0", diff --git a/packages/nitro-util/package.json b/packages/nitro-util/package.json index 1b046ff8..1a563520 100644 --- a/packages/nitro-util/package.json +++ b/packages/nitro-util/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/nitro-util", - "version": "0.1.9", + "version": "0.1.10", "main": "dist/index.js", "license": "MIT", "scripts": { diff --git a/packages/server/package.json b/packages/server/package.json index 2aa4ac2b..47473f2c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/server", - "version": "0.1.9", + "version": "0.1.10", "main": "index.js", "license": "MIT", "private": true, @@ -33,8 +33,8 @@ "chain:anvil": "hardhat --config hardhat.anvil.config.ts node" }, "dependencies": { - "@cerc-io/nitro-node": "^0.1.9", - "@cerc-io/nitro-util": "^0.1.9", + "@cerc-io/nitro-node": "^0.1.10", + "@cerc-io/nitro-util": "^0.1.10", "assert": "^2.0.0", "debug": "^4.3.4", "dotenv": "^16.0.3",