Merge remote-tracking branch 'upstream/dev' into remove_unnecessary_d…

…eploy_check

.drone.yml

@@ -151,7 +151,7 @@ steps:
 - name: check CPU features
   <<: *buildenv
   commands:
-  - bash -i ./ci/check_cpu_features.sh
+  - ./ci/check_cpu_features.sh
 
 volumes:
 - name: rustup

.harness/Build_casper_network_casper_node_1701192539136-pr-trigger-input-set-1701192540559.yaml

@@ -0,0 +1,14 @@
+inputSet:
+  name: Build_casper_network_casper_node_1701192539136-pr-trigger-input-set
+  identifier: Build_casper_network_casper_node_1701192539136prtriggerinputset
+  orgIdentifier: default
+  projectIdentifier: caspernode
+  pipeline:
+    identifier: Build_casper_network_casper_node_1701192539136
+    properties:
+      ci:
+        codebase:
+          build:
+            type: PR
+            spec:
+              number: <+trigger.prNumber>

.harness/Build_casper_network_casper_node_1701192539136-push-trigger-input-set-1701192542073.yaml

@@ -0,0 +1,14 @@
+inputSet:
+  name: Build_casper_network_casper_node_1701192539136-push-trigger-input-set
+  identifier: Build_casper_network_casper_node_1701192539136pushtriggerinputset
+  orgIdentifier: default
+  projectIdentifier: caspernode
+  pipeline:
+    identifier: Build_casper_network_casper_node_1701192539136
+    properties:
+      ci:
+        codebase:
+          build:
+            type: branch
+            spec:
+              branch: <+trigger.branch>

.harness/Build_casper_network_casper_node_1701271611457-pr-trigger-input-set-1701271613224.yaml

@@ -0,0 +1,14 @@
+inputSet:
+  name: Build_casper_network_casper_node_1701271611457-pr-trigger-input-set
+  identifier: Build_casper_network_casper_node_1701271611457prtriggerinputset
+  orgIdentifier: default
+  projectIdentifier: default_project
+  pipeline:
+    identifier: Build_casper_network_casper_node_1701271611457
+    properties:
+      ci:
+        codebase:
+          build:
+            type: PR
+            spec:
+              number: <+trigger.prNumber>

.harness/Build_casper_network_casper_node_1701271611457-push-trigger-input-set-1701271614894.yaml

@@ -0,0 +1,14 @@
+inputSet:
+  name: Build_casper_network_casper_node_1701271611457-push-trigger-input-set
+  identifier: Build_casper_network_casper_node_1701271611457pushtriggerinputset
+  orgIdentifier: default
+  projectIdentifier: default_project
+  pipeline:
+    identifier: Build_casper_network_casper_node_1701271611457
+    properties:
+      ci:
+        codebase:
+          build:
+            type: branch
+            spec:
+              branch: <+trigger.branch>

.harness/pipelines/casper-node-1701192514017.yaml

@@ -0,0 +1,33 @@
+pipeline:
+  name: Build casper-node
+  identifier: Build_casper_network_casper_node_1701192539136
+  projectIdentifier: caspernode
+  orgIdentifier: default
+  stages:
+    - stage:
+        name: Build
+        identifier: Build
+        type: CI
+        spec:
+          cloneCodebase: true
+          execution:
+            steps:
+              - step:
+                  type: Run
+                  name: Echo Welcome Message
+                  identifier: Echo_Welcome_Message
+                  spec:
+                    shell: Sh
+                    command: echo "Welcome to Harness CI"
+          platform:
+            os: Linux
+            arch: Amd64
+          runtime:
+            type: Cloud
+            spec: {}
+  properties:
+    ci:
+      codebase:
+        connectorRef: org.casperdrone_github_connector
+        repoName: casper-network/casper-node
+        build: <+input>

.harness/pipelines/casper-node-1701271532603.yaml

