diff --git a/README.md b/README.md index 9783f58ced..847c68e0af 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![LOGO](https://raw.githubusercontent.com/casper-network/casper-node/master/images/casper-association-logo-primary.svg)](https://casper.network/) +[![LOGO](https://raw.githubusercontent.com/casper-network/casper-node/master/images/casper-association-logo-new.svg)](https://casper.network/) # casper-node diff --git a/ci/build_client_rpm.sh b/ci/build_client_rpm.sh index a834bd2743..8b8c234f54 100755 --- a/ci/build_client_rpm.sh +++ b/ci/build_client_rpm.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -# Images used in this script are build in CasperLabs/buildenv repo +# Images used in this script are build in Casper/buildenv repo # This allows make commands without local build environment setup or # using an OS version other than locally installed. diff --git a/ci/casper_updater/Cargo.toml b/ci/casper_updater/Cargo.toml index 56fcb8119e..47e079d6f9 100644 --- a/ci/casper_updater/Cargo.toml +++ b/ci/casper_updater/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ["Fraser Hutchison "] -description = "A tool to update versions of all published CasperLabs packages." +description = "A tool to update versions of all published Casper packages." edition = "2018" license = "Apache-2.0" name = "casper-updater" diff --git a/ci/casper_updater/README.md b/ci/casper_updater/README.md index f50e6afdd7..a9f3a8dbfd 100644 --- a/ci/casper_updater/README.md +++ b/ci/casper_updater/README.md @@ -1,10 +1,10 @@ # casper-updater -A tool to update versions of all published CasperLabs packages. +A tool to update versions of all published Casper packages. # Usage -The tool iterates through each published CasperLabs package, asking for a new version for each or automatically bumping the major, minor or patch version if `--bump=[major|minor|patch]` was specified. Once a valid version is specified, all files dependent on that version are updated. +The tool iterates through each published package, asking for a new version for each or automatically bumping the major, minor or patch version if `--bump=[major|minor|patch]` was specified. Once a valid version is specified, all files dependent on that version are updated. If you run the tool from its own directory it will expect to find the casper-node root directory at '../..'. Alternatively, you can give the path to the casper-node root directory via `--root-dir`. diff --git a/ci/casper_updater/src/dependent_file.rs b/ci/casper_updater/src/dependent_file.rs index 0f6ad2c419..572271508e 100644 --- a/ci/casper_updater/src/dependent_file.rs +++ b/ci/casper_updater/src/dependent_file.rs @@ -5,7 +5,7 @@ use std::{ use regex::Regex; -/// A file which is dependent on the version of a certain CasperLabs crate. +/// A file which is dependent on the version of a certain Casper crate. pub struct DependentFile { /// Full path to the file. path: PathBuf, diff --git a/ci/casper_updater/src/main.rs b/ci/casper_updater/src/main.rs index e34e96c070..00f30a5776 100644 --- a/ci/casper_updater/src/main.rs +++ b/ci/casper_updater/src/main.rs @@ -1,4 +1,4 @@ -//! A tool to update versions of all published CasperLabs packages. +//! A tool to update versions of all published Casper packages. #![warn(unused, missing_copy_implementations, missing_docs)] #![deny( diff --git a/ci/casper_updater/src/package.rs b/ci/casper_updater/src/package.rs index 451d9944d8..e0a6185980 100644 --- a/ci/casper_updater/src/package.rs +++ b/ci/casper_updater/src/package.rs @@ -16,7 +16,7 @@ use crate::{ const CAPTURE_INDEX: usize = 2; -/// Represents a published CasperLabs crate or AssemblyScript package which may need its version +/// Represents a published Casper crate or AssemblyScript package which may need its version /// updated. pub struct Package { /// This package's name as specified in its manifest. diff --git a/docker_make.sh b/docker_make.sh index 0cb6c22f0f..45857f4935 100755 --- a/docker_make.sh +++ b/docker_make.sh @@ -1,5 +1,5 @@ -# Images used in this script are build in CasperLabs/buildenv repo +# Images used in this script are build in Casper/buildenv repo # This allows make commands without local build environment setup or # using an OS version other than locally installed. diff --git a/execution_engine/Cargo.toml b/execution_engine/Cargo.toml index 90dc2afd7e..d4d6620bcf 100644 --- a/execution_engine/Cargo.toml +++ b/execution_engine/Cargo.toml @@ -3,7 +3,7 @@ name = "casper-execution-engine" version = "5.0.0" # when updating, also update 'html_root_url' in lib.rs authors = ["Henry Till ", "Ed Hastings "] edition = "2018" -description = "CasperLabs execution engine crates." +description = "Casper execution engine crates." readme = "README.md" documentation = "https://docs.rs/casper-execution-engine" homepage = "https://casperlabs.io" diff --git a/execution_engine/README.md b/execution_engine/README.md index a17089bbb1..a3c964350e 100644 --- a/execution_engine/README.md +++ b/execution_engine/README.md @@ -7,7 +7,7 @@ [![Documentation](https://docs.rs/casper-execution-engine/badge.svg)](https://docs.rs/casper-execution-engine) [![License](https://img.shields.io/badge/license-Apache-blue)](https://github.com/casper-network/casper-node/blob/master/LICENSE) -The main component of the CasperLabs Wasm execution engine. +The main component of the Casper Wasm execution engine. ## License diff --git a/execution_engine/src/lib.rs b/execution_engine/src/lib.rs index 572c2e65ea..d2123d9058 100644 --- a/execution_engine/src/lib.rs +++ b/execution_engine/src/lib.rs @@ -2,8 +2,8 @@ #![doc(html_root_url = "https://docs.rs/casper-execution-engine/5.0.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn( diff --git a/execution_engine_testing/test_support/src/lib.rs b/execution_engine_testing/test_support/src/lib.rs index 8171a6f21c..5f5d32338a 100644 --- a/execution_engine_testing/test_support/src/lib.rs +++ b/execution_engine_testing/test_support/src/lib.rs @@ -2,8 +2,8 @@ #![doc(html_root_url = "https://docs.rs/casper-engine-test-support/5.0.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn(missing_docs)] diff --git a/hashing/src/lib.rs b/hashing/src/lib.rs index f989fc0733..9535e1c1a1 100644 --- a/hashing/src/lib.rs +++ b/hashing/src/lib.rs @@ -1,8 +1,8 @@ //! A library providing hashing functionality including Merkle Proof utilities. #![doc(html_root_url = "https://docs.rs/casper-hashing/2.0.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn(missing_docs)] diff --git a/images/Casper-association-logo-new.svg b/images/Casper-association-logo-new.svg new file mode 100644 index 0000000000..1ad71fbc08 --- /dev/null +++ b/images/Casper-association-logo-new.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/Casper_Logo_Favicon.png b/images/Casper_Logo_Favicon.png new file mode 100644 index 0000000000..58434885e6 Binary files /dev/null and b/images/Casper_Logo_Favicon.png differ diff --git a/images/Casper_Logo_Favicon_48.png b/images/Casper_Logo_Favicon_48.png new file mode 100644 index 0000000000..f1333a2efe Binary files /dev/null and b/images/Casper_Logo_Favicon_48.png differ diff --git a/json_rpc/src/lib.rs b/json_rpc/src/lib.rs index 366d6c6fae..f82a79cce6 100644 --- a/json_rpc/src/lib.rs +++ b/json_rpc/src/lib.rs @@ -67,8 +67,8 @@ #![doc(html_root_url = "https://docs.rs/casper-json-rpc/1.1.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(deny(warnings))) )] #![warn( diff --git a/node/src/components/consensus/cl_context.rs b/node/src/components/consensus/cl_context.rs index a89b6a6b97..7d8225010f 100644 --- a/node/src/components/consensus/cl_context.rs +++ b/node/src/components/consensus/cl_context.rs @@ -54,7 +54,7 @@ impl ConsensusValueT for Arc { } } -/// The collection of types used for cryptography, IDs and blocks in the CasperLabs node. +/// The collection of types used for cryptography, IDs and blocks in the Casper node. #[derive(Clone, DataSize, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)] pub(crate) struct ClContext; diff --git a/node/src/components/rpc_server/rpcs/docs.rs b/node/src/components/rpc_server/rpcs/docs.rs index 97820a2883..ae6a477a77 100644 --- a/node/src/components/rpc_server/rpcs/docs.rs +++ b/node/src/components/rpc_server/rpcs/docs.rs @@ -37,11 +37,11 @@ const DEFINITIONS_PATH: &str = "#/components/schemas/"; // As per https://spec.open-rpc.org/#service-discovery-method. pub(crate) static OPEN_RPC_SCHEMA: Lazy = Lazy::new(|| { let contact = OpenRpcContactField { - name: "CasperLabs".to_string(), + name: "Casper Labs".to_string(), url: "https://casperlabs.io".to_string(), }; let license = OpenRpcLicenseField { - name: "CasperLabs Open Source License Version 1.0".to_string(), + name: "Casper Open Source License Version 1.0".to_string(), url: "https://raw.githubusercontent.com/CasperLabs/casper-node/master/LICENSE".to_string(), }; let info = OpenRpcInfoField { @@ -500,12 +500,12 @@ mod tests { fn check_optional_params_fields() -> Vec { let contact = OpenRpcContactField { - name: "CasperLabs".to_string(), + name: "Casper Labs".to_string(), url: "https://casperlabs.io".to_string(), }; let license = OpenRpcLicenseField { - name: "CasperLabs Open Source License Version 1.0".to_string(), - url: "https://raw.githubusercontent.com/CasperLabs/casper-node/master/LICENSE" + name: "APACHE LICENSE, VERSION 2.0".to_string(), + url: "https://www.apache.org/licenses/LICENSE-2.0" .to_string(), }; let info = OpenRpcInfoField { diff --git a/node/src/lib.rs b/node/src/lib.rs index 0b9e35c081..d7938250d1 100644 --- a/node/src/lib.rs +++ b/node/src/lib.rs @@ -10,8 +10,8 @@ #![doc(html_root_url = "https://docs.rs/casper-node/1.5.2")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn( diff --git a/node/src/types/json_compatibility/stored_value.rs b/node/src/types/json_compatibility/stored_value.rs index e65bb112c5..4d162f1c88 100644 --- a/node/src/types/json_compatibility/stored_value.rs +++ b/node/src/types/json_compatibility/stored_value.rs @@ -25,7 +25,7 @@ use super::{Account, Contract, ContractPackage}; #[derive(Clone, Eq, PartialEq, Serialize, Deserialize, Debug, JsonSchema)] #[serde(deny_unknown_fields)] pub enum StoredValue { - /// A CasperLabs value. + /// An instance of any variant of CLValue CLValue(CLValue), /// An account. Account(Account), diff --git a/resources/test/rpc_schema_hashing.json b/resources/test/rpc_schema_hashing.json index 2fa4031fe4..e1dd9d4ccb 100644 --- a/resources/test/rpc_schema_hashing.json +++ b/resources/test/rpc_schema_hashing.json @@ -13,8 +13,8 @@ "url": "https://casperlabs.io" }, "license": { - "name": "CasperLabs Open Source License Version 1.0", - "url": "https://raw.githubusercontent.com/CasperLabs/casper-node/master/LICENSE" + "name": "APACHE LICENSE, VERSION 2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0" } }, "servers": [ @@ -3466,7 +3466,7 @@ "description": "Representation of a value stored in global state.\n\n`Account`, `Contract` and `ContractPackage` have their own `json_compatibility` representations (see their docs for further info).", "anyOf": [ { - "description": "A CasperLabs value.", + "description": "An instance of any variant of CLValue.", "type": "object", "required": [ "CLValue" diff --git a/smart_contracts/contract/src/lib.rs b/smart_contracts/contract/src/lib.rs index 09e0e7864b..84f304be49 100644 --- a/smart_contracts/contract/src/lib.rs +++ b/smart_contracts/contract/src/lib.rs @@ -52,8 +52,8 @@ )] #![doc(html_root_url = "https://docs.rs/casper-contract/3.0.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn(missing_docs)] diff --git a/types/src/lib.rs b/types/src/lib.rs index 5fe27b0894..b763c41ea3 100644 --- a/types/src/lib.rs +++ b/types/src/lib.rs @@ -12,8 +12,8 @@ )] #![doc(html_root_url = "https://docs.rs/casper-types/3.0.0")] #![doc( - html_favicon_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Favicon_RGB_50px.png", - html_logo_url = "https://raw.githubusercontent.com/CasperLabs/casper-node/master/images/CasperLabs_Logo_Symbol_RGB.png", + html_favicon_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon_48.png", + html_logo_url = "https://raw.githubusercontent.com/casper-network/casper-node/blob/dev/images/Casper_Logo_Favicon.png", test(attr(forbid(warnings))) )] #![warn(missing_docs)]