Merge branch 'release/rcnet-v3'

radixdlt · Aug 31, 2023 · a07c00c · a07c00c
2 parents 0aa9576 + fd0cde0
commit a07c00c
Show file tree

Hide file tree

Showing 192 changed files with 13,197 additions and 5,628 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
       - release/*
       - develop
       - main
+      - linux-builds-fix
 jobs:
   build:
     runs-on: ${{ matrix.build-target.runner }}
@@ -30,7 +31,7 @@ jobs:
           # Linux Targets
           - crate: radix-engine-toolkit-uniffi
             target-triple: x86_64-unknown-linux-gnu
-            runner: ubuntu-latest
+            runner: ubuntu-20.04
           - crate: radix-engine-toolkit-uniffi
             target-triple: aarch64-unknown-linux-gnu
             runner: ubuntu-latest
@@ -91,6 +92,7 @@ jobs:
       - name: Build Dependencies (aarch64 linux)
         if: ${{ matrix.build-target.target-triple == 'aarch64-unknown-linux-gnu' }}
         run: | 
+          sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu
           echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
           echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
@@ -130,9 +132,7 @@ jobs:
         #   SCCACHE_GHA_ENABLED: "true"
         #   RUSTC_WRAPPER: "sccache"
         run: |
-          cargo +nightly build \
-            -Z build-std=std,panic_abort \
-            -Z build-std-features=panic_immediate_abort \
+          cargo build \
             --target ${{ matrix.build-target.target-triple }} \
             --release
       - name: Clean Build Artifacts

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        crate: [ radix-engine-toolkit, radix-engine-toolkit-core ]
+        crate: [ radix-engine-toolkit, radix-engine-toolkit-core, sbor-json ]
 
     steps:
     - uses: actions/checkout@v3

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,7 @@
         "radix-engine-toolkit-uniffi/Cargo.toml",
         "radix-engine-toolkit-core/Cargo.toml",
         "radix-engine-toolkit/Cargo.toml",
+        "sbor-json/Cargo.toml",
         "generator/Cargo.toml",
         "uniffi-bindgen/Cargo.toml"
     ],
@@ -12,6 +13,7 @@
         "ansharnet",
         "archiver",
         "bootstrapper",
+        "btreeset",
         "cbrt",
         "decryptors",
         "Devopsnet",
@@ -23,6 +25,7 @@
         "Localnet",
         "mardunet",
         "Milestonenet",
+        "moka",
         "nebunet",
         "nergalnet",
         "openapi",
@@ -35,9 +38,11 @@
         "rustfmt",
         "rustup",
         "Sandpitnet",
+        "Securification",
         "Swatinem",
         "testcases",
         "thiserror",
+        "typeshare",
         "unhashed",
         "uniffi",
         "unstake",

diff --git a/build_wasm.sh b/build_wasm.sh
@@ -0,0 +1,13 @@
+cd radix-engine-toolkit
+cargo +nightly build \
+    -Z build-std=std,panic_abort \
+    -Z build-std-features=panic_immediate_abort \
+    --target wasm32-unknown-unknown \
+    --release
+npx wasm-opt@1.4 -Oz -g \
+    --strip-dwarf \
+    --strip-debug \
+    --strip-producers \
+    -o \
+    ./target/wasm32-unknown-unknown/release/radix_engine_toolkit.wasm \
+    ./target/wasm32-unknown-unknown/release/radix_engine_toolkit.wasm
diff --git a/format.sh b/format.sh
@@ -1,2 +1,4 @@
 (cd radix-engine-toolkit-core; cargo +nightly fmt)
-(cd radix-engine-toolkit; cargo +nightly fmt)
+(cd radix-engine-toolkit; cargo +nightly fmt)
+(cd radix-engine-toolkit-uniffi; cargo +nightly fmt)
+(cd sbor-json; cargo +nightly fmt)