Merge pull request #1195 from sacherjj/release-0.9.4_to_master

Merging release-0.9.4 to master
casper-network · Mar 22, 2021 · 21c7434 · 21c7434
2 parents a4c27fc + 106d35f
commit 21c7434
Show file tree

Hide file tree

Showing 42 changed files with 539 additions and 186 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -391,6 +391,30 @@ steps:
     CL_VAULT_HOST:
       from_secret: vault_host
 
+- name: publish-repo-prod
+  image: casperlabs/aptly:latest
+  failure: ignore
+  environment:
+    AWS_SECRET_ACCESS_KEY:
+      from_secret: aptly_prod_secret_key
+    AWS_ACCESS_KEY_ID:
+      from_secret: aptly_prod_key_id
+  settings:
+    repo_name:
+      from_secret: aptly_prod_repo
+    region:
+      from_secret: aptly_prod_region
+    gpg_key:
+      from_secret: aptly_prod_gpg_key
+    gpg_pass:
+      from_secret: aptly_prod_gpg_pass
+    distribution_id:
+      from_secret: aptly_prod_dist_id
+    acl: 'public-read'
+    prefix: 'releases'
+    deb_path: './target/debian'
+    deb_name: '*.deb'
+
 - name: build-upgrade-package
   image: casperlabs/node-build-u1804
   commands:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "casper-client"
-version = "0.9.3"
+version = "0.9.4"
 authors = ["Marc Brinkmann <marc@casperlabs.io>", "Fraser Hutchison <fraser@casperlabs.io>"]
 edition = "2018"
 description = "A client for interacting with the Casper network"
@@ -22,9 +22,9 @@ doc = false
 
 [dependencies]
 base64 = "0.13.0"
-casper-execution-engine = { version = "0.9.3", path = "../execution_engine" }
-casper-node = { version = "0.9.3", path = "../node" }
-casper-types = { version = "0.9.3", path = "../types", features = ["std"] }
+casper-execution-engine = { version = "0.9.4", path = "../execution_engine" }
+casper-node = { version = "0.9.4", path = "../node" }
+casper-types = { version = "0.9.4", path = "../types", features = ["std"] }
 clap = "2.33.1"
 futures = "0.3.5"
 hex = { version = "0.4.2", features = ["serde"] }

diff --git a/execution_engine/Cargo.toml b/execution_engine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "casper-execution-engine"
-version = "0.9.3" # when updating, also update 'html_root_url' in lib.rs
+version = "0.9.4" # when updating, also update 'html_root_url' in lib.rs
 authors = ["Henry Till <henrytill@gmail.com>", "Ed Hastings <ed@casperlabs.io>"]
 edition = "2018"
 description = "CasperLabs execution engine crates."
@@ -15,7 +15,7 @@ anyhow = "1.0.33"
 base16 = "0.2.1"
 bincode = "1.3.1"
 blake2 = "0.9.0"
-casper-types = { version = "0.9.3", path = "../types", features = ["std", "gens"] }
+casper-types = { version = "0.9.4", path = "../types", features = ["std", "gens"] }
 chrono = "0.4.10"
 datasize = "0.2.4"
 hex = "0.4.2"

diff --git a/execution_engine/src/core/engine_state/genesis.rs b/execution_engine/src/core/engine_state/genesis.rs
@@ -693,6 +693,9 @@ pub enum GenesisError {
     InvalidBondAmount {
         public_key: PublicKey,
     },
+    InvalidDelegatedAmount {
+        public_key: PublicKey,
+    },
 }
 
 pub(crate) struct GenesisInstaller<S>
@@ -879,7 +882,15 @@ where
         let genesis_delegators: Vec<_> = self.exec_config.get_bonded_delegators().collect();
 
         // Make sure all delegators have corresponding genesis validator entries
