Merge remote-tracking branch 'origin/develop' into feature/schema-com…

…parisons
radixdlt · Jul 1, 2024 · 57b8979 · 57b8979
2 parents af02c9a + 5be88f0
commit 57b8979
Show file tree

Hide file tree

Showing 102 changed files with 116,673 additions and 980 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -180,7 +180,8 @@ jobs:
       - name: Run tests
         run: |
           cargo nextest run \
-            --no-default-features --features alloc \
+            --no-default-features \
+            --features alloc \
             -p radix-common \
             -p radix-sbor-derive \
             -p radix-engine-interface \
@@ -311,22 +312,22 @@ jobs:
           shared-key: radix-clis-debug-${{ runner.os }}
           cache-directories: ~/.cargo/registry/src/**/librocksdb-sys-*
           workspaces: radix-clis
-      - name: Install rustc 1.78.0-nightly
+      - name: Install rustc 1.81.0-nightly
         run: |
-          rustup toolchain install nightly-2024-02-08
-          rustup target add wasm32-unknown-unknown --toolchain nightly-2024-02-08
-          rustup default nightly-2024-02-08
+          rustup toolchain install nightly-2024-06-28
+          rustup target add wasm32-unknown-unknown --toolchain nightly-2024-06-28
+          rustup default nightly-2024-06-28
           rustup show
-      - name: Install LLVM 17
+      - name: Install LLVM 18
         run: |
           sudo apt install lsb-release wget software-properties-common gnupg
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 18
       - name: Run tests
         working-directory: radix-clis
         run: bash ./tests/scrypto_coverage.sh
-        
+
   cargo-check:
     name: Run cargo check
     runs-on: ${{ matrix.os }}
@@ -360,7 +361,7 @@ jobs:
       - uses: RDXWorks-actions/checkout@main
       - name: Cargo Check
         run: |
-          sudo apt-get install libclang-dev -y 
+          sudo apt-get install libclang-dev -y
           curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
           sudo apt-get install git-lfs -y
       - name: Setup environment
@@ -374,4 +375,4 @@ jobs:
             --max-version 50000 \
             --breakpoints 10:91850a10dad5ec6d9a974663e87243b3f3ff8f8b1c0dd74135e8ddd097aa6276,100:8ac9b0caf4daad6f821038f325b215932e90fbabce089ca42bc0330c867aa8f8,1000:6b621e9c7f9674c3d71832aec822b695b0e90010dc6158a18e43fbacf296ef69,500000:7dd4403a757f43f4a885e914b8dc38086fdbaf96082fa90067acf1500075e85d
         working-directory: radix-clis
-  
+
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,6 +24,7 @@
         "descendents",
         "eddsa",
         "endregion",
+        "flamechart",
         "flamegraph",
         "Formattable",
         "generification",

diff --git a/Cargo.toml b/Cargo.toml
@@ -93,7 +93,7 @@ itertools = { version = "0.10.3" }
 lazy_static = { version = "1.4.0" }
 linreg = { version = "0.2.0" }
 lru = { version = "0.8.1", default-features = false }
-minicov = { version = "0.3" }
+minicov = { version = "=0.3.5" }
 moka = { version = "0.9.9", features = ["sync"], default-features = false }
 num-bigint = { version = "0.4.3", default-features = false }
 num-integer = { version = "0.1.45", default-features = false }
@@ -128,10 +128,18 @@ wasmer-compiler-singlepass = { version = "2.2.1" }
 wasmparser = { version = "0.107.0", default-features = false }
 extend = { version = "1.2.0" }
 zeroize = { version = "1.3.0" }
+inferno = { version = "0.11.19" }
+tempfile = { version = "3.8.0" }
+fslock = { version = "0.2.1" }
 
 # Both the release and test profiles use `panic = "unwind"` to allow certain parts of the Radix
 # Engine to be able to catch panics. As an example, the native-vm has a `catch_unwind` to catch
 # all panics that may occur in the native blueprints and convert them to `Result`s instead of
 # crashing the engine.
 [profile.release]
 panic = "unwind"
+
+# Optimize for speed for test profile to speed up the tests
+[profile.test]
+opt-level = 1
+
diff --git a/check_stack_usage.sh b/check_stack_usage.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGE=radix-engine-tests
+PACKAGES="-p radix-common -p radix-sbor-derive -p radix-engine-interface -p radix-engine -p radix-engine-tests"
 TARGET=system
 FILE=arguments
 TEST=vector_of_buckets_argument_should_succeed
@@ -24,7 +24,7 @@ function get_stack_usage() {
         stack=$(( $low + ($high - $low) / 2))
         echo checking stack $stack
 
-        if RUST_MIN_STACK=$stack cargo test -p $PACKAGE --test $TARGET $FILE::$TEST -- >$output 2>&1 ; then
+        if RUST_MIN_STACK=$stack cargo test $PACKAGES --test $TARGET $FILE::$TEST -- >$output 2>&1 ; then
             if grep 'stack overflow' $output ; then
                 cat $output
                 echo "unexpected error occurred"

diff --git a/examples/everything/Cargo.lock b/examples/everything/Cargo.lock
diff --git a/examples/everything/src/lib.rs b/examples/everything/src/lib.rs
@@ -132,6 +132,7 @@ mod everything {
                     }
                 })
                 .create_with_no_initial_supply()
+                .into()
         }
 
         pub fn protected_method(&self) {

diff --git a/examples/hello-world/Cargo.lock b/examples/hello-world/Cargo.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,6 +132,7 @@ mod everything { @@
                         }
                     })
                     .create_with_no_initial_supply()
+                    .into()
             }
             pub fn protected_method(&self) {
@@ Expand Down @@