From 981f70ec9b48260127e8435cd4874b29e84c3842 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Fri, 14 Jun 2024 13:47:54 +0530 Subject: [PATCH] Replace null values when converting bytes to string in graph-node host API (#523) * Replace null value in strings for postgres text data type * Upgrade package versions to 0.2.99 --- 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/graph-node/src/loader.ts | 6 +++++- packages/graph-node/tsconfig.json | 2 +- packages/ipld-eth-client/package.json | 6 +++--- packages/peer/package.json | 2 +- packages/rpc-eth-client/package.json | 8 ++++---- packages/solidity-mapper/package.json | 2 +- packages/test/package.json | 2 +- packages/tracing-client/package.json | 2 +- packages/util/package.json | 8 ++++---- 15 files changed, 41 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index e74a6e576..d76913e7c 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.98", + "version": "0.2.99", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 92bbd6b52..ab809b8d4 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.98", + "version": "0.2.99", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 732b2ff3b..ab2075d9b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.98", + "version": "0.2.99", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -15,13 +15,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.98", - "@cerc-io/ipld-eth-client": "^0.2.98", + "@cerc-io/cache": "^0.2.99", + "@cerc-io/ipld-eth-client": "^0.2.99", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.98", - "@cerc-io/rpc-eth-client": "^0.2.98", - "@cerc-io/util": "^0.2.98", + "@cerc-io/peer": "^0.2.99", + "@cerc-io/rpc-eth-client": "^0.2.99", + "@cerc-io/util": "^0.2.99", "@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 35e864de0..8906b3c5c 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.98", + "version": "0.2.99", "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.98", + "@cerc-io/util": "^0.2.99", "@graphql-tools/load-files": "^6.5.2", "@npmcli/package-json": "^5.0.0", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars index 162780d1a..a72f7e72e 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.98", - "@cerc-io/ipld-eth-client": "^0.2.98", - "@cerc-io/solidity-mapper": "^0.2.98", - "@cerc-io/util": "^0.2.98", + "@cerc-io/cli": "^0.2.99", + "@cerc-io/ipld-eth-client": "^0.2.99", + "@cerc-io/solidity-mapper": "^0.2.99", + "@cerc-io/util": "^0.2.99", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.98", + "@cerc-io/graph-node": "^0.2.99", {{/if}} "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index 714c35d63..16eb63b0e 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.98", + "version": "0.2.99", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.98", + "@cerc-io/solidity-mapper": "^0.2.99", "@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.98", - "@cerc-io/ipld-eth-client": "^0.2.98", - "@cerc-io/util": "^0.2.98", + "@cerc-io/cache": "^0.2.99", + "@cerc-io/ipld-eth-client": "^0.2.99", + "@cerc-io/util": "^0.2.99", "@types/json-diff": "^0.5.2", "@types/yargs": "^17.0.0", "bn.js": "^4.11.9", diff --git a/packages/graph-node/src/loader.ts b/packages/graph-node/src/loader.ts index 4ec126ccc..cae400bc9 100644 --- a/packages/graph-node/src/loader.ts +++ b/packages/graph-node/src/loader.ts @@ -340,7 +340,11 @@ export const instantiate = async ( }, 'typeConversion.bytesToString': async (bytes: number) => { const byteArray = __getArray(bytes); - const string = utils.toUtf8String(byteArray, utils.Utf8ErrorFuncs.replace); + let string = utils.toUtf8String(byteArray, utils.Utf8ErrorFuncs.replace); + + // Replace \x00 with empty string as Postgres DB text data type does not support it + string = string.replaceAll('\x00', ''); + const ptr = await __newString(string); return ptr; diff --git a/packages/graph-node/tsconfig.json b/packages/graph-node/tsconfig.json index fdb0c6b83..102d68626 100644 --- a/packages/graph-node/tsconfig.json +++ b/packages/graph-node/tsconfig.json @@ -12,7 +12,7 @@ /* Language and Environment */ "target": "ES2019", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + "lib": ["ES2021"], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ // "jsx": "preserve", /* Specify what JSX code is generated. */ // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json index 1f7932a94..b0f22be73 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.98", + "version": "0.2.99", "description": "IPLD ETH Client", "main": "dist/index.js", "scripts": { @@ -20,8 +20,8 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.98", - "@cerc-io/util": "^0.2.98", + "@cerc-io/cache": "^0.2.99", + "@cerc-io/util": "^0.2.99", "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 111aec4fd..bf053b0a9 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.98", + "version": "0.2.99", "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 4b3bf5a2d..2b8a40daa 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.98", + "version": "0.2.99", "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.98", - "@cerc-io/ipld-eth-client": "^0.2.98", - "@cerc-io/util": "^0.2.98", + "@cerc-io/cache": "^0.2.99", + "@cerc-io/ipld-eth-client": "^0.2.99", + "@cerc-io/util": "^0.2.99", "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 89d1ab377..a263cad9f 100644 --- a/packages/solidity-mapper/package.json +++ b/packages/solidity-mapper/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/solidity-mapper", - "version": "0.2.98", + "version": "0.2.99", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index a09a0a6df..02fa25050 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.98", + "version": "0.2.99", "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 f8320ea88..bf5f4855c 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.98", + "version": "0.2.99", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index aa9fffabb..9dd1cbe2f 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.98", + "version": "0.2.99", "main": "dist/index.js", "license": "AGPL-3.0", "dependencies": { "@apollo/utils.keyvaluecache": "^1.0.1", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.98", - "@cerc-io/solidity-mapper": "^0.2.98", + "@cerc-io/peer": "^0.2.99", + "@cerc-io/solidity-mapper": "^0.2.99", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@ethersproject/properties": "^5.7.0", "@ethersproject/providers": "^5.4.4", @@ -54,7 +54,7 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@cerc-io/cache": "^0.2.98", + "@cerc-io/cache": "^0.2.99", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14",