Update cargo-psibase

.vscode/settings.json.sample

@@ -22,8 +22,9 @@
         "editor.formatOnSave": true,
         "editor.formatOnSaveMode": "file",
     },
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+    "[rust]": {
+        "editor.defaultFormatter": "rust-lang.rust-analyzer",
+        "editor.formatOnSave": true,
     },
     "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"]
 }

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.16.3)
 cmake_policy(VERSION 3.16.3...3.25.1)
 project(psibase)
+enable_testing()
 include(ExternalProject)
 
 if(CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -200,6 +201,22 @@ add_custom_command(
 add_custom_target(psibase.1 ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doc/psidk/psibase.1)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/psidk/psibase.1 TYPE MAN COMPONENT Client)
 
+# Cargo psibase
+ExternalProject_Add(
+    cargo-psibase
+    SOURCE_DIR          ${CMAKE_CURRENT_SOURCE_DIR}/rust
+    CONFIGURE_COMMAND   ""
+    BUILD_COMMAND       cargo build -r --bin cargo-psibase --manifest-path ${CMAKE_CURRENT_SOURCE_DIR}/rust/Cargo.toml --target-dir ${CMAKE_CURRENT_BINARY_DIR}/rust
+    BUILD_BYPRODUCTS    ${CMAKE_CURRENT_BINARY_DIR}/rust/release/cargo-psibase
+    BUILD_ALWAYS        1
+    INSTALL_COMMAND     ""
+)
+add_test(
+    NAME CargoTestCargoPsibase
+    COMMAND cargo test --manifest-path ${CMAKE_CURRENT_SOURCE_DIR}/rust/cargo-psibase/Cargo.toml
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rust/cargo-psibase/
+)
+
 # Run yarn to build service UIs
 set(JS_DIRS
     services/system/AccountSys/ui:AccountSys_js

README.md

@@ -48,27 +48,27 @@ Some of our developers have very strong success with Ubuntu on WSL2, and also wi
 
 The following is a list of dependencies you are required to install:
 
-| Package                    | Minimum Version | Description                                                                                                                         |
-| -------------------------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| autoconf                   | 2.69            | A tool for producing configure scripts for building, installing, and packaging software                                             |
-| binaryen                   | 113             | A compiler and toolchain infrastructure library for WebAssembly                                                                     |
-| boost                      | 1.78            | A collection of C++ libraries                                                                                                       |
-| clang + llvm               | 16              | The LLVM compiler and toolchain for C/C++ and the libraries to interface with it                                                    |
-| cmake                      | 3.16.3          | A build system generator that creates makefiles used for compilation                                                                |
-| g++                        | 11              | A GNU compiler for C++                                                                                                              |
-| libssl-dev                 | 1.1.1           | Development package for OpenSSL, enabling various cryptography and secure network communication                                     |
-| libtool                    | 2.4.6           | Script that simplifies the process of creating and using shared libraries                                                           |
-| make                       | 4.3             | Reads makefiles generated by cmake to build executables from source code                                                            |
-| node                       | 16.17.0         | A JavaScript runtime                                                                                                                |
-| pkg-config                 | 0.29.1          | A helper tool used during compilation to provide correct compiler flags, and to locate and manage library dependencies              |
-| Rust toolchain             | 1.63            | Develop programs in Rust. Use `cargo` to install `mdbook`, `mdbook-linkcheck`, `mdbook-mermaid`, `mdbook-pagetoc`, and `sccache`    |
-| Wasi SDK                   | 20.0            | A development toolchain for building WebAssembly programs that target the WebAssembly System Interface (WASI)                       |
-| zstd                       | 1.4.4           | Command-line utility that implements the Zstandard file compression algorithm                                                       |
+| Package                    | Minimum Version | Description                                                                                                                                                      |
+| -------------------------- | --------------- | -----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| autoconf                   | 2.69            | A tool for producing configure scripts for building, installing, and packaging software                                                                          |
+| binaryen                   | 113             | A compiler and toolchain infrastructure library for WebAssembly                                                                                                  |
+| boost                      | 1.78            | A collection of C++ libraries                                                                                                                                    |
+| clang + llvm               | 16              | The LLVM compiler and toolchain for C/C++ and the libraries to interface with it                                                                                 |
+| cmake                      | 3.16.3          | A build system generator that creates makefiles used for compilation                                                                                             |
+| g++                        | 11              | A GNU compiler for C++                                                                                                                                           |
+| libssl-dev                 | 1.1.1           | Development package for OpenSSL, enabling various cryptography and secure network communication                                                                  |
+| libtool                    | 2.4.6           | Script that simplifies the process of creating and using shared libraries                                                                                        |
+| make                       | 4.3             | Reads makefiles generated by cmake to build executables from source code                                                                                         |
+| node                       | 16.17.0         | A JavaScript runtime                                                                                                                                             |
+| pkg-config                 | 0.29.1          | A helper tool used during compilation to provide correct compiler flags, and to locate and manage library dependencies                                           |
+| Rust toolchain             | 1.73            | Develop programs in Rust. Use `cargo` to install `cargo-component`, `mdbook`, `mdbook-linkcheck`, `mdbook-mermaid`, `mdbook-pagetoc`, `sccache`, and `wasm-pack` |
+| Wasi SDK                   | 20.0            | A development toolchain for building WebAssembly programs that target the WebAssembly System Interface (WASI)                                                    |
+| zstd                       | 1.4.4           | Command-line utility that implements the Zstandard file compression algorithm                                                                                    |
 
 Other notes:
 * Add the paths to `node`, `npm`, `yarn`, `cargo`, and `wasm-opt` into your PATH environment variable.
 * Set the `WASI_SDK_PREFIX` environment variable before building to the root of your llvm installation (e.g. `/usr/lib/llvm-16`). Alternatively, set this variable during the build using the CMake flag `-DWASI_SDK_PREFIX=....`.
-* Add the wasm32-wasi target to rust.
+* Add the following targets to rust: `wasm32-wasi`, `wasm32-unknown-unknown`
 
 > 🔍 You can reference either the [Ubuntu 20.04 dockerfile](https://github.com/gofractally/image-builders/blob/main/docker/ubuntu-2004-builder.Dockerfile) or the [Ubuntu 22.04 dockerfile](https://github.com/gofractally/image-builders/blob/main/docker/ubuntu-2204-builder.Dockerfile) for an example on how an environment could be set up.