From a97ce88b49195258d6b22a008f36def50e855a4f Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Thu, 4 Apr 2024 12:52:56 -0400 Subject: [PATCH] bump version and fix nodejs --- CHANGELOG.md | 13 ++++ Cargo.lock | 66 +++++++++---------- Cargo.toml | 24 +++---- examples/rust/Cargo.toml | 2 +- examples/typescript/package-lock.json | 6 +- examples/typescript/package.json | 2 +- examples/typescript/src/client.ts | 50 +++++++++++++- .../package-lock.json | 6 +- yellowstone-grpc-client-nodejs/package.json | 4 +- yellowstone-grpc-client/Cargo.toml | 2 +- yellowstone-grpc-geyser/Cargo.toml | 2 +- yellowstone-grpc-proto/Cargo.toml | 2 +- yellowstone-grpc-tools/Cargo.toml | 2 +- 13 files changed, 119 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 990dd9b2..a4e263ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,19 @@ The minor version will be incremented upon a breaking change and the patch versi ### Fixes +### Features + +### Breaking + +## 2024-04-04 + +- yellowstone-grpc-client-1.15.0+solana.1.18.9 +- yellowstone-grpc-geyser-1.14.0+solana.1.18.9 +- yellowstone-grpc-proto-1.14.0+solana.1.18.9 +- yellowstone-grpc-tools-1.0.0-rc.11+solana.1.18.9 + +### Fixes + - deps: update `h2` crate (`RUSTSEC-2024-0332`) ([#316](https://github.com/rpcpool/yellowstone-grpc/pull/316)) ### Features diff --git a/Cargo.lock b/Cargo.lock index 65b970fb..c3d1394c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3624,9 +3624,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9204641d327fc2dc7cebcd07bd63fccbc2695057040728924395d5e4ab491b17" +checksum = "6c5f49893e9e7cd1a45869e03ad6d767666544e47aa39cff5bcfd10c9b156177" dependencies = [ "Inflector", "base64 0.21.7", @@ -3649,9 +3649,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7bf92f66a8643b2a1da993a90d2fbd1860eda936d8ed0f931621360a0a707bf" +checksum = "617228f9569238e544b526c422b632de368a5ce748a7af04f7f762bd937f42f3" dependencies = [ "bincode", "chrono", @@ -3663,9 +3663,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc310416403e8bd4f10799d7736a3a17126b217236983a884f0e1989b93040" +checksum = "cc46edad65d122c8b8634aa9ad11276a804c1aa2404755577fdfdea67484b620" dependencies = [ "block-buffer 0.10.4", "bs58", @@ -3688,9 +3688,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8882e99fb0589cafdd48690c0c1b589d419110630a25e221de68ee1c10fb3" +checksum = "c71c603d2203da423cfd8862572ffca7165268e76cab181035f50d106c3710eb" dependencies = [ "proc-macro2", "quote", @@ -3700,9 +3700,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd63fd201e8d6b48ca9ca5bd454d30d99f2df4db5686e2cf2e56c39d937a705e" +checksum = "a80cbffaa91e84aa9031ccf63b7f21265ec787cd05280956026d4580ddbbc707" dependencies = [ "log", "solana-sdk", @@ -3712,9 +3712,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232989da2972107e5e40dcc179f8f4ca2ddcf1cb9ac2b27305ca97f2a0c0408" +checksum = "f5b3eef85d82c2c3030acb1d3272d77984d118d2a026d9b1a2cecc6e4c6602eb" dependencies = [ "env_logger 0.9.3", "lazy_static", @@ -3723,9 +3723,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ae59f9a98ff5d6e62a516f35a30035d57b07bca4330df265f964936ece573a" +checksum = "bd072023ab870dcb7d524980d9481317bfd29c1dfd74a067747c8d1d249d1075" dependencies = [ "log", "solana-sdk", @@ -3733,9 +3733,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d80cc2dfca741baa590d11e9fbe2f9d5c10396b738b7224c276532ffb5ee2e0" +checksum = "6f594ca2a2698983b515580925d10be20b079617154bbed07d6cd455d1661b90" dependencies = [ "crossbeam-channel", "gethostname", @@ -3748,9 +3748,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f49c1f01637722d95bbcc9de05c49112bd4aa6aeacad377fa5b3524785cb43" +checksum = "760e9e923050f30f03a159aec9ba1fe09ae7c7494ebd8ba74dc5b7429b11085b" dependencies = [ "ark-bn254", "ark-ec", @@ -3803,9 +3803,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb4bb43f3beaa971ca30fe6d7b6b15723f4cf67262c88e5ca62d520888e091" +checksum = "a61b65be846413bc504ecae468b6a3fa91b1b37631c80074c41ada8cdc36d165" dependencies = [ "base64 0.21.7", "bincode", @@ -3831,9 +3831,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32067a43e8911d442c50c2fb3a40ac3e73f5645b8ae911ba5f4c5af9190f3b29" +checksum = "1788023924ebb072288868f8b4b72f5459c1ff653238d769700da9c8043a8aea" dependencies = [ "assert_matches", "base64 0.21.7", @@ -3886,9 +3886,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457e23df0b7b859eba7b72bc525f63f3a415500fb0a17d554e5166378f4c9b4b" +checksum = "6f3b24f46820e8912b81719a828a3d05f4fbd2f6afdc13826b0327df065ab795" dependencies = [ "bs58", "proc-macro2", @@ -3905,9 +3905,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-transaction-status" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce29d9356c0467d2659103ec9f13edb185be2919a3b034b7f602c6eb89fa1b9" +checksum = "a5fa023f9a09216e809bf28c1dc16c8dfce726dfa64133f9016e8a1f01267f39" dependencies = [ "Inflector", "base64 0.21.7", @@ -3930,9 +3930,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.18.7" +version = "1.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b429abaacfd233305d996bed2d453e33835cb3bf2508bc72d12cbc4483514f" +checksum = "76cba1f80c9001dc788655f2d7d5671af55c7a0a49b95de819f2fc45d8b803b0" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -5241,7 +5241,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client" -version = "1.15.0+solana.1.18.7" +version = "1.15.0+solana.1.18.9" dependencies = [ "bytes", "futures", @@ -5254,7 +5254,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-client-simple" -version = "1.13.0+solana.1.18.7" +version = "1.13.0+solana.1.18.9" dependencies = [ "anyhow", "backoff", @@ -5277,7 +5277,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-geyser" -version = "1.13.0+solana.1.18.7" +version = "1.14.0+solana.1.18.9" dependencies = [ "anyhow", "base64 0.21.7", @@ -5310,7 +5310,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-proto" -version = "1.13.0+solana.1.18.7" +version = "1.14.0+solana.1.18.9" dependencies = [ "anyhow", "bincode", @@ -5325,7 +5325,7 @@ dependencies = [ [[package]] name = "yellowstone-grpc-tools" -version = "1.0.0-rc.10+solana.1.18.7" +version = "1.0.0-rc.11+solana.1.18.9" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index df777ae3..f2ba278c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] resolver = "2" members = [ - "examples/rust", # 1.13.0+solana.1.18.7 - "yellowstone-grpc-client", # 1.15.0+solana.1.18.7 - "yellowstone-grpc-geyser", # 1.13.0+solana.1.18.7 - "yellowstone-grpc-proto", # 1.13.0+solana.1.18.7 - "yellowstone-grpc-tools", # 1.0.0-rc.10+solana.1.18.7 + "examples/rust", # 1.13.0+solana.1.18.9 + "yellowstone-grpc-client", # 1.15.0+solana.1.18.9 + "yellowstone-grpc-geyser", # 1.14.0+solana.1.18.9 + "yellowstone-grpc-proto", # 1.14.0+solana.1.18.9 + "yellowstone-grpc-tools", # 1.0.0-rc.11+solana.1.18.9 ] [workspace.package] @@ -51,11 +51,11 @@ serde = "1.0.145" serde_json = "1.0.86" serde_yaml = "0.9.25" sha2 = "0.10.7" -solana-account-decoder = "=1.18.7" -solana-geyser-plugin-interface = "=1.18.7" -solana-logger = "=1.18.7" -solana-sdk = "=1.18.7" -solana-transaction-status = "=1.18.7" +solana-account-decoder = "=1.18.9" +solana-geyser-plugin-interface = "=1.18.9" +solana-logger = "=1.18.9" +solana-sdk = "=1.18.9" +solana-transaction-status = "=1.18.9" spl-token-2022 = "0.9.0" thiserror = "1.0" tokio = "1.21.2" @@ -66,8 +66,8 @@ tonic-health = "0.10.2" tracing = "0.1.37" tracing-subscriber = "0.3.17" vergen = "8.2.1" -yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.7" } -yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.13.0+solana.1.18.7" } +yellowstone-grpc-client = { path = "yellowstone-grpc-client", version = "=1.15.0+solana.1.18.9" } +yellowstone-grpc-proto = { path = "yellowstone-grpc-proto", version = "=1.14.0+solana.1.18.9" } [profile.release] debug = true diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml index 996e4707..4dec6faf 100644 --- a/examples/rust/Cargo.toml +++ b/examples/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client-simple" -version = "1.13.0+solana.1.18.7" +version = "1.13.0+solana.1.18.9" authors = { workspace = true } edition = { workspace = true } homepage = { workspace = true } diff --git a/examples/typescript/package-lock.json b/examples/typescript/package-lock.json index 2ab28f28..cd59873d 100644 --- a/examples/typescript/package-lock.json +++ b/examples/typescript/package-lock.json @@ -13,19 +13,19 @@ "yargs": "^17.6.2" }, "devDependencies": { - "prettier": "2.8.3", + "prettier": "^2.8.3", "typescript": "^4.9.5" } }, "../../yellowstone-grpc-client-nodejs": { "name": "@triton-one/yellowstone-grpc", - "version": "0.4.0", + "version": "0.5.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.8.0" }, "devDependencies": { - "prettier": "2.8.3", + "prettier": "^2.8.3", "ts-proto": "^1.139.0", "typescript": "^4.9.5" } diff --git a/examples/typescript/package.json b/examples/typescript/package.json index b96a9672..53252f82 100644 --- a/examples/typescript/package.json +++ b/examples/typescript/package.json @@ -16,7 +16,7 @@ "start": "npm run build && node dist/client.js" }, "devDependencies": { - "prettier": "2.8.3", + "prettier": "^2.8.3", "typescript": "^4.9.5" } } diff --git a/examples/typescript/src/client.ts b/examples/typescript/src/client.ts index c1b6f84e..a464f343 100644 --- a/examples/typescript/src/client.ts +++ b/examples/typescript/src/client.ts @@ -10,7 +10,7 @@ async function main() { // Open connection. const client = new Client(args.endpoint, args.xToken, { - 'grpc.max_receive_message_length': 64 * 1024 * 1024 // 64MiB + "grpc.max_receive_message_length": 64 * 1024 * 1024, // 64MiB }); const commitment = parseCommitmentLevel(args.commitment); @@ -90,6 +90,7 @@ async function subscribeCommand(client, args) { accounts: {}, slots: {}, transactions: {}, + transactionsStatus: {}, entry: {}, blocks: {}, blocksMeta: {}, @@ -147,6 +148,17 @@ async function subscribeCommand(client, args) { }; } + if (args.transactionsStatus) { + request.transactionsStatus.client = { + vote: args.transactionsStatusVote, + failed: args.transactionsStatusFailed, + signature: args.transactionsStatusSignature, + accountInclude: args.transactionsStatusAccountInclude, + accountExclude: args.transactionsStatusAccountExclude, + accountRequired: args.transactionsStatusAccountRequired, + }; + } + if (args.entry) { request.entry.client = {}; } @@ -318,6 +330,38 @@ function parseCommandLineArgs() { description: "filter required account in transactions", type: "array", }, + "transactions-status": { + default: false, + describe: "subscribe on transactions_status updates", + type: "boolean", + }, + "transactions-status-vote": { + description: "filter vote transactions_status", + type: "boolean", + }, + "transactions-status-failed": { + description: "filter failed transactions_status", + type: "boolean", + }, + "transactions-status-signature": { + description: "filter by transaction signature", + type: "string", + }, + "transactions-status-account-include": { + default: [], + description: "filter included account in transactions_status", + type: "array", + }, + "transactions-status-account-exclude": { + default: [], + description: "filter excluded account in transactions_status", + type: "array", + }, + "transactions-status-account-required": { + default: [], + description: "filter required account in transactions_status", + type: "array", + }, entry: { default: false, description: "subscribe on entry updates", @@ -356,8 +400,8 @@ function parseCommandLineArgs() { ping: { default: undefined, description: "send ping request in subscribe", - type: "number" - } + type: "number", + }, }); }) .demandCommand(1) diff --git a/yellowstone-grpc-client-nodejs/package-lock.json b/yellowstone-grpc-client-nodejs/package-lock.json index 3aa8e759..4bf73b70 100644 --- a/yellowstone-grpc-client-nodejs/package-lock.json +++ b/yellowstone-grpc-client-nodejs/package-lock.json @@ -1,18 +1,18 @@ { "name": "@triton-one/yellowstone-grpc", - "version": "0.4.0", + "version": "0.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@triton-one/yellowstone-grpc", - "version": "0.4.0", + "version": "0.5.0", "license": "Apache-2.0", "dependencies": { "@grpc/grpc-js": "^1.8.0" }, "devDependencies": { - "prettier": "2.8.3", + "prettier": "^2.8.3", "ts-proto": "^1.139.0", "typescript": "^4.9.5" } diff --git a/yellowstone-grpc-client-nodejs/package.json b/yellowstone-grpc-client-nodejs/package.json index 5f207ff9..af1d4e42 100644 --- a/yellowstone-grpc-client-nodejs/package.json +++ b/yellowstone-grpc-client-nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@triton-one/yellowstone-grpc", - "version": "0.4.0", + "version": "0.5.0", "license": "Apache-2.0", "author": "Triton One", "description": "Yellowstone gRPC Geyser Node.js Client", @@ -29,7 +29,7 @@ "@grpc/grpc-js": "^1.8.0" }, "devDependencies": { - "prettier": "2.8.3", + "prettier": "^2.8.3", "ts-proto": "^1.139.0", "typescript": "^4.9.5" }, diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml index 498ea9bb..f7045637 100644 --- a/yellowstone-grpc-client/Cargo.toml +++ b/yellowstone-grpc-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-client" -version = "1.15.0+solana.1.18.7" +version = "1.15.0+solana.1.18.9" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Simple Client" diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml index 641dd058..a46a861f 100644 --- a/yellowstone-grpc-geyser/Cargo.toml +++ b/yellowstone-grpc-geyser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-geyser" -version = "1.13.0+solana.1.18.7" +version = "1.14.0+solana.1.18.9" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Plugin" diff --git a/yellowstone-grpc-proto/Cargo.toml b/yellowstone-grpc-proto/Cargo.toml index ec091129..7f8919a8 100644 --- a/yellowstone-grpc-proto/Cargo.toml +++ b/yellowstone-grpc-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-proto" -version = "1.13.0+solana.1.18.7" +version = "1.14.0+solana.1.18.9" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Geyser Protobuf Definitions" diff --git a/yellowstone-grpc-tools/Cargo.toml b/yellowstone-grpc-tools/Cargo.toml index 0a139daa..1fb6e601 100644 --- a/yellowstone-grpc-tools/Cargo.toml +++ b/yellowstone-grpc-tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yellowstone-grpc-tools" -version = "1.0.0-rc.10+solana.1.18.7" +version = "1.0.0-rc.11+solana.1.18.9" authors = { workspace = true } edition = { workspace = true } description = "Yellowstone gRPC Tools"