cerc-io/watcher-ts
16
1
Fork 0
mirror of https://github.com/cerc-io/watcher-ts synced 2024-11-19 12:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Upgrade @cerc-io/nitro-node dependency

* Add a separate config option for chain URL used by Nitro node

* Avoid adding ETH RPC method to request URL as no longer needed

* Update package versions
This commit is contained in:
prathamesh0 2023-10-05 11:28:13 +05:30 committed by GitHub
parent ae60bbe1ce
commit caa8da7090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 64 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

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

2
packages/cache/package.json vendored
View File

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

14
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cli", "name": "@cerc-io/cli",
"version": "0.2.62", "version": "0.2.63",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
@ -12,13 +12,13 @@
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.62", "@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.62", "@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
"@cerc-io/nitro-node": "^0.1.11", "@cerc-io/nitro-node": "^0.1.13",
"@cerc-io/peer": "^0.2.62", "@cerc-io/peer": "^0.2.63",
"@cerc-io/rpc-eth-client": "^0.2.62", "@cerc-io/rpc-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.62", "@cerc-io/util": "^0.2.63",
"@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",

27
packages/cli/src/server.ts
View File

@ -237,20 +237,7 @@ export class ServerCmd {
async initNitro (nitroContractAddresses: { [key: string]: string }): Promise<utils.Nitro | undefined> { async initNitro (nitroContractAddresses: { [key: string]: string }): Promise<utils.Nitro | undefined> {
// Start a Nitro node // Start a Nitro node
const { const { server: { p2p: { enablePeer, nitro: nitroConfig } } } = this._baseCmd.config;
server: {
p2p: {
enablePeer,
nitro: nitroConfig
}
},
upstream: {
ethServer: {
rpcProviderEndpoint,
rpcProviderMutationEndpoint
}
}
} = this._baseCmd.config;
// Nitro requires p2p peer to be enabled // Nitro requires p2p peer to be enabled
if (!enablePeer || !nitroConfig) { if (!enablePeer || !nitroConfig) {
@ -259,18 +246,10 @@ export class ServerCmd {
assert(this.peer); assert(this.peer);
let chainUrl: string; log(`Using chain URL ${nitroConfig.chainUrl} for Nitro node`);
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( this._nitro = await utils.Nitro.setupNode(
nitroConfig.privateKey, nitroConfig.privateKey,
chainUrl, nitroConfig.chainUrl,
nitroConfig.chainPrivateKey, nitroConfig.chainPrivateKey,
nitroContractAddresses, nitroContractAddresses,
this.peer, this.peer,

4
packages/codegen/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/codegen", "name": "@cerc-io/codegen",
"version": "0.2.62", "version": "0.2.63",
"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.62", "@cerc-io/util": "^0.2.63",
"@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",

10
packages/codegen/src/templates/package-template.handlebars
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.62", "@cerc-io/cli": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.62", "@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/solidity-mapper": "^0.2.62", "@cerc-io/solidity-mapper": "^0.2.63",
"@cerc-io/util": "^0.2.62", "@cerc-io/util": "^0.2.63",
{{#if (subgraphPath)}} {{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.62", "@cerc-io/graph-node": "^0.2.63",
{{/if}} {{/if}}
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"apollo-type-bigint": "^0.1.3", "apollo-type-bigint": "^0.1.3",

10
packages/graph-node/package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/graph-node", "name": "@cerc-io/graph-node",
"version": "0.2.62", "version": "0.2.63",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.62", "@cerc-io/solidity-mapper": "^0.2.63",
"@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.62", "@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.62", "@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.62", "@cerc-io/util": "^0.2.63",
"@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",

4
packages/ipld-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/ipld-eth-client", "name": "@cerc-io/ipld-eth-client",
"version": "0.2.62", "version": "0.2.63",
"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.62", "@cerc-io/cache": "^0.2.63",
"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",

2
packages/peer/package.json
View File

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

8
packages/rpc-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/rpc-eth-client", "name": "@cerc-io/rpc-eth-client",
"version": "0.2.62", "version": "0.2.63",
"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.62", "@cerc-io/cache": "^0.2.63",
"@cerc-io/ipld-eth-client": "^0.2.62", "@cerc-io/ipld-eth-client": "^0.2.63",
"@cerc-io/util": "^0.2.62", "@cerc-io/util": "^0.2.63",
"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",

4
packages/solidity-mapper/package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/solidity-mapper", "name": "@cerc-io/solidity-mapper",
"version": "0.2.62", "version": "0.2.63",
"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.62", "@cerc-io/ipld-eth-client": "^0.2.63",
"@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",

2
packages/test/package.json
View File

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

2
packages/tracing-client/package.json
View File

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

10
packages/util/package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.62", "version": "0.2.63",
"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-node": "^0.1.11", "@cerc-io/nitro-node": "^0.1.13",
"@cerc-io/peer": "^0.2.62", "@cerc-io/peer": "^0.2.63",
"@cerc-io/solidity-mapper": "^0.2.62", "@cerc-io/solidity-mapper": "^0.2.63",
"@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/properties": "^5.7.0", "@ethersproject/properties": "^5.7.0",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
@ -51,7 +51,7 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.62", "@cerc-io/cache": "^0.2.63",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bunyan": "^1.8.8", "@types/bunyan": "^1.8.8",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",

1
packages/util/src/config.ts
View File

@ -157,6 +157,7 @@ export interface PaymentsConfig {
// ts-nitro config // ts-nitro config
export interface NitroConfig { export interface NitroConfig {
chainUrl: string;
store: string; store: string;
privateKey: string; privateKey: string;

4
packages/util/src/payments.ts
View File

@ -462,10 +462,10 @@ export const setupProviderWithPayments = (
} }
// Send a payment to upstream Nitro node and add details to the request URL // 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)) { if (paidRPCMethods.includes(method)) {
const voucher = await paymentsManager.sendPayment(paymentChannelId, paymentAmount); 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) => { const result = fetchJson({ ...provider.connection, url: updatedURL }, JSON.stringify(request), getResult).then((result) => {

42
yarn.lock
View File

@ -350,20 +350,20 @@
wherearewe "^2.0.0" wherearewe "^2.0.0"
xsalsa20 "^1.1.0" xsalsa20 "^1.1.0"
"@cerc-io/nitro-node@^0.1.11": "@cerc-io/nitro-node@^0.1.13":
version "0.1.11" version "0.1.13"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fnitro-node/-/0.1.11/nitro-node-0.1.11.tgz#8e1b8fbede4cb2ca79dcc3697a714228a0852bcd" 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-1SaieVkcSlkhSQqJqxgr1rlR9FA+FIzFOuAbr1Afx9E4N2EtUoG2XAsYxi9LIYBEwEcBUIelpvXe4TZLDhFVjg== integrity sha512-U64qUUjla/sRyfnPC/12qNqDa+5R+1GlVZE1CO50vIhf2wTA2Sr7xwhqbGo277YhjD9xfalyZPZ0BiIvaAXBCQ==
dependencies: dependencies:
"@cerc-io/libp2p" "0.42.2-laconic-0.1.4" "@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.13"
"@cerc-io/nitro-util" "^0.1.11" "@cerc-io/peer" "^0.2.60"
"@cerc-io/peer" "^0.2.58"
"@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1" "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
"@jpwilliams/waitgroup" "^2.1.0" "@jpwilliams/waitgroup" "^2.1.0"
"@libp2p/crypto" "^1.0.4" "@libp2p/crypto" "^1.0.4"
"@libp2p/tcp" "^6.0.0" "@libp2p/tcp" "^6.0.0"
"@multiformats/multiaddr" "^11.1.4" "@multiformats/multiaddr" "^11.1.4"
"@statechannels/nitro-protocol" "^2.0.0-alpha.5"
assert "^2.0.0" assert "^2.0.0"
async-mutex "^0.4.0" async-mutex "^0.4.0"
debug "^4.3.4" debug "^4.3.4"
@ -376,22 +376,13 @@
promjs "^0.4.2" promjs "^0.4.2"
uint8arrays "^4.0.3" uint8arrays "^4.0.3"
"@cerc-io/nitro-protocol@^2.0.0-alpha.4-ts-port-0.1.2": "@cerc-io/nitro-util@^0.1.13":
version "2.0.0-alpha.4-ts-port-0.1.2" version "0.1.13"
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" 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-Cyx2+S/6BlAzvl+LZxwLjK2Y0H01f/kvTYUktdsGHx1eTWXTzS6FQ0nTVwJkKEcO8V/Y50+dc2PwvFXvk8iG9w== integrity sha512-jlGGaGx6YGbiNDSqQvoAFt7GcYTH2rQT2iAnnb33IglnzQvcjyczJws+jMoPPauvcw1bhG5VxKvL529otm0Nbw==
dependencies: 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==
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" "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
"@statechannels/nitro-protocol" "^2.0.0-alpha.5"
assert "^2.0.0" assert "^2.0.0"
debug "^4.3.4" debug "^4.3.4"
ethers "^5.7.2" ethers "^5.7.2"
@ -3761,6 +3752,15 @@
ethers "^5.1.4" ethers "^5.1.4"
lodash "^4.17.21" 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": "@szmarczak/http-timer@^1.1.2":
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"