Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade nitro-node and add Nitro config option for chain URL #424

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Upgrade nitro-node and add Nitro config option for chain URL #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f5a7e7
Upgrade @cerc-io/nitro-node dependency
prathamesh0 Oct 5, 2023
6d565e5
Add a separate config option for chain URL used by Nitro node
prathamesh0 Oct 5, 2023
fa30987
Avoid adding ETH RPC method to request URL as no longer needed
prathamesh0 Oct 5, 2023
b951c17
Update package versions
prathamesh0 Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.2.62",
"version": "0.2.63",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/cache",
"version": "0.2.62",
"version": "0.2.63",
"description": "Generic object cache",
"main": "dist/index.js",
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/cli",
"version": "0.2.62",
"version": "0.2.63",
"main": "dist/index.js",
"license": "AGPL-3.0",
"scripts": {
Expand All @@ -12,13 +12,13 @@
},
"dependencies": {
"@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.62",
"@cerc-io/ipld-eth-client": "^0.2.62",
"@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
"@cerc-io/nitro-node": "^0.1.11",
"@cerc-io/peer": "^0.2.62",
"@cerc-io/rpc-eth-client": "^0.2.62",
"@cerc-io/util": "^0.2.62",
"@cerc-io/nitro-node": "^0.1.13",
"@cerc-io/peer": "^0.2.63",
"@cerc-io/rpc-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.63",
"@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0",
Expand Down
27 changes: 3 additions & 24 deletions packages/cli/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,20 +237,7 @@ export class ServerCmd {

async initNitro (nitroContractAddresses: { [key: string]: string }): Promise<utils.Nitro | undefined> {
// Start a Nitro node
const {
server: {
p2p: {
enablePeer,
nitro: nitroConfig
}
},
upstream: {
ethServer: {
rpcProviderEndpoint,
rpcProviderMutationEndpoint
}
}
} = this._baseCmd.config;
const { server: { p2p: { enablePeer, nitro: nitroConfig } } } = this._baseCmd.config;

// Nitro requires p2p peer to be enabled
if (!enablePeer || !nitroConfig) {
Expand All @@ -259,18 +246,10 @@ export class ServerCmd {

assert(this.peer);

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;
}

log(`Using chain URL ${nitroConfig.chainUrl} for Nitro node`);
this._nitro = await utils.Nitro.setupNode(
nitroConfig.privateKey,
chainUrl,
nitroConfig.chainUrl,
nitroConfig.chainPrivateKey,
nitroContractAddresses,
this.peer,
Expand Down
4 changes: 2 additions & 2 deletions packages/codegen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/codegen",
"version": "0.2.62",
"version": "0.2.63",
"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.62",
"@cerc-io/util": "^0.2.63",
"@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
View file
Open in desktop
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.62",
"@cerc-io/ipld-eth-client": "^0.2.62",
"@cerc-io/solidity-mapper": "^0.2.62",
"@cerc-io/util": "^0.2.62",
"@cerc-io/cli": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/solidity-mapper": "^0.2.63",
"@cerc-io/util": "^0.2.63",
{{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.62",
"@cerc-io/graph-node": "^0.2.63",
{{/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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@cerc-io/graph-node",
"version": "0.2.62",
"version": "0.2.63",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.62",
"@cerc-io/solidity-mapper": "^0.2.63",
"@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.62",
"@cerc-io/ipld-eth-client": "^0.2.62",
"@cerc-io/util": "^0.2.62",
"@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.63",
"@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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/ipld-eth-client",
"version": "0.2.62",
"version": "0.2.63",
"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.62",
"@cerc-io/cache": "^0.2.63",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/peer",
"version": "0.2.62",
"version": "0.2.63",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/rpc-eth-client",
"version": "0.2.62",
"version": "0.2.63",
"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.62",
"@cerc-io/ipld-eth-client": "^0.2.62",
"@cerc-io/util": "^0.2.62",
"@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.63",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@cerc-io/solidity-mapper",
"version": "0.2.62",
"version": "0.2.63",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {
"@cerc-io/ipld-eth-client": "^0.2.62",
"@cerc-io/ipld-eth-client": "^0.2.63",
"@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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/test",
"version": "0.2.62",
"version": "0.2.63",
"main": "dist/index.js",
"license": "AGPL-3.0",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/tracing-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/tracing-client",
"version": "0.2.62",
"version": "0.2.63",
"description": "ETH VM tracing client",
"main": "dist/index.js",
"scripts": {
Expand Down
10 changes: 5 additions & 5 deletions packages/util/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@cerc-io/util",
"version": "0.2.62",
"version": "0.2.63",
"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.62",
"@cerc-io/solidity-mapper": "^0.2.62",
"@cerc-io/nitro-node": "^0.1.13",
"@cerc-io/peer": "^0.2.63",
"@cerc-io/solidity-mapper": "^0.2.63",
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
"@ethersproject/properties": "^5.7.0",
"@ethersproject/providers": "^5.4.4",
Expand Down Expand Up @@ -51,7 +51,7 @@
"yargs": "^17.0.1"
},
"devDependencies": {
"@cerc-io/cache": "^0.2.62",
"@cerc-io/cache": "^0.2.63",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bunyan": "^1.8.8",
"@types/express": "^4.17.14",
Expand Down
1 change: 1 addition & 0 deletions packages/util/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export interface PaymentsConfig {

// ts-nitro config
export interface NitroConfig {
chainUrl: string;
store: string;

privateKey: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/util/src/payments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@ export const setupProviderWithPayments = (
}

// Send a payment to upstream Nitro node and add details to the request URL
let updatedURL = `${provider.connection.url}?method=${method}`;
let updatedURL = provider.connection.url;
if (paidRPCMethods.includes(method)) {
const voucher = await paymentsManager.sendPayment(paymentChannelId, paymentAmount);
updatedURL = `${updatedURL}&channelId=${voucher.channelId}&amount=${voucher.amount}&signature=${voucher.signature}`;
updatedURL = `${updatedURL}?channelId=${voucher.channelId}&amount=${voucher.amount}&signature=${voucher.signature}`;
}

const result = fetchJson({ ...provider.connection, url: updatedURL }, JSON.stringify(request), getResult).then((result) => {
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,20 +350,20 @@
wherearewe "^2.0.0"
xsalsa20 "^1.1.0"

"@cerc-io/nitro-node@^0.1.11":
version "0.1.11"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-node/-/0.1.11/nitro-node-0.1.11.tgz#8e1b8fbede4cb2ca79dcc3697a714228a0852bcd"
integrity sha512-1SaieVkcSlkhSQqJqxgr1rlR9FA+FIzFOuAbr1Afx9E4N2EtUoG2XAsYxi9LIYBEwEcBUIelpvXe4TZLDhFVjg==
"@cerc-io/nitro-node@^0.1.13":
version "0.1.13"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-node/-/0.1.13/nitro-node-0.1.13.tgz#3a4661e5019802fdb4ec06ac6698bf772eaf5d8e"
integrity sha512-U64qUUjla/sRyfnPC/12qNqDa+5R+1GlVZE1CO50vIhf2wTA2Sr7xwhqbGo277YhjD9xfalyZPZ0BiIvaAXBCQ==
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.11"
"@cerc-io/peer" "^0.2.58"
"@cerc-io/nitro-util" "^0.1.13"
"@cerc-io/peer" "^0.2.60"
"@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
"@jpwilliams/waitgroup" "^2.1.0"
"@libp2p/crypto" "^1.0.4"
"@libp2p/tcp" "^6.0.0"
"@multiformats/multiaddr" "^11.1.4"
"@statechannels/nitro-protocol" "^2.0.0-alpha.5"
assert "^2.0.0"
async-mutex "^0.4.0"
debug "^4.3.4"
Expand All @@ -376,22 +376,13 @@
promjs "^0.4.2"
uint8arrays "^4.0.3"

"@cerc-io/nitro-protocol@^2.0.0-alpha.4-ts-port-0.1.2":
version "2.0.0-alpha.4-ts-port-0.1.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-protocol/-/2.0.0-alpha.4-ts-port-0.1.2/nitro-protocol-2.0.0-alpha.4-ts-port-0.1.2.tgz#6d2f893f5aa08dd5550447f04967b908f3f6d469"
integrity sha512-Cyx2+S/6BlAzvl+LZxwLjK2Y0H01f/kvTYUktdsGHx1eTWXTzS6FQ0nTVwJkKEcO8V/Y50+dc2PwvFXvk8iG9w==
dependencies:
"@openzeppelin/contracts" "^4.7.3"
"@statechannels/exit-format" "^0.2.0"
"@typechain/ethers-v5" "^9.0.0"

"@cerc-io/nitro-util@^0.1.11":
version "0.1.11"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-util/-/0.1.11/nitro-util-0.1.11.tgz#73471c4366f2da8e4d0a1d222d9bb36f44cbb670"
integrity sha512-DG+mm8ergHuvAcWHy5PSZVsIcDCSQV5/ni2m2NfOLpR3Rz4la5oouYniEoN6z0vJKsQvb7cQ3Wxfeerk8OwcNw==
"@cerc-io/nitro-util@^0.1.13":
version "0.1.13"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-util/-/0.1.13/nitro-util-0.1.13.tgz#72ad7bdbce952577f052b0f7dee5d4b2019f414f"
integrity sha512-jlGGaGx6YGbiNDSqQvoAFt7GcYTH2rQT2iAnnb33IglnzQvcjyczJws+jMoPPauvcw1bhG5VxKvL529otm0Nbw==
dependencies:
"@cerc-io/nitro-protocol" "^2.0.0-alpha.4-ts-port-0.1.2"
"@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
"@statechannels/nitro-protocol" "^2.0.0-alpha.5"
assert "^2.0.0"
debug "^4.3.4"
ethers "^5.7.2"
Expand Down Expand Up @@ -3761,6 +3752,15 @@
ethers "^5.1.4"
lodash "^4.17.21"

"@statechannels/nitro-protocol@^2.0.0-alpha.5":
version "2.0.0-alpha.5"
resolved "https://registry.yarnpkg.com/@statechannels/nitro-protocol/-/nitro-protocol-2.0.0-alpha.5.tgz#9b51ee8170de9f51816144c06f568199ccab3237"
integrity sha512-b4rlq0D97MidlKL3MxOsn1Rtl5VzH26xyvVSe8iZXapUdpYfsIH8Nj5PqVki7drFJWVYjVTjwDwc5pvRW8jNbg==
dependencies:
"@openzeppelin/contracts" "^4.7.3"
"@statechannels/exit-format" "^0.2.0"
"@typechain/ethers-v5" "^9.0.0"

"@szmarczak/http-timer@^1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
Expand Down
Loading