-
Notifications
You must be signed in to change notification settings - Fork 87
feat(l1): properly format client version #2564
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.
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
0a51c91
Add more information to client version
Mechanix97 dad8631
Use const variables
Mechanix97 6bd21d5
Use vergen to get more envs vars
Mechanix97 e732be8
remove unnecesary dependencies
Mechanix97 00221ea
Add develop tag hardcoded
Mechanix97 e4ea587
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 72719f4
Refactor to ethrex_constart, added to hello_message
Mechanix97 8bfbac9
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 76c4be9
Merge remote-tracking branch 'Origin/main' into feat/properly-format-…
Mechanix97 3d7fbc2
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 8d2a846
Added function to abstract the client information
Mechanix97 7ff8460
Add rpc admin
Mechanix97 61fe0f0
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 b5c83ad
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 82d5b27
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 37a244f
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 5d40b89
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 307a37e
feat use client_info as argument
Mechanix97 7870d5d
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 36362a3
Merge branch 'feat/properly-format-client-version' of github.com:lamb…
Mechanix97 4209edb
Fix tests
Mechanix97 043809b
Fix client version RPC
Mechanix97 f3beab3
Fix tests
Mechanix97 545abc8
Fix RPC test
Mechanix97 fd3c16d
add admin client_info
Mechanix97 2a9a2e5
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 2fce0fa
Fix clippy
Mechanix97 ac77a8b
Merge branch 'feat/properly-format-client-version' of github.com:lamb…
Mechanix97 6998ffd
add version command
Mechanix97 545283b
nit get_client_version
Mechanix97 0d40ea1
replace client_version
Mechanix97 9127a09
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 e4cc096
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 4d6cb67
fix merge
Mechanix97 3c0ed5f
Merge branch 'feat/properly-format-client-version' of github.com:lamb…
Mechanix97 ba76106
Fix merge2
Mechanix97 9bf2727
Fix merge2
Mechanix97 01b0076
Merge branch 'feat/properly-format-client-version' of github.com:lamb…
Mechanix97 48c1e09
cargo fmt
Mechanix97 e534575
chenge vergen import
Mechanix97 51a7dbd
nit new line
Mechanix97 76d7ab5
Remove Web3 mod
Mechanix97 26edb2c
Add comment to build
Mechanix97 c2b1ca2
Merge branch 'main' into feat/properly-format-client-version
Mechanix97 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
use std::error::Error; | ||
use vergen::*; | ||
|
||
fn main() -> Result<(), Box<dyn Error>> { | ||
let rustc = RustcBuilder::all_rustc()?; | ||
|
||
Emitter::default().add_instructions(&rustc)?.emit()?; | ||
Ok(()) | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,15 @@ use ethrex_storage::Store; | |
use serde_json::Value; | ||
|
||
use crate::utils::{RpcErr, RpcRequest}; | ||
use ethrex_common::constants; | ||
|
||
pub fn client_version(_req: &RpcRequest, _store: Store) -> Result<Value, RpcErr> { | ||
Ok(Value::String("[email protected]".to_owned())) | ||
Ok(Value::String(format!( | ||
"{}/v{}-develop-{}/{}/rustc-v{}", | ||
Mechanix97 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
constants::ETHREX_PKG_NAME, | ||
constants::ETHREX_PKG_VERSION, | ||
&constants::ETHREX_COMMIT_HASH[0..6], | ||
constants::ETHREX_BUILD_OS, | ||
constants::ETHREX_RUSTC_VERSION | ||
))) | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.