Support payments to upstream ETH server for RPC requests

lerna.json

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

packages/cache/package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/cli",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "scripts": {
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@cerc-io/cache": "^0.2.60",
-    "@cerc-io/ipld-eth-client": "^0.2.60",
+    "@cerc-io/cache": "^0.2.61",
+    "@cerc-io/ipld-eth-client": "^0.2.61",
     "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
     "@cerc-io/nitro-node": "^0.1.11",
-    "@cerc-io/peer": "^0.2.60",
-    "@cerc-io/rpc-eth-client": "^0.2.60",
-    "@cerc-io/util": "^0.2.60",
+    "@cerc-io/peer": "^0.2.61",
+    "@cerc-io/rpc-eth-client": "^0.2.61",
+    "@cerc-io/util": "^0.2.61",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/utils": "^9.1.1",
     "@ipld/dag-cbor": "^8.0.0",

packages/cli/src/server.ts

@@ -38,7 +38,7 @@ import type {
   Peer
   // @ts-expect-error https://github.com/microsoft/TypeScript/issues/49721#issuecomment-1319854183
 } from '@cerc-io/peer';
-import { Node as NitroNode, utils } from '@cerc-io/nitro-node';
+import { utils } from '@cerc-io/nitro-node';
 // @ts-expect-error TODO: Resolve (Not able to find the type declarations)
 import type { Libp2p } from '@cerc-io/libp2p';
 
@@ -55,7 +55,7 @@ export class ServerCmd {
   _argv?: Arguments;
   _baseCmd: BaseCmd;
   _peer?: Peer;
-  _nitro?: NitroNode;
+  _nitro?: utils.Nitro;
   _consensus?: Consensus;
 
   constructor () {
@@ -82,7 +82,7 @@ export class ServerCmd {
     return this._peer;
   }
 
-  get nitro (): NitroNode | undefined {
+  get nitro (): utils.Nitro | undefined {
     return this._nitro;
   }
 
@@ -235,7 +235,7 @@ export class ServerCmd {
     return this._consensus;
   }
 
-  async initNitro (nitroContractAddresses: { [key: string]: string }): Promise<NitroNode | undefined> {
+  async initNitro (nitroContractAddresses: { [key: string]: string }): Promise<utils.Nitro | undefined> {
     // Start a Nitro node
     const {
       server: {
@@ -246,7 +246,8 @@ export class ServerCmd {
       },
       upstream: {
         ethServer: {
-          rpcProviderEndpoint
+          rpcProviderEndpoint,
+          rpcProviderMutationEndpoint
         }
       }
     } = this._baseCmd.config;
@@ -257,17 +258,26 @@ export class ServerCmd {
     }
 
     assert(this.peer);
-    const nitro = await utils.Nitro.setupNode(
+
+    let chainUrl: string;
+    if (rpcProviderMutationEndpoint) {
+      log('Using rpcProviderMutationEndpoint as chain URL for Nitro node');
+      chainUrl = rpcProviderMutationEndpoint;
+    } else {
+      log('Using rpcProviderEndpoint as chain URL for Nitro node');
+      chainUrl = rpcProviderEndpoint;
+    }
+
+    this._nitro = await utils.Nitro.setupNode(
       nitroConfig.privateKey,
-      rpcProviderEndpoint,
+      chainUrl,
       nitroConfig.chainPrivateKey,
       nitroContractAddresses,
       this.peer,
       path.resolve(nitroConfig.store)
     );
 
-    this._nitro = nitro.node;
-    log(`Nitro node started with address: ${this._nitro.address}`);
+    log(`Nitro node started with address: ${this._nitro.node.address}`);
 
     return this._nitro;
   }

packages/codegen/package.json

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

packages/codegen/src/templates/package-template.handlebars

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

packages/graph-node/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@cerc-io/graph-node",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@cerc-io/solidity-mapper": "^0.2.60",
+    "@cerc-io/solidity-mapper": "^0.2.61",
     "@ethersproject/providers": "^5.4.4",
     "@graphprotocol/graph-ts": "^0.22.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -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.60",
-    "@cerc-io/ipld-eth-client": "^0.2.60",
-    "@cerc-io/util": "^0.2.60",
+    "@cerc-io/cache": "^0.2.61",
+    "@cerc-io/ipld-eth-client": "^0.2.61",
+    "@cerc-io/util": "^0.2.61",
     "@types/json-diff": "^0.5.2",
     "@types/yargs": "^17.0.0",
     "bn.js": "^4.11.9",

packages/ipld-eth-client/package.json

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

packages/peer/package.json

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

packages/rpc-eth-client/package.json

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

packages/solidity-mapper/package.json

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

packages/test/package.json

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

packages/tracing-client/package.json

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

packages/util/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@cerc-io/util",
-  "version": "0.2.60",
+  "version": "0.2.61",
   "main": "dist/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/utils.keyvaluecache": "^1.0.1",
     "@cerc-io/nitro-node": "^0.1.11",
-    "@cerc-io/peer": "^0.2.60",
-    "@cerc-io/solidity-mapper": "^0.2.60",
+    "@cerc-io/peer": "^0.2.61",
+    "@cerc-io/solidity-mapper": "^0.2.61",
     "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
     "@ethersproject/providers": "^5.4.4",
     "@graphql-tools/schema": "^9.0.10",
@@ -49,7 +49,7 @@
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@cerc-io/cache": "^0.2.60",
+    "@cerc-io/cache": "^0.2.61",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@types/bunyan": "^1.8.8",
     "@types/express": "^4.17.14",

packages/util/src/config.ts

@@ -224,12 +224,20 @@ export interface ServerConfig {
   rpcSupportsBlockHashParam: boolean;
 }
 
+export interface NitroPeerConfig {
+  address: string;
+  multiAddr: string;
+  amount: string;
+}
+
 export interface UpstreamConfig {
   cache: CacheConfig;
   ethServer: {
     gqlApiEndpoint: string;
     rpcProviderEndpoint: string;
+    rpcProviderMutationEndpoint: string;
     rpcClient: boolean;
+    rpcProviderNitroNode: NitroPeerConfig;
   }
   traceProviderEndpoint: string;
 }