@@ -0,0 +1,46 @@
+pipeline:
+  identifier: Build_casper_network_casper_node_1701271611457
+  name: Build casper-node
+  orgIdentifier: default
+  projectIdentifier: default_project
+  properties:
+    ci:
+      codebase:
+        connectorRef: org.casperdrone_github_connector
+        repoName: casper-node
+        build: <+input>
+  stages:
+    - stage:
+        identifier: build
+        name: build
+        spec:
+          cloneCodebase: true
+          execution:
+            steps:
+              - step:
+                  type: Run
+                  name: build casper-node
+                  identifier: cargotestpush
+                  spec:
+                    connectorRef: dockerhub
+                    image: casperlabs/node-build-u1804
+                    shell: Bash
+                    command: |-
+                      cargo install elfx86exts --version 0.5.0
+                      make setup
+                      make test CARGO_FLAGS=--release
+                      make test-contracts CARGO_FLAGS=--release
+                    resources:
+                      limits:
+                        memory: 16Gi
+                        cpu: "12"
+          infrastructure:
+            type: KubernetesDirect
+            spec:
+              connectorRef: org.casperkube
+              namespace: default
+              automountServiceAccountToken: true
+              nodeSelector: {}
+              os: Linux
+        type: CI
+        description: ""

Cargo.toml

@@ -31,6 +31,8 @@ default-members = [
 
 exclude = ["utils/nctl/remotes/casper-client-rs"]
 
+resolver = "2"
+
 # Include debug symbols in the release build of `casper-engine-tests` so that `simple-transfer` will yield useful
 # perf data.
 [profile.release.package.casper-engine-tests]

README.md

@@ -196,7 +196,7 @@ multiple nodes provided all logs are available.
 Another helpful logging feature is ancestor logging. If the target `dispatch` is set to at least debug level, events
 being dispatched will be logged as well. Any event has an id (`ev`) and may have an ancestor (`a`), which is the previous
 event whose effects caused the resulting event to be scheduled. As an example, if an incoming network message gets
-asssigned an ID of `ev=123`, the first round of subsequent events will show `a=123` as their ancestor in the logs.
+assigned an ID of `ev=123`, the first round of subsequent events will show `a=123` as their ancestor in the logs.
 
 ### Changing the logging filter at runtime
 

ci/casper_updater/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Fraser Hutchison <fraser@casperlabs.io>"]
 description = "A tool to update versions of all published Casper packages."
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 name = "casper-updater"
 readme = "README.md"

ci/casper_updater/src/regex_data.rs

@@ -261,7 +261,7 @@ pub mod chainspec_protocol_version {
             ),
             DependentFile::new(
                 "node/src/components/rpc_server/rpcs/docs.rs",
-                Regex::new(r#"(?m)(DOCS_EXAMPLE_PROTOCOL_VERSION: ProtocolVersion =\s*ProtocolVersion::from_parts)\((\d+,\s*\d+,\s*\d+)\)"#).unwrap(),
+                Regex::new(r"(?m)(DOCS_EXAMPLE_PROTOCOL_VERSION: ProtocolVersion =\s*ProtocolVersion::from_parts)\((\d+,\s*\d+,\s*\d+)\)").unwrap(),
                 rpcs_docs_rs_replacement,
             ),
             DependentFile::new(

ci/check_cpu_features.sh

@@ -1,13 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Ensure that there has not been a change in CPU features used.
 
 set -e
 
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null 2>&1 && pwd)"
+cd $(dirname $0)/..
 
-cd ${ROOT_DIR}
-cargo build --release
+cargo build --release --bin casper-node
 utils/dump-cpu-features.sh target/release/casper-node > current-build-cpu-features.txt
 diff -u current-build-cpu-features.txt ci/cpu-features-1.4.13-release.txt
 echo "Check passed, instruction set extensions in node binary have not been changed since 1.4.13"

ci/nightly-test.sh

@@ -119,6 +119,8 @@ start_run_teardown "sync_test.sh timeout=500"
 start_run_teardown "swap_validator_set.sh"
 start_run_teardown "sync_upgrade_test.sh node=6 era=5 timeout=500"
 start_run_teardown "validators_disconnect.sh"
+start_run_teardown "slow-node-01.sh"
+start_run_teardown "slow-node-02.sh"
 # Without start_run_teardown - these ones perform their own assets setup, network start and teardown
 source "$SCENARIOS_DIR/upgrade_after_emergency_upgrade_test_pre_1.5.sh"
 source "$SCENARIOS_DIR/regression_3976.sh"