Merge pull request #694 from radixdlt/release/betanet-v1

Merge release/betanet-v1 into main for Scrypto 0.7 Betanet release
radixdlt · Dec 20, 2022 · 7c6595d · 7c6595d
2 parents 90ff067 + 0848b1a
commit 7c6595d
Show file tree

Hide file tree

Showing 672 changed files with 55,736 additions and 23,061 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,26 +1,55 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - develop
+      - docs
+      - alphanet
+      - betanet
+      - release/*
+  pull_request:
+    branches:
+      - main
+      - develop
+      - docs
+      - alphanet
+      - betanet
+      - release/*
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  cancel_running_workflows:
+    name: Cancel running workflows
+    runs-on: ubuntu-20.04
+    steps:
+      - name: cancel running workflows
+        uses: styfle/cancel-workflow-action@0.8.0
+        with:
+          access_token: ${{ github.token }}
+
   check-code-format:
     name: Check code format
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [linux]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - uses: bmwill/rust-cache@v1
+    - uses: Swatinem/rust-cache@master
       with:
-        path: ~/.cargo/registry/src/**/librocksdb-sys-*
-        working-directory: simulator
+        cache-directories: ~/.cargo/registry/src/**/librocksdb-sys-*
+        workspaces: simulator
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang -y
+      if: matrix.os == 'linux'
     - name: Install Scrypto toolchain
       run: cargo install --path ./simulator
     - name: Check format
@@ -30,9 +59,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
@@ -50,9 +79,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
@@ -70,9 +99,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
@@ -93,9 +122,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
@@ -110,22 +139,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
     - name: Add wasm target
       run: rustup target add wasm32-unknown-unknown
     - name: Add wasm target (nightly)
       run: rustup +nightly target add wasm32-unknown-unknown
     - name: Build account
       run: cargo build --target wasm32-unknown-unknown --release
-      working-directory: assets/account
-    - name: Build sys-faucet
+      working-directory: assets/blueprints/account
+    - name: Build faucet
       run: cargo build --target wasm32-unknown-unknown --release
-      working-directory: assets/sys-faucet
+      working-directory: assets/blueprints/faucet
     - name: Build no-std
       run: cargo build --target wasm32-unknown-unknown --release
       working-directory: examples/no-std
@@ -137,36 +170,62 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [linux]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - uses: bmwill/rust-cache@v1
-      with:
-        path: tests/**/target
-        working-directory: radix-engine
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
     - name: Add wasm target
       run: rustup target add wasm32-unknown-unknown
+    - name: Run tests
+      run: cargo test
+      working-directory: radix-engine-derive
+    - name: Run tests
+      run: cargo test
+      working-directory: radix-engine-interface
     - name: Run tests
       run: cargo test
       working-directory: radix-engine
+  radix-engine-no-std:
+    name: Run Radix Engine tests (no_std)
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [linux]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
+    - name: Add wasm target
+      run: rustup target add wasm32-unknown-unknown
+    - name: Run tests
+      run: cargo test --no-default-features --features alloc
+      working-directory: radix-engine
   radix-engine-wasmer:
     name: Run Radix Engine tests with Wasmer
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [linux]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - uses: bmwill/rust-cache@v1
-      with:
-        path: tests/**/target
-        working-directory: radix-engine
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
     - name: Add wasm target
       run: rustup target add wasm32-unknown-unknown
     - name: Run tests
@@ -177,16 +236,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [linux]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - uses: bmwill/rust-cache@v1
-      with:
-        path: tests/**/target
-        working-directory: radix-engine
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
     - name: Add wasm target
       run: rustup target add wasm32-unknown-unknown
     - name: Run bench
@@ -197,9 +256,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
@@ -211,16 +270,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [linux, windows-latest]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
-    - uses: bmwill/rust-cache@v1
+    - uses: Swatinem/rust-cache@master
       with:
