From 0f5a7e74b04790837a07d7e230b52e50227f5f2e Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 5 Oct 2023 10:00:13 +0530 Subject: [PATCH 1/4] Upgrade @cerc-io/nitro-node dependency --- packages/cli/package.json | 2 +- packages/util/package.json | 2 +- yarn.lock | 42 +++++++++++++++++++------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index c7c4d458a..e64dd16b5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -15,7 +15,7 @@ "@cerc-io/cache": "^0.2.62", "@cerc-io/ipld-eth-client": "^0.2.62", "@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/rpc-eth-client": "^0.2.62", "@cerc-io/util": "^0.2.62", diff --git a/packages/util/package.json b/packages/util/package.json index 17f6158fb..41e3406de 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -5,7 +5,7 @@ "license": "AGPL-3.0", "dependencies": { "@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/solidity-mapper": "^0.2.62", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", diff --git a/yarn.lock b/yarn.lock index 595a89686..14d4d2390 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" @@ -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" From 6d565e583706485d95e639950c9dac71d6c82078 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 5 Oct 2023 10:38:23 +0530 Subject: [PATCH 2/4] Add a separate config option for chain URL used by Nitro node --- packages/cli/src/server.ts | 27 +++------------------------ packages/util/src/config.ts | 1 + 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts index c97fe494c..0f8b6bd11 100644 --- a/packages/cli/src/server.ts +++ b/packages/cli/src/server.ts @@ -237,20 +237,7 @@ export class ServerCmd { async initNitro (nitroContractAddresses: { [key: string]: string }): Promise { // 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) { @@ -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, diff --git a/packages/util/src/config.ts b/packages/util/src/config.ts index 14c5c52e8..318c21324 100644 --- a/packages/util/src/config.ts +++ b/packages/util/src/config.ts @@ -157,6 +157,7 @@ export interface PaymentsConfig { // ts-nitro config export interface NitroConfig { + chainUrl: string; store: string; privateKey: string; From fa30987c09418c7245282bddebe0541d6294959e Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 5 Oct 2023 11:09:43 +0530 Subject: [PATCH 3/4] Avoid adding ETH RPC method to request URL as no longer needed --- packages/util/src/payments.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/util/src/payments.ts b/packages/util/src/payments.ts index 0e2fbe0fa..a1708be96 100644 --- a/packages/util/src/payments.ts +++ b/packages/util/src/payments.ts @@ -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) => { From b951c178cfa6a43072a195269416ca5bbcb34572 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Thu, 5 Oct 2023 11:18:10 +0530 Subject: [PATCH 4/4] Update package versions --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../src/templates/package-template.handlebars | 10 +++++----- packages/graph-node/package.json | 10 +++++----- packages/ipld-eth-client/package.json | 4 ++-- packages/peer/package.json | 2 +- packages/rpc-eth-client/package.json | 8 ++++---- packages/solidity-mapper/package.json | 4 ++-- packages/test/package.json | 2 +- packages/tracing-client/package.json | 2 +- packages/util/package.json | 8 ++++---- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lerna.json b/lerna.json index dc44e915a..a06b944f7 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.62", + "version": "0.2.63", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index ab8ca2706..4cb28195e 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -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": { diff --git a/packages/cli/package.json b/packages/cli/package.json index e64dd16b5..4ea26b3af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -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": { @@ -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.13", - "@cerc-io/peer": "^0.2.62", - "@cerc-io/rpc-eth-client": "^0.2.62", - "@cerc-io/util": "^0.2.62", + "@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", diff --git a/packages/codegen/package.json b/packages/codegen/package.json index 9260b31ef..da0e84ebb 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.62", + "version": "0.2.63", "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.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", diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars index 430002551..b33cdc154 100644 --- a/packages/codegen/src/templates/package-template.handlebars +++ b/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.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", diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index 8d8b0e2f9..74e43640f 100644 --- a/packages/graph-node/package.json +++ b/packages/graph-node/package.json @@ -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", @@ -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", diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json index 2a1511319..d4ebd9b19 100644 --- a/packages/ipld-eth-client/package.json +++ b/packages/ipld-eth-client/package.json @@ -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": { @@ -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", diff --git a/packages/peer/package.json b/packages/peer/package.json index 62234a95a..88372b0e7 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -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", diff --git a/packages/rpc-eth-client/package.json b/packages/rpc-eth-client/package.json index 08d29ed16..f55037230 100644 --- a/packages/rpc-eth-client/package.json +++ b/packages/rpc-eth-client/package.json @@ -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": { @@ -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", diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json index 3296c009d..c26599961 100644 --- a/packages/solidity-mapper/package.json +++ b/packages/solidity-mapper/package.json @@ -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", diff --git a/packages/test/package.json b/packages/test/package.json index f07da5849..8f63660ea 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -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, diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json index cedb1ee9a..b0f35b665 100644 --- a/packages/tracing-client/package.json +++ b/packages/tracing-client/package.json @@ -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": { diff --git a/packages/util/package.json b/packages/util/package.json index 41e3406de..01634cb38 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -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.13", - "@cerc-io/peer": "^0.2.62", - "@cerc-io/solidity-mapper": "^0.2.62", + "@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", @@ -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",