diff --git a/CMakeLists.txt b/CMakeLists.txt index 31958807d..a4aa1248d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,7 +358,7 @@ include(libraries/psibase/sdk/pack_service.cmake) set(SERVICE_DIR ${CMAKE_CURRENT_BINARY_DIR}/share/psibase/packages) -set(PSIBASE_VERSION "0.10.0") +set(PSIBASE_VERSION "0.11.0") psibase_package( OUTPUT ${SERVICE_DIR}/Transact.psi diff --git a/dev/DemoApp1/plugin/Cargo.lock b/dev/DemoApp1/plugin/Cargo.lock index 8c7adfdea..fd054779d 100644 --- a/dev/DemoApp1/plugin/Cargo.lock +++ b/dev/DemoApp1/plugin/Cargo.lock @@ -661,10 +661,12 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", + "indexmap 2.2.6", "psibase_macros", + "serde", ] [[package]] @@ -986,6 +988,7 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", + "serde", ] [[package]] @@ -1365,7 +1368,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -1383,6 +1386,7 @@ dependencies = [ "getrandom", "hmac", "include_dir", + "indexmap 2.2.6", "indicatif", "jwt", "mime_guess", @@ -1394,6 +1398,7 @@ dependencies = [ "reqwest", "ripemd", "rpassword", + "scopeguard", "sec1", "secp256k1", "serde", @@ -1414,7 +1419,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -1426,7 +1431,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] diff --git a/dev/DemoApp1/service/Cargo.lock b/dev/DemoApp1/service/Cargo.lock index 72e97f5ea..8c056a06c 100644 --- a/dev/DemoApp1/service/Cargo.lock +++ b/dev/DemoApp1/service/Cargo.lock @@ -652,10 +652,12 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", + "indexmap 2.2.6", "psibase_macros", + "serde", ] [[package]] @@ -977,6 +979,7 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", + "serde", ] [[package]] @@ -1356,7 +1359,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -1374,6 +1377,7 @@ dependencies = [ "getrandom", "hmac", "include_dir", + "indexmap 2.2.6", "indicatif", "jwt", "mime_guess", @@ -1385,6 +1389,7 @@ dependencies = [ "reqwest", "ripemd", "rpassword", + "scopeguard", "sec1", "secp256k1", "serde", @@ -1405,7 +1410,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -1417,7 +1422,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] diff --git a/dev/DemoApp1/service/Cargo.toml b/dev/DemoApp1/service/Cargo.toml index b8f985f33..92a60f070 100644 --- a/dev/DemoApp1/service/Cargo.toml +++ b/dev/DemoApp1/service/Cargo.toml @@ -9,8 +9,8 @@ path = "src/lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -psibase_macros = { version = "0.10.0", path = "../../../rust/psibase_macros" } -psibase = { version = "0.10.0", path = "../../../rust/psibase" } +psibase_macros = { path = "../../../rust/psibase_macros" } +psibase = { path = "../../../rust/psibase" } serde = { version = "1", features = ["derive"] } async-graphql = "4.0" diff --git a/libraries/psibase/common/include/psibase/version.hpp b/libraries/psibase/common/include/psibase/version.hpp index 0612f4e40..766531477 100644 --- a/libraries/psibase/common/include/psibase/version.hpp +++ b/libraries/psibase/common/include/psibase/version.hpp @@ -1,5 +1,5 @@ #pragma once #define PSIBASE_VERSION_MAJOR 0 -#define PSIBASE_VERSION_MINOR 10 +#define PSIBASE_VERSION_MINOR 11 #define PSIBASE_VERSION_PATCH 0 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 64117da7e..281ac1391 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -358,7 +358,7 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "burst-transfer" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "chrono", @@ -414,7 +414,7 @@ dependencies = [ [[package]] name = "cargo-psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "cargo_metadata", @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "elections" -version = "0.10.0" +version = "0.11.0" dependencies = [ "fracpack", "psibase", @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "example" -version = "0.10.0" +version = "0.11.0" dependencies = [ "async-graphql", "psibase", @@ -987,7 +987,7 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", "indexmap 2.2.6", @@ -1105,7 +1105,7 @@ dependencies = [ [[package]] name = "gen-cpp-doc" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "clang", @@ -1750,7 +1750,7 @@ dependencies = [ [[package]] name = "md2man" -version = "0.10.0" +version = "0.11.0" dependencies = [ "clap", "pulldown-cmark 0.9.6", @@ -2342,7 +2342,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -2393,7 +2393,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] @@ -2959,7 +2959,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "sites" -version = "0.10.0" +version = "0.11.0" dependencies = [ "async-graphql", "fracpack", @@ -3080,7 +3080,7 @@ dependencies = [ [[package]] name = "subjective" -version = "0.10.0" +version = "0.11.0" dependencies = [ "psibase", "psibase_macros", @@ -3224,7 +3224,7 @@ dependencies = [ [[package]] name = "test_contract" -version = "0.10.0" +version = "0.11.0" dependencies = [ "psibase", "serde", @@ -3233,7 +3233,7 @@ dependencies = [ [[package]] name = "test_fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "cxx", "cxx-build", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 736b5bffb..c381619ce 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -17,7 +17,7 @@ members = [ ] [workspace.package] -version = "0.10.0" +version = "0.11.0" rust-version = "1.64" repository = "https://github.com/gofractally/psibase" homepage = "https://psibase.io" diff --git a/rust/burst-transfer/Cargo.toml b/rust/burst-transfer/Cargo.toml index d78c9fbfa..73b222e5d 100644 --- a/rust/burst-transfer/Cargo.toml +++ b/rust/burst-transfer/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0" chrono = "0.4" clap = {version = "4.5", features = ["derive"]} futures = "0.3" -psibase = { version = "0.10.0", path = "../psibase" } +psibase = { version = "0.11.0", path = "../psibase" } rand = "0.8.5" reqwest = { version = "0.11", default-features = false, features = ["json","rustls-tls"] } serde = { version = "1.0", features = ["derive"] } diff --git a/rust/cargo-psibase/Cargo.toml b/rust/cargo-psibase/Cargo.toml index 31755d22a..526517e14 100644 --- a/rust/cargo-psibase/Cargo.toml +++ b/rust/cargo-psibase/Cargo.toml @@ -14,7 +14,7 @@ wasm-opt = "0.116.0" cargo_metadata = "0.18.1" clap = { version = "4.4", features = ["derive"]} console = "0.15.2" -psibase = { version = "0.10.0", path = "../psibase" } +psibase = { version = "0.11.0", path = "../psibase" } regex = "1" serde_json = "1.0" tokio = { version = "1", features = ["full"] } diff --git a/rust/fracpack/Cargo.toml b/rust/fracpack/Cargo.toml index 6f356ffad..3b1f99c5a 100644 --- a/rust/fracpack/Cargo.toml +++ b/rust/fracpack/Cargo.toml @@ -15,4 +15,4 @@ path = "src/fracpack.rs" custom_error = "1.9.2" indexmap = { version = "2.2.6", features = ["std", "serde"] } serde = { version = "1.0", features = ["derive", "rc"] } -psibase_macros = { version = "0.10.0", path = "../psibase_macros" } +psibase_macros = { version = "0.11.0", path = "../psibase_macros" } diff --git a/rust/psibase/Cargo.toml b/rust/psibase/Cargo.toml index 3c0c2666f..9391e1c9d 100644 --- a/rust/psibase/Cargo.toml +++ b/rust/psibase/Cargo.toml @@ -19,7 +19,7 @@ async-trait = "0.1.77" chrono = "0.4" const_format = "0.2" custom_error = "1.9" -fracpack = { version = "0.10.0", path = "../fracpack" } +fracpack = { version = "0.11.0", path = "../fracpack" } flate2 = "1.0" futures = "0.3" getrandom = { version = "0.2", features = ["js"] } @@ -28,8 +28,8 @@ indexmap = { version = "2.2.6", features = ["std", "serde"] } sha2 = "0.10" mime_guess = "2.0" percent-encoding = "2.3" -psibase_macros = { version = "0.10.0", path = "../psibase_macros" } -psibase_names = { version = "0.10.0", path = "../psibase_names" } +psibase_macros = { version = "0.11.0", path = "../psibase_macros" } +psibase_names = { version = "0.11.0", path = "../psibase_names" } regex = "1" ripemd = "0.1" scopeguard = "1.2" diff --git a/rust/psibase_macros/Cargo.toml b/rust/psibase_macros/Cargo.toml index af786b01d..b46cf1f42 100644 --- a/rust/psibase_macros/Cargo.toml +++ b/rust/psibase_macros/Cargo.toml @@ -15,6 +15,6 @@ proc-macro = true darling = "0.14" proc-macro-error = "1.0.4" proc-macro2 = "1.0.36" -psibase_names = { version = "0.10.0", path = "../psibase_names" } +psibase_names = { version = "0.11.0", path = "../psibase_names" } quote = "1.0.15" syn = {version = "1.0.86", features = ["full", "visit-mut"] } diff --git a/rust/test_contract/Cargo.toml b/rust/test_contract/Cargo.toml index 472971cfb..ab4b5a0b7 100644 --- a/rust/test_contract/Cargo.toml +++ b/rust/test_contract/Cargo.toml @@ -11,6 +11,6 @@ publish = false crate-type = ["cdylib"] [dependencies] -psibase = { version = "0.10.0", path = "../psibase" } +psibase = { version = "0.11.0", path = "../psibase" } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/rust/test_contract_2/Cargo.toml b/rust/test_contract_2/Cargo.toml index c236c30d8..3eab365a1 100644 --- a/rust/test_contract_2/Cargo.toml +++ b/rust/test_contract_2/Cargo.toml @@ -13,8 +13,8 @@ crate-type = ["cdylib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -psibase_macros = { version = "0.10.0", path = "../psibase_macros" } -psibase = { version = "0.10.0", path = "../psibase" } +psibase_macros = { version = "0.11.0", path = "../psibase_macros" } +psibase = { version = "0.11.0", path = "../psibase" } serde = { version = "1", features = ["derive"] } serde_json = "1.0" async-graphql = "4.0" diff --git a/rust/test_fracpack/Cargo.toml b/rust/test_fracpack/Cargo.toml index a8870f7b7..06e0536da 100644 --- a/rust/test_fracpack/Cargo.toml +++ b/rust/test_fracpack/Cargo.toml @@ -9,9 +9,9 @@ publish = false [dependencies] cxx = "1.0" -fracpack = { version = "0.10.0", path = "../fracpack" } +fracpack = { version = "0.11.0", path = "../fracpack" } hex = "0.3.1" -psibase_macros = { version = "0.10.0", path = "../psibase_macros" } +psibase_macros = { version = "0.11.0", path = "../psibase_macros" } [build-dependencies] cxx-build = "1.0" diff --git a/rust/test_service_elections/Cargo.toml b/rust/test_service_elections/Cargo.toml index 1bfd73078..ac891ac90 100644 --- a/rust/test_service_elections/Cargo.toml +++ b/rust/test_service_elections/Cargo.toml @@ -11,6 +11,6 @@ publish = false crate-type = ["cdylib"] [dependencies] -fracpack = { version = "0.10.0", path = "../fracpack" } -psibase = { version = "0.10.0", path = "../psibase" } +fracpack = { version = "0.11.0", path = "../fracpack" } +psibase = { version = "0.11.0", path = "../psibase" } serde = { version = "1.0.145", features = ["derive"] } diff --git a/rust/test_service_sites/Cargo.toml b/rust/test_service_sites/Cargo.toml index e10d9d9ac..d7886e8a0 100644 --- a/rust/test_service_sites/Cargo.toml +++ b/rust/test_service_sites/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["cdylib"] [dependencies] async-graphql = "4.0" -fracpack = { version = "0.10.0", path = "../fracpack" } -psibase = { version = "0.10.0", path = "../psibase" } +fracpack = { version = "0.11.0", path = "../fracpack" } +psibase = { version = "0.11.0", path = "../psibase" } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0" diff --git a/rust/test_subjective/Cargo.toml b/rust/test_subjective/Cargo.toml index b2c86a7dc..d46b1f67d 100644 --- a/rust/test_subjective/Cargo.toml +++ b/rust/test_subjective/Cargo.toml @@ -13,6 +13,6 @@ crate-type = ["cdylib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -psibase_macros = { version = "0.10.0", path = "../psibase_macros" } -psibase = { version = "0.10.0", path = "../psibase" } +psibase_macros = { version = "0.11.0", path = "../psibase_macros" } +psibase = { version = "0.11.0", path = "../psibase" } serde = { version = "1", features = ["derive"] } diff --git a/services/system/Accounts/plugin/Cargo.lock b/services/system/Accounts/plugin/Cargo.lock index be75d9659..95f10f52c 100644 --- a/services/system/Accounts/plugin/Cargo.lock +++ b/services/system/Accounts/plugin/Cargo.lock @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", "indexmap 2.2.6", @@ -1367,7 +1367,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -1418,7 +1418,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -1430,7 +1430,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] diff --git a/services/system/AuthSig/plugin/Cargo.lock b/services/system/AuthSig/plugin/Cargo.lock index bcf153b91..c97fe3eef 100644 --- a/services/system/AuthSig/plugin/Cargo.lock +++ b/services/system/AuthSig/plugin/Cargo.lock @@ -719,7 +719,7 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", "indexmap 2.2.6", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -1510,7 +1510,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -1522,7 +1522,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] diff --git a/services/user/Invite/plugin/Cargo.lock b/services/user/Invite/plugin/Cargo.lock index 9c6c98649..20e3f9111 100644 --- a/services/user/Invite/plugin/Cargo.lock +++ b/services/user/Invite/plugin/Cargo.lock @@ -658,7 +658,7 @@ dependencies = [ [[package]] name = "fracpack" -version = "0.10.0" +version = "0.11.0" dependencies = [ "custom_error", "indexmap 2.2.6", @@ -1378,7 +1378,7 @@ dependencies = [ [[package]] name = "psibase" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-graphql", @@ -1429,7 +1429,7 @@ dependencies = [ [[package]] name = "psibase_macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "darling", "proc-macro-error", @@ -1441,7 +1441,7 @@ dependencies = [ [[package]] name = "psibase_names" -version = "0.10.0" +version = "0.11.0" dependencies = [ "seahash", ] diff --git a/services/user/XAdmin/ui/yarn.lock b/services/user/XAdmin/ui/yarn.lock index e1551857e..a80e2ad50 100644 --- a/services/user/XAdmin/ui/yarn.lock +++ b/services/user/XAdmin/ui/yarn.lock @@ -2983,8 +2983,16 @@ source-map-js@^1.2.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0: - name string-width-cjs +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3037,7 +3045,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -3331,7 +3346,7 @@ waait@^1.0.5: integrity sha512-wp+unA4CpqxvBUKHHv8D86fK4jWByHAWyhEXXVHfVUZfK+16ylpj7hjQ58Z8j9ntu8XNukRQT8Fi5qbyJ8rkyw== "wasm-psibase@file:./wasm-psibase": - version "0.10.0" + version "0.11.0" which-boxed-primitive@^1.0.2: version "1.0.2"