From 90a5d13d23777dfa4b6663a22917dbd5832f6bea Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 11 Oct 2022 21:52:16 -0700 Subject: [PATCH 1/8] Update deps and get BytesM/StringM --- Cargo.lock | 12 ++++++------ Cargo.toml | 12 ++++++------ src/strval.rs | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a4074d2ae..1a1dae2ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1528,7 +1528,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=91cf595#91cf595508d475877f855619ad5baeb5f45a3885" +source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" dependencies = [ "soroban-env-macros", "soroban-wasmi", @@ -1539,7 +1539,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=91cf595#91cf595508d475877f855619ad5baeb5f45a3885" +source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" dependencies = [ "backtrace", "dyn-fmt", @@ -1562,7 +1562,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=91cf595#91cf595508d475877f855619ad5baeb5f45a3885" +source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" dependencies = [ "itertools", "proc-macro2", @@ -1574,7 +1574,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=91cf595#91cf595508d475877f855619ad5baeb5f45a3885" +source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" dependencies = [ "itertools", "proc-macro2", @@ -1585,7 +1585,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=3992556b#3992556b840ab1659599ba7c4671ad9231129bcc" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=cdfd4e99#cdfd4e99e1b17408e60d2d157ee32a3019758dc2" dependencies = [ "base64", "darling", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.6" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=5cca712b#5cca712b64a928574bc6f142a161bd8bdfe42b23" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=15abdf38#15abdf386a9f0ecedec2223440442460c5967e95" dependencies = [ "base64", "serde", diff --git a/Cargo.toml b/Cargo.toml index 42b7819f5..bc658ddde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,13 +46,13 @@ jsonrpsee-core = "0.15.1" regex = "1.6.0" [patch.crates-io] -soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "3992556b" } +soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "cdfd4e99" } stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" } -soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "91cf595" } -soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "91cf595" } -soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "91cf595" } -soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "91cf595" } -stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "5cca712b" } +soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } +soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } +soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } +soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } +stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "15abdf38" } wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" } diff --git a/src/strval.rs b/src/strval.rs index 883eaa490..817cc6c52 100644 --- a/src/strval.rs +++ b/src/strval.rs @@ -3,9 +3,9 @@ use std::{error::Error, fmt::Display, str::FromStr}; use num_bigint::{BigInt, Sign}; use soroban_env_host::xdr::{ - AccountId, Error as XdrError, PublicKey, ScBigInt, ScMap, ScMapEntry, ScObject, ScSpecTypeDef, - ScSpecTypeMap, ScSpecTypeOption, ScSpecTypeTuple, ScSpecTypeVec, ScStatic, ScVal, ScVec, - Uint256, VecM, + AccountId, BytesM, Error as XdrError, PublicKey, ScBigInt, ScMap, ScMapEntry, ScObject, + ScSpecTypeDef, ScSpecTypeMap, ScSpecTypeOption, ScSpecTypeTuple, ScSpecTypeVec, ScStatic, + ScVal, ScVec, Uint256, }; use stellar_strkey::StrkeyPublicKeyEd25519; @@ -78,7 +78,7 @@ pub fn from_string(s: &str, t: &ScSpecTypeDef) -> Result { } else { let big = BigInt::from_str(s).map_err(|_| StrValError::InvalidValue)?; let (sign, bytes) = big.to_bytes_be(); - let b: VecM = bytes.try_into().map_err(StrValError::Xdr)?; + let b: BytesM<256_000_u32> = bytes.try_into().map_err(StrValError::Xdr)?; ScVal::Object(Some(ScObject::BigInt(match sign { Sign::NoSign => ScBigInt::Zero, Sign::Minus => ScBigInt::Negative(b), @@ -198,7 +198,7 @@ pub fn from_json(v: &Value, t: &ScSpecTypeDef) -> Result { .map_err(|_| StrValError::InvalidValue) }) .collect(); - let converted: VecM = b?.try_into().map_err(StrValError::Xdr)?; + let converted: BytesM<256_000_u32> = b?.try_into().map_err(StrValError::Xdr)?; ScVal::Object(Some(ScObject::Bytes(converted))) } From ce779f8157e7708dfbdb0f8001dcd88e39acfe04 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 11 Oct 2022 22:55:40 -0700 Subject: [PATCH 2/8] upd --- Cargo.lock | 12 ++++++------ Cargo.toml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a1dae2ed..591ee1464 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1528,7 +1528,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" dependencies = [ "soroban-env-macros", "soroban-wasmi", @@ -1539,7 +1539,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" dependencies = [ "backtrace", "dyn-fmt", @@ -1562,7 +1562,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" dependencies = [ "itertools", "proc-macro2", @@ -1574,7 +1574,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=ed1c883c#ed1c883c489808332814933fbf94881352a49782" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" dependencies = [ "itertools", "proc-macro2", @@ -1585,7 +1585,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=cdfd4e99#cdfd4e99e1b17408e60d2d157ee32a3019758dc2" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=129e1bda#129e1bdae66b5f9d9ae27ce6bbf8949dde8c14da" dependencies = [ "base64", "darling", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.6" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=15abdf38#15abdf386a9f0ecedec2223440442460c5967e95" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=4f1910e0#4f1910e088762b3367b34094ff5608de2be850ec" dependencies = [ "base64", "serde", diff --git a/Cargo.toml b/Cargo.toml index bc658ddde..4b3c69666 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,13 +46,13 @@ jsonrpsee-core = "0.15.1" regex = "1.6.0" [patch.crates-io] -soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "cdfd4e99" } +soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "129e1bda" } stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" } -soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } -soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } -soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } -soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "ed1c883c" } -stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "15abdf38" } +soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } +soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } +soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } +soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } +stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "4f1910e0" } wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" } From 7ed9b9c6905f2e9906c8b5ea992c28deb4588286 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:56:43 -0700 Subject: [PATCH 3/8] upd --- Cargo.lock | 204 +++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 12 +-- src/inspect.rs | 2 +- 3 files changed, 205 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 591ee1464..b6d497dc5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,6 +26,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anyhow" version = "1.0.65" @@ -181,6 +190,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "serde", + "winapi", +] + [[package]] name = "clap" version = "3.2.22" @@ -229,6 +251,16 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -299,6 +331,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f39818dcfc97d45b03953c1292efc4e80954e1583c4aa770bac1383e2310a4" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e580d70777c116df50c390d1211993f62d40302881e54d4b79727acb83d0199" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56a46460b88d1cec95112c8c363f0e2c39afdb237f60583b0b36343bf627ea9c" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747b608fecf06b0d72d440f27acc99288207324b793be2c17991839f3d4995ea" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "darling" version = "0.14.1" @@ -394,6 +470,15 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "escape8259" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" +dependencies = [ + "rustversion", +] + [[package]] name = "fastrand" version = "1.8.0" @@ -568,6 +653,9 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "http" @@ -643,6 +731,30 @@ dependencies = [ "webpki-roots", ] +[[package]] +name = "iana-time-zone" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde6edd6cef363e9359ed3c98ba64590ba9eecba2293eb5a723ab32aee8926aa" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -681,6 +793,7 @@ checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", "hashbrown", + "serde", ] [[package]] @@ -799,6 +912,15 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + [[package]] name = "lock_api" version = "0.4.9" @@ -937,6 +1059,15 @@ dependencies = [ "libc", ] +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + [[package]] name = "object" version = "0.29.0" @@ -1291,6 +1422,12 @@ dependencies = [ "base64", ] +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + [[package]] name = "ryu" version = "1.0.11" @@ -1325,6 +1462,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + [[package]] name = "sct" version = "0.7.0" @@ -1401,6 +1544,34 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sha-1" version = "0.10.0" @@ -1528,7 +1699,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" +source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" dependencies = [ "soroban-env-macros", "soroban-wasmi", @@ -1539,7 +1710,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" +source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" dependencies = [ "backtrace", "dyn-fmt", @@ -1562,7 +1733,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" +source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" dependencies = [ "itertools", "proc-macro2", @@ -1574,7 +1745,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b94c4a1e#b94c4a1e52685a6885a8f078fc0777ed8a3ae62e" +source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" dependencies = [ "itertools", "proc-macro2", @@ -1585,7 +1756,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=129e1bda#129e1bdae66b5f9d9ae27ce6bbf8949dde8c14da" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=95ab5f23#95ab5f233a71d4f819eb96fd144c2c9c49c5a749" dependencies = [ "base64", "darling", @@ -1656,10 +1827,13 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.6" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=4f1910e0#4f1910e088762b3367b34094ff5608de2be850ec" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=390f182a#390f182a283aa47e45c9b50f3de43bf0a6532cab" dependencies = [ "base64", + "escape8259", + "hex", "serde", + "serde_with", ] [[package]] @@ -1746,6 +1920,18 @@ dependencies = [ "syn", ] +[[package]] +name = "time" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +dependencies = [ + "itoa 1.0.3", + "libc", + "num_threads", + "serde", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -1959,6 +2145,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + [[package]] name = "unicode-xid" version = "0.2.4" diff --git a/Cargo.toml b/Cargo.toml index 4b3c69666..72e35b231 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,13 +46,13 @@ jsonrpsee-core = "0.15.1" regex = "1.6.0" [patch.crates-io] -soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "129e1bda" } +soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "d95ef484" } stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" } -soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } -soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } -soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } -soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b94c4a1e" } -stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "4f1910e0" } +soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } +soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } +soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } +soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } +stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "390f182a" } wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" } diff --git a/src/inspect.rs b/src/inspect.rs index 4c5859446..adce72af0 100644 --- a/src/inspect.rs +++ b/src/inspect.rs @@ -81,7 +81,7 @@ impl Cmd { f.outputs.as_slice(), ), ScSpecEntry::UdtUnionV0(udt) => { - println!(" • Union: {:?}", udt); + println!(" • Union: {}", serde_json::to_string(&udt).unwrap()); } ScSpecEntry::UdtStructV0(udt) => { println!(" • Struct: {:?}", udt); From 5b1922fb1cd1d092332724551beda68ce9242ae3 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:56:48 -0700 Subject: [PATCH 4/8] upd --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index b6d497dc5..d580d65ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1756,7 +1756,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=95ab5f23#95ab5f233a71d4f819eb96fd144c2c9c49c5a749" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=d95ef484#d95ef484fb677da9f96a70983d5ea02bce9bcc95" dependencies = [ "base64", "darling", From 14a152c22a9c8095821e415543df21db68449f66 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:59:09 -0700 Subject: [PATCH 5/8] upd --- Cargo.lock | 2 +- Cargo.toml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d580d65ae..9fd72bbdc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1756,7 +1756,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=d95ef484#d95ef484fb677da9f96a70983d5ea02bce9bcc95" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=815b99fe#815b99fe3d887de2b851135d34cdf041a8ebcdef" dependencies = [ "base64", "darling", diff --git a/Cargo.toml b/Cargo.toml index 72e35b231..35936875e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,12 +46,12 @@ jsonrpsee-core = "0.15.1" regex = "1.6.0" [patch.crates-io] -soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "d95ef484" } +soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "815b99fe" } stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" } -soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } -soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } -soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } -soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "0f50bc75" } +soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } +soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } +soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } +soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "390f182a" } wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" } From 3c31b0a7cfb5a77072e582530ac1e41a361209a1 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:59:15 -0700 Subject: [PATCH 6/8] upd --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9fd72bbdc..c93615e87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1699,7 +1699,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" dependencies = [ "soroban-env-macros", "soroban-wasmi", @@ -1710,7 +1710,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" dependencies = [ "backtrace", "dyn-fmt", @@ -1733,7 +1733,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" dependencies = [ "itertools", "proc-macro2", @@ -1745,7 +1745,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=0f50bc75#0f50bc7586285a1ca0ed3248ed67c4e7160a9542" +source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" dependencies = [ "itertools", "proc-macro2", From 1863c110c96b43b616b9c037419278c00bf9f1c8 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 18:17:57 -0700 Subject: [PATCH 7/8] Update src/inspect.rs --- src/inspect.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inspect.rs b/src/inspect.rs index adce72af0..4c5859446 100644 --- a/src/inspect.rs +++ b/src/inspect.rs @@ -81,7 +81,7 @@ impl Cmd { f.outputs.as_slice(), ), ScSpecEntry::UdtUnionV0(udt) => { - println!(" • Union: {}", serde_json::to_string(&udt).unwrap()); + println!(" • Union: {:?}", udt); } ScSpecEntry::UdtStructV0(udt) => { println!(" • Struct: {:?}", udt); From 63633efd35c500ca94c5d26b06c6825bd97cd80b Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Wed, 12 Oct 2022 21:11:40 -0700 Subject: [PATCH 8/8] upd --- Cargo.lock | 28 ++++++---------------------- Cargo.toml | 13 ++++++------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c93615e87..2aaea58f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -470,15 +470,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" -[[package]] -name = "escape8259" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] - [[package]] name = "fastrand" version = "1.8.0" @@ -1422,12 +1413,6 @@ dependencies = [ "base64", ] -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - [[package]] name = "ryu" version = "1.0.11" @@ -1699,7 +1684,7 @@ dependencies = [ [[package]] name = "soroban-env-common" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" +source = "git+https://github.com/stellar/rs-soroban-env?rev=4f2f3a2d#4f2f3a2da58dd869b559f41311815b20d1552ce5" dependencies = [ "soroban-env-macros", "soroban-wasmi", @@ -1710,7 +1695,7 @@ dependencies = [ [[package]] name = "soroban-env-host" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" +source = "git+https://github.com/stellar/rs-soroban-env?rev=4f2f3a2d#4f2f3a2da58dd869b559f41311815b20d1552ce5" dependencies = [ "backtrace", "dyn-fmt", @@ -1733,7 +1718,7 @@ dependencies = [ [[package]] name = "soroban-env-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" +source = "git+https://github.com/stellar/rs-soroban-env?rev=4f2f3a2d#4f2f3a2da58dd869b559f41311815b20d1552ce5" dependencies = [ "itertools", "proc-macro2", @@ -1745,7 +1730,7 @@ dependencies = [ [[package]] name = "soroban-native-sdk-macros" version = "0.0.6" -source = "git+https://github.com/stellar/rs-soroban-env?rev=b065e3f3#b065e3f30af6a92b0ade40ca983bef03fe43a373" +source = "git+https://github.com/stellar/rs-soroban-env?rev=4f2f3a2d#4f2f3a2da58dd869b559f41311815b20d1552ce5" dependencies = [ "itertools", "proc-macro2", @@ -1756,7 +1741,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "0.1.0" -source = "git+https://github.com/stellar/rs-soroban-sdk?rev=815b99fe#815b99fe3d887de2b851135d34cdf041a8ebcdef" +source = "git+https://github.com/stellar/rs-soroban-sdk?rev=5a6429c2#5a6429c297e9a9135dc797029ddc7a79ca3abee6" dependencies = [ "base64", "darling", @@ -1827,10 +1812,9 @@ dependencies = [ [[package]] name = "stellar-xdr" version = "0.0.6" -source = "git+https://github.com/stellar/rs-stellar-xdr?rev=390f182a#390f182a283aa47e45c9b50f3de43bf0a6532cab" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=3ba13687#3ba1368786bc222735b09b3f99c0c8e6a71c18ce" dependencies = [ "base64", - "escape8259", "hex", "serde", "serde_with", diff --git a/Cargo.toml b/Cargo.toml index 35936875e..2ad84d384 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,16 +46,15 @@ jsonrpsee-core = "0.15.1" regex = "1.6.0" [patch.crates-io] -soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "815b99fe" } +soroban-spec = { git = "https://github.com/stellar/rs-soroban-sdk", rev = "5a6429c2" } stellar-strkey = { git = "https://github.com/stellar/rs-stellar-strkey", rev = "d1b68fd1" } -soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } -soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } -soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } -soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "b065e3f3" } -stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "390f182a" } +soroban-env-common = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" } +soroban-env-host = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" } +soroban-env-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" } +soroban-native-sdk-macros = { git = "https://github.com/stellar/rs-soroban-env", rev = "4f2f3a2d" } +stellar-xdr = { git = "https://github.com/stellar/rs-stellar-xdr", rev = "3ba13687" } wasmi = { package = "soroban-wasmi", git = "https://github.com/stellar/wasmi", rev = "d1ec0036" } - # soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" } # soroban-env-host = { path = "../rs-soroban-env/soroban-env-host" } # soroban-env-macros = { path = "../rs-soroban-env/soroban-env-macros" }