Skip to content

Commit

Permalink
Rename nitro-client to nitro-node (#402)
Browse files Browse the repository at this point in the history
* Rename nitro-client to nitro-node

* Upgrade package versions to 0.2.53

---------

Co-authored-by: neeraj <neeraj.rtly@gmail.com>
  • Loading branch information
nikugogoi and neerajvijay1997 committed Aug 16, 2023
1 parent b600524 commit f2bc054
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.2.52",
"version": "0.2.53",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cache/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/cache",
"version": "0.2.52",
"version": "0.2.53",
"description": "Generic object cache",
"main": "dist/index.js",
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/cli",
"version": "0.2.52",
"version": "0.2.53",
"main": "dist/index.js",
"license": "AGPL-3.0",
"scripts": {
Expand All @@ -12,11 +12,11 @@
},
"dependencies": {
"@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.52",
"@cerc-io/ipld-eth-client": "^0.2.52",
"@cerc-io/peer": "^0.2.52",
"@cerc-io/rpc-eth-client": "^0.2.52",
"@cerc-io/util": "^0.2.52",
"@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/peer": "^0.2.53",
"@cerc-io/rpc-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.53",
"@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/codegen/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/codegen",
"version": "0.2.52",
"version": "0.2.53",
"description": "Code generator",
"private": true,
"main": "index.js",
Expand All @@ -20,7 +20,7 @@
},
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@cerc-io/util": "^0.2.52",
"@cerc-io/util": "^0.2.53",
"@graphql-tools/load-files": "^6.5.2",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
"@solidity-parser/parser": "^0.13.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/codegen/src/templates/package-template.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "^0.2.52",
"@cerc-io/ipld-eth-client": "^0.2.52",
"@cerc-io/solidity-mapper": "^0.2.52",
"@cerc-io/util": "^0.2.52",
"@cerc-io/cli": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/solidity-mapper": "^0.2.53",
"@cerc-io/util": "^0.2.53",
{{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.52",
"@cerc-io/graph-node": "^0.2.53",
{{/if}}
"@ethersproject/providers": "^5.4.4",
"apollo-type-bigint": "^0.1.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/graph-node/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@cerc-io/graph-node",
"version": "0.2.52",
"version": "0.2.53",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.52",
"@cerc-io/solidity-mapper": "^0.2.53",
"@ethersproject/providers": "^5.4.4",
"@graphprotocol/graph-ts": "^0.22.0",
"@nomiclabs/hardhat-ethers": "^2.0.2",
Expand Down Expand Up @@ -51,9 +51,9 @@
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
"@cerc-io/cache": "^0.2.52",
"@cerc-io/ipld-eth-client": "^0.2.52",
"@cerc-io/util": "^0.2.52",
"@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.53",
"@types/json-diff": "^0.5.2",
"@types/yargs": "^17.0.0",
"bn.js": "^4.11.9",
Expand Down
4 changes: 2 additions & 2 deletions packages/ipld-eth-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/ipld-eth-client",
"version": "0.2.52",
"version": "0.2.53",
"description": "IPLD ETH Client",
"main": "dist/index.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.52",
"@cerc-io/cache": "^0.2.53",
"cross-fetch": "^3.1.4",
"debug": "^4.3.1",
"ethers": "^5.4.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/peer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/peer",
"version": "0.2.52",
"version": "0.2.53",
"description": "libp2p module",
"main": "dist/index.js",
"exports": "./dist/index.js",
Expand Down
8 changes: 4 additions & 4 deletions packages/rpc-eth-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/rpc-eth-client",
"version": "0.2.52",
"version": "0.2.53",
"description": "RPC ETH Client",
"main": "dist/index.js",
"scripts": {
Expand All @@ -19,9 +19,9 @@
},
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@cerc-io/cache": "^0.2.52",
"@cerc-io/ipld-eth-client": "^0.2.52",
"@cerc-io/util": "^0.2.52",
"@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.53",
"chai": "^4.3.4",
"ethers": "^5.4.4",
"left-pad": "^1.3.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/solidity-mapper/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@cerc-io/solidity-mapper",
"version": "0.2.52",
"version": "0.2.53",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {
"@cerc-io/ipld-eth-client": "^0.2.52",
"@cerc-io/ipld-eth-client": "^0.2.53",
"@ethersproject/abi": "^5.3.0",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/test",
"version": "0.2.52",
"version": "0.2.53",
"main": "dist/index.js",
"license": "AGPL-3.0",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/tracing-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/tracing-client",
"version": "0.2.52",
"version": "0.2.53",
"description": "ETH VM tracing client",
"main": "dist/index.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions packages/util/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@cerc-io/util",
"version": "0.2.52",
"version": "0.2.53",
"main": "dist/index.js",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/utils.keyvaluecache": "^1.0.1",
"@cerc-io/nitro-client": "^0.1.5",
"@cerc-io/solidity-mapper": "^0.2.52",
"@cerc-io/nitro-node": "^0.1.8",
"@cerc-io/solidity-mapper": "^0.2.53",
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
"@ethersproject/providers": "^5.4.4",
"@graphql-tools/schema": "^9.0.10",
Expand Down Expand Up @@ -40,7 +40,7 @@
"yargs": "^17.0.1"
},
"devDependencies": {
"@cerc-io/cache": "^0.2.52",
"@cerc-io/cache": "^0.2.53",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/express": "^4.17.14",
"@types/fs-extra": "^9.0.11",
Expand Down
20 changes: 10 additions & 10 deletions packages/util/src/payments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { Response as HTTPResponse } from 'apollo-server-env';

import Channel from '@cerc-io/ts-channel';
import type { ReadWriteChannel } from '@cerc-io/ts-channel';
import type { Client, Voucher } from '@cerc-io/nitro-client';
import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-client';
import type { Node, Voucher } from '@cerc-io/nitro-node';
import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-node';

import { BaseRatesConfig, PaymentsConfig } from './config';

Expand Down Expand Up @@ -94,13 +94,13 @@ export class PaymentsManager {
return this.ratesConfig.mutations ?? {};
}

async subscribeToVouchers (client: Client): Promise<void> {
this.clientAddress = client.address;
async subscribeToVouchers (node: Node): Promise<void> {
this.clientAddress = node.address;

// Load existing open payment channels with amount paid so far from the stored state
await this.loadPaymentChannels(client);
await this.loadPaymentChannels(node);

const receivedVouchersChannel = client.receivedVouchers();
const receivedVouchersChannel = node.receivedVouchers();
log('Starting voucher subscription...');

while (true) {
Expand All @@ -115,7 +115,7 @@ export class PaymentsManager {
return;
}

const associatedPaymentChannel = await client.getPaymentChannel(voucher.channelId);
const associatedPaymentChannel = await node.getPaymentChannel(voucher.channelId);
const payer = associatedPaymentChannel.balance.payer;

if (!voucher.amount) {
Expand Down Expand Up @@ -257,12 +257,12 @@ export class PaymentsManager {
return [true, true];
}

private async loadPaymentChannels (client: Client): Promise<void> {
const ledgerChannels = await client.getAllLedgerChannels();
private async loadPaymentChannels (node: Node): Promise<void> {
const ledgerChannels = await node.getAllLedgerChannels();

for await (const ledgerChannel of ledgerChannels) {
if (ledgerChannel.status === ChannelStatus.Open) {
const paymentChannels = await client.getPaymentChannelsByLedger(ledgerChannel.iD);
const paymentChannels = await node.getPaymentChannelsByLedger(ledgerChannel.iD);

for (const paymentChannel of paymentChannels) {
if (paymentChannel.status === ChannelStatus.Open) {
Expand Down

0 comments on commit f2bc054

Please sign in to comment.