-        path: ~/.cargo/registry/src/**/librocksdb-sys-*
-        working-directory: simulator
+        cache-directories: ~/.cargo/registry/src/**/librocksdb-sys-*
+        workspaces: simulator
+    - run: |
+        sudo apt-get update -qq
+        sudo apt-get install clang cmake -y
+      if: matrix.os == 'linux'
     - name: Add wasm target
       run: rustup target add wasm32-unknown-unknown
     - name: Set LIBCLANG_PATH # See https://github.com/rust-lang/rust-bindgen/issues/1797

diff --git a/.gitignore b/.gitignore
@@ -3,15 +3,70 @@
 
 # Rust auto-generated
 target/
-Cargo.lock
 **/*.rs.bk
 
+# CARGO.LOCK - Source controlling strategy
+#
+# We have multiple workspaces/crates in this repository:
+#
+# TYPE 1:
+# - The root workspace of libraries. As per docs in below link, libraries shouldn't have Cargo.lock source controlled.
+#   The Cargo.lock of packages is ignored anyway by crates pulling them in.
+#   https://doc.rust-lang.org/cargo/faq.html#why-do-binaries-have-cargolock-in-version-control-but-not-libraries
+Cargo.lock
+
+# TYPE 2:
+# - The simulator workspace/package. This is an application, and so has its Cargo.lock source controlled
+!simulator/Cargo.lock
+
+# TYPE 3:
+# - The asset scrypto packages. These need to be built deterministically, so include a Cargo.lock (at a shared workspace layer)
+#   But also keep blanket ignoring all the old Cargo.locks before they moved to blueprints, to avoid developer git issues
+assets/**/Cargo.lock
+!assets/blueprints/Cargo.lock
+
+# TYPE 4:
+# - Various test scrypto packages. We don't care too much about either way - but we do want CI to run without a lock, so let's git ignore these.
+#   Also make sure to blanket ignore all the old Cargo.locks before they moved to blueprints, to avoid developer git issues
+radix-engine/tests/**/Cargo.lock
+radix-engine/tests/blueprints/Cargo.lock
+simulator/tests/blueprints/Cargo.lock
+
+# TYPE 5:
+# - Examples should have their own Cargo.lock files to show good practice
+!examples/**/Cargo.lock
+
+# TYPE 6:
+# - Old cargo locks of crates now part of central workspace. These will be ignored by cargo now.
+#   Keep these git'ignored so that they don't cause confusion on developers' computers
+radix-engine/Cargo.lock
+radix-engine-stores/Cargo.lock
+scrypto/Cargo.lock
+scrypto-unit/Cargo.lock
+scrypto-derive/Cargo.lock
+scrypto-abi/Cargo.lock
+scrypto-tests/Cargo.lock
+transaction/Cargo.lock
+sbor/Cargo.lock
+sbor-derive/Cargo.lock
+sbor-tests/Cargo.lock
+
+# FURTHER DETAILS:
+# Our CI tests ensure that libraries can build and have their tests run with an empty lock file (ie, with the latest semver
+# crates available on crates.io).
+#
+# In the future, we leave the option open to including more Cargo.locks for more of the repository, to speed up our local
+# builds and provide a consistent set of dependencies developers can use to get-up-and-running.
+
 # Flamegraph profiles
 flamegraph.svg
 
 # IntelliJ
 .idea/
 
+# VScode
+.vscode/launch.json
+
 # Emacs
 *~
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,23 +1,19 @@
 {
     "rust-analyzer.linkedProjects": [
-        "radix-engine/Cargo.toml",
-        "radix-engine-stores/Cargo.toml",
-        "sbor/Cargo.toml",
-        "sbor-derive/Cargo.toml",
-        "sbor-tests/Cargo.toml",
-        "scrypto/Cargo.toml",
-        "scrypto-abi/Cargo.toml",
-        "scrypto-derive/Cargo.toml",
-        "scrypto-tests/Cargo.toml",
-        "scrypto-unit/Cargo.toml",
+        "Cargo.toml",
         "simulator/Cargo.toml",
-        "transaction/Cargo.toml",
     ],
     "cSpell.words": [
+        "bech",
+        "Decompilation",
         "decompile",
+        "eddsa",
         "instantiatable",
         "Instrumenter",
+        "persistable",
+        "Sbor",
         "Scrypto",
+        "Secp",
         "Substate",
         "substates",
         "Wasmer",