-        for (&validator_public_key, &delegator_public_key, ..) in &genesis_delegators {
+        for (&validator_public_key, &delegator_public_key, _balance, delegated_amount) in
+            &genesis_delegators
+        {
+            if delegated_amount.is_zero() {
+                return Err(GenesisError::InvalidDelegatedAmount {
+                    public_key: delegator_public_key,
+                });
+            }
+
             if genesis_validators
                 .iter()
                 .find(|genesis_validator| genesis_validator.public_key() == validator_public_key)

diff --git a/execution_engine/src/lib.rs b/execution_engine/src/lib.rs
@@ -1,6 +1,6 @@
 //! The engine which executes smart contracts on the Casper network.
 
-#![doc(html_root_url = "https://docs.rs/casper-execution-engine/0.9.3")]
+#![doc(html_root_url = "https://docs.rs/casper-execution-engine/0.9.4")]
 #![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",

diff --git a/execution_engine_testing/cargo_casper/Cargo.toml b/execution_engine_testing/cargo_casper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-casper"
-version = "0.9.3"
+version = "0.9.4"
 authors = ["Fraser Hutchison <fraser@casperlabs.io>"]
 edition = "2018"
 description = "Command line tool for creating a Wasm smart contract and tests for use on the Casper network."

diff --git a/execution_engine_testing/cargo_casper/src/common.rs b/execution_engine_testing/cargo_casper/src/common.rs
@@ -12,9 +12,9 @@ use once_cell::sync::Lazy;
 use crate::{dependency::Dependency, ARGS, FAILURE_EXIT_CODE};
 
 pub static CL_CONTRACT: Lazy<Dependency> =
-    Lazy::new(|| Dependency::new("casper-contract", "0.9.3", "smart_contracts/contract"));
+    Lazy::new(|| Dependency::new("casper-contract", "0.9.4", "smart_contracts/contract"));
 pub static CL_TYPES: Lazy<Dependency> =
-    Lazy::new(|| Dependency::new("casper-types", "0.9.3", "types"));
+    Lazy::new(|| Dependency::new("casper-types", "0.9.4", "types"));
 
 pub fn print_error_and_exit(msg: &str) -> ! {
     e_red!("error");

diff --git a/execution_engine_testing/cargo_casper/src/tests_package.rs b/execution_engine_testing/cargo_casper/src/tests_package.rs
@@ -114,7 +114,7 @@ static INTEGRATION_TESTS_RS: Lazy<PathBuf> = Lazy::new(|| {
 static ENGINE_TEST_SUPPORT: Lazy<Dependency> = Lazy::new(|| {
     Dependency::new(
         "casper-engine-test-support",
-        "0.9.3",
+        "0.9.4",
         "execution_engine_testing/test_support",
     )
 });

diff --git a/execution_engine_testing/test_support/Cargo.toml b/execution_engine_testing/test_support/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "casper-engine-test-support"
-version = "0.9.3" # when updating, also update 'html_root_url' in lib.rs
+version = "0.9.4" # when updating, also update 'html_root_url' in lib.rs
 authors = ["Fraser Hutchison <fraser@casperlabs.io>"]
 edition = "2018"
 description = "Library to support testing of Wasm smart contracts for use on the Casper network."
@@ -11,9 +11,9 @@ repository = "https://github.com/CasperLabs/casper-node/tree/master/execution_en
 license-file = "../../LICENSE"
 
 [dependencies]
-casper-contract = { version = "0.9.3", path = "../../smart_contracts/contract", features = ["std"] }
-casper-execution-engine = { version = "0.9.3", path = "../../execution_engine", features = ["gens"] }
-casper-types = { version = "0.9.3", path = "../../types", features = ["std"] }
+casper-contract = { version = "0.9.4", path = "../../smart_contracts/contract", features = ["std"] }
+casper-execution-engine = { version = "0.9.4", path = "../../execution_engine", features = ["gens"] }
+casper-types = { version = "0.9.4", path = "../../types", features = ["std"] }
 lmdb = "0.8.0"
 log = "0.4.8"
 num-rational = "0.3.0"

diff --git a/execution_engine_testing/test_support/src/lib.rs b/execution_engine_testing/test_support/src/lib.rs
@@ -56,7 +56,7 @@
 //! assert_eq!(expected_value, returned_value);
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/casper-engine-test-support/0.9.3")]
+#![doc(html_root_url = "https://docs.rs/casper-engine-test-support/0.9.4")]
 #![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",