Rename nitro-client to nitro-node (#402)

* Rename nitro-client to nitro-node

* Upgrade package versions to 0.2.53

---------

Co-authored-by: neeraj <neeraj.rtly@gmail.com>
This commit is contained in:
Nabarun Gogoi 2023-08-16 17:57:15 +05:30 committed by GitHub
parent b600524c8c
commit f2bc054c19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 45 additions and 45 deletions

View File

@ -2,7 +2,7 @@
"packages": [ "packages": [
"packages/*" "packages/*"
], ],
"version": "0.2.52", "version": "0.2.53",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"command": { "command": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cache", "name": "@cerc-io/cache",
"version": "0.2.52", "version": "0.2.53",
"description": "Generic object cache", "description": "Generic object cache",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cli", "name": "@cerc-io/cli",
"version": "0.2.52", "version": "0.2.53",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
@ -12,11 +12,11 @@
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.52", "@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.52", "@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/peer": "^0.2.52", "@cerc-io/peer": "^0.2.53",
"@cerc-io/rpc-eth-client": "^0.2.52", "@cerc-io/rpc-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.52", "@cerc-io/util": "^0.2.53",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1", "@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0", "@ipld/dag-cbor": "^8.0.0",

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/codegen", "name": "@cerc-io/codegen",
"version": "0.2.52", "version": "0.2.53",
"description": "Code generator", "description": "Code generator",
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -20,7 +20,7 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/util": "^0.2.52", "@cerc-io/util": "^0.2.53",
"@graphql-tools/load-files": "^6.5.2", "@graphql-tools/load-files": "^6.5.2",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
"@solidity-parser/parser": "^0.13.2", "@solidity-parser/parser": "^0.13.2",

View File

@ -41,12 +41,12 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/cli": "^0.2.52", "@cerc-io/cli": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.52", "@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/solidity-mapper": "^0.2.52", "@cerc-io/solidity-mapper": "^0.2.53",
"@cerc-io/util": "^0.2.52", "@cerc-io/util": "^0.2.53",
{{#if (subgraphPath)}} {{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.52", "@cerc-io/graph-node": "^0.2.53",
{{/if}} {{/if}}
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"apollo-type-bigint": "^0.1.3", "apollo-type-bigint": "^0.1.3",

View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/graph-node", "name": "@cerc-io/graph-node",
"version": "0.2.52", "version": "0.2.53",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.52", "@cerc-io/solidity-mapper": "^0.2.53",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphprotocol/graph-ts": "^0.22.0", "@graphprotocol/graph-ts": "^0.22.0",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
@ -51,9 +51,9 @@
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2", "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
"@cerc-io/cache": "^0.2.52", "@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.52", "@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.52", "@cerc-io/util": "^0.2.53",
"@types/json-diff": "^0.5.2", "@types/json-diff": "^0.5.2",
"@types/yargs": "^17.0.0", "@types/yargs": "^17.0.0",
"bn.js": "^4.11.9", "bn.js": "^4.11.9",

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/ipld-eth-client", "name": "@cerc-io/ipld-eth-client",
"version": "0.2.52", "version": "0.2.53",
"description": "IPLD ETH Client", "description": "IPLD ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -20,7 +20,7 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.52", "@cerc-io/cache": "^0.2.53",
"cross-fetch": "^3.1.4", "cross-fetch": "^3.1.4",
"debug": "^4.3.1", "debug": "^4.3.1",
"ethers": "^5.4.4", "ethers": "^5.4.4",

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/peer", "name": "@cerc-io/peer",
"version": "0.2.52", "version": "0.2.53",
"description": "libp2p module", "description": "libp2p module",
"main": "dist/index.js", "main": "dist/index.js",
"exports": "./dist/index.js", "exports": "./dist/index.js",

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/rpc-eth-client", "name": "@cerc-io/rpc-eth-client",
"version": "0.2.52", "version": "0.2.53",
"description": "RPC ETH Client", "description": "RPC ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -19,9 +19,9 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/cache": "^0.2.52", "@cerc-io/cache": "^0.2.53",
"@cerc-io/ipld-eth-client": "^0.2.52", "@cerc-io/ipld-eth-client": "^0.2.53",
"@cerc-io/util": "^0.2.52", "@cerc-io/util": "^0.2.53",
"chai": "^4.3.4", "chai": "^4.3.4",
"ethers": "^5.4.4", "ethers": "^5.4.4",
"left-pad": "^1.3.0", "left-pad": "^1.3.0",

View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/solidity-mapper", "name": "@cerc-io/solidity-mapper",
"version": "0.2.52", "version": "0.2.53",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/ipld-eth-client": "^0.2.52", "@cerc-io/ipld-eth-client": "^0.2.53",
"@ethersproject/abi": "^5.3.0", "@ethersproject/abi": "^5.3.0",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/test", "name": "@cerc-io/test",
"version": "0.2.52", "version": "0.2.53",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,

View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/tracing-client", "name": "@cerc-io/tracing-client",
"version": "0.2.52", "version": "0.2.53",
"description": "ETH VM tracing client", "description": "ETH VM tracing client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

View File

@ -1,12 +1,12 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.52", "version": "0.2.53",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.keyvaluecache": "^1.0.1",
"@cerc-io/nitro-client": "^0.1.5", "@cerc-io/nitro-node": "^0.1.8",
"@cerc-io/solidity-mapper": "^0.2.52", "@cerc-io/solidity-mapper": "^0.2.53",
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/schema": "^9.0.10", "@graphql-tools/schema": "^9.0.10",
@ -40,7 +40,7 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.52", "@cerc-io/cache": "^0.2.53",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",
"@types/fs-extra": "^9.0.11", "@types/fs-extra": "^9.0.11",

View File

@ -6,8 +6,8 @@ import { Response as HTTPResponse } from 'apollo-server-env';
import Channel from '@cerc-io/ts-channel'; import Channel from '@cerc-io/ts-channel';
import type { ReadWriteChannel } from '@cerc-io/ts-channel'; import type { ReadWriteChannel } from '@cerc-io/ts-channel';
import type { Client, Voucher } from '@cerc-io/nitro-client'; import type { Node, Voucher } from '@cerc-io/nitro-node';
import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-client'; import { utils as nitroUtils, ChannelStatus } from '@cerc-io/nitro-node';
import { BaseRatesConfig, PaymentsConfig } from './config'; import { BaseRatesConfig, PaymentsConfig } from './config';
@ -94,13 +94,13 @@ export class PaymentsManager {
return this.ratesConfig.mutations ?? {}; return this.ratesConfig.mutations ?? {};
} }
async subscribeToVouchers (client: Client): Promise<void> { async subscribeToVouchers (node: Node): Promise<void> {
this.clientAddress = client.address; this.clientAddress = node.address;
// Load existing open payment channels with amount paid so far from the stored state // 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...'); log('Starting voucher subscription...');
while (true) { while (true) {
@ -115,7 +115,7 @@ export class PaymentsManager {
return; return;
} }
const associatedPaymentChannel = await client.getPaymentChannel(voucher.channelId); const associatedPaymentChannel = await node.getPaymentChannel(voucher.channelId);
const payer = associatedPaymentChannel.balance.payer; const payer = associatedPaymentChannel.balance.payer;
if (!voucher.amount) { if (!voucher.amount) {
@ -257,12 +257,12 @@ export class PaymentsManager {
return [true, true]; return [true, true];
} }
private async loadPaymentChannels (client: Client): Promise<void> { private async loadPaymentChannels (node: Node): Promise<void> {
const ledgerChannels = await client.getAllLedgerChannels(); const ledgerChannels = await node.getAllLedgerChannels();
for await (const ledgerChannel of ledgerChannels) { for await (const ledgerChannel of ledgerChannels) {
if (ledgerChannel.status === ChannelStatus.Open) { if (ledgerChannel.status === ChannelStatus.Open) {
const paymentChannels = await client.getPaymentChannelsByLedger(ledgerChannel.iD); const paymentChannels = await node.getPaymentChannelsByLedger(ledgerChannel.iD);
for (const paymentChannel of paymentChannels) { for (const paymentChannel of paymentChannels) {
if (paymentChannel.status === ChannelStatus.Open) { if (paymentChannel.status === ChannelStatus.Open) {