From a4943c86a8f28b6e816ccf14fabcb9249cb2d477 Mon Sep 17 00:00:00 2001 From: Nando Vieira Date: Mon, 15 Dec 2025 16:14:39 -0800 Subject: [PATCH 1/2] Update to protocol 25. --- Cargo.lock | 135 +++++++++++------- Cargo.toml | 32 +++-- cmd/crates/soroban-spec-typescript/src/lib.rs | 2 +- 3 files changed, 104 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f480589ec3..e243088cb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,6 +135,17 @@ dependencies = [ "ark-std", ] +[[package]] +name = "ark-bn254" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + [[package]] name = "ark-ec" version = "0.4.2" @@ -1228,14 +1239,20 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.9" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb" dependencies = [ - "quote", - "syn 2.0.106", + "ctor-proc-macro", + "dtor", ] +[[package]] +name = "ctor-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1560,6 +1577,21 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dtor" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301" +dependencies = [ + "dtor-proc-macro", +] + +[[package]] +name = "dtor-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" + [[package]] name = "dyn-clone" version = "1.0.20" @@ -3858,7 +3890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.106", @@ -4900,9 +4932,9 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "23.0.1" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9336adeabcd6f636a4e0889c8baf494658ef5a3c4e7e227569acd2ce9091e85" +checksum = "bba99589f3f535a6f1425ffafe94387955291e18015f1a7a3ee3181268f9eade" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -5005,9 +5037,9 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "23.0.1" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00067f52e8bbf1abf0de03fe3e2fbb06910893cfbe9a7d9093d6425658833ff3" +checksum = "8d98779d733d04c89aa0883d50c7c072ba91c336689330467b55eb794be7730a" dependencies = [ "arbitrary", "crate-git-revision", @@ -5024,9 +5056,9 @@ dependencies = [ [[package]] name = "soroban-env-guest" -version = "23.0.1" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd1e40963517b10963a8e404348d3fe6caf9c278ac47a6effd48771297374d6" +checksum = "7e34ece76defac3fb40a5f8e4dec69a709181f3ff591c31955f0e3e4fdd88737" dependencies = [ "soroban-env-common", "static_assertions", @@ -5034,11 +5066,12 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "23.0.1" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9766c5ad78e9d8ae10afbc076301f7d610c16407a1ebb230766dbe007a48725" +checksum = "a655ba881c6a2aa4f465370367aa5dad3e34ccdc1daff504b0a2499e54ed3517" dependencies = [ "ark-bls12-381", + "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", @@ -5070,9 +5103,9 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "23.0.1" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0e6a1c5844257ce96f5f54ef976035d5bd0ee6edefaf9f5e0bcb8ea4b34228c" +checksum = "61ac49b6d8980998fdbf621148b9895cd315e6c9978c84db1bb14885df865019" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -5089,9 +5122,8 @@ version = "23.3.0" [[package]] name = "soroban-ledger-snapshot" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3823372b72cab2e7ff2ced62bbffa11fce8da0713a224f122141558cab174647" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "serde", "serde_json", @@ -5103,9 +5135,8 @@ dependencies = [ [[package]] name = "soroban-sdk" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0e5bf6702f5952d78c5b2bcd05b0349f9a570cc62028d90dac3710b40cbe65" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "arbitrary", "bytes-lit", @@ -5122,13 +5153,13 @@ dependencies = [ "soroban-ledger-snapshot", "soroban-sdk-macros", "stellar-strkey 0.0.13", + "visibility", ] [[package]] name = "soroban-sdk-macros" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38abe20199c5d9fbff232381aa4e8e83302b34e82e38fbb090f41f1284fc920" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "darling", "heck 0.5.0", @@ -5146,9 +5177,8 @@ dependencies = [ [[package]] name = "soroban-spec" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72526d30f8825b859afa7e0b94549dad05c58a6c928b0763620412744512d7e2" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "base64 0.22.1", "stellar-xdr", @@ -5172,9 +5202,8 @@ dependencies = [ [[package]] name = "soroban-spec-rust" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9088cb8307dad026cda494971c4f13c76f9427ab26becb7cd691da95dc5e9b1d" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "prettyplease", "proc-macro2", @@ -5265,18 +5294,16 @@ dependencies = [ [[package]] name = "soroban-token-sdk" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6124c98e1919cd71186553a70b6bd7be8b032aacbb91dd033bf4b02616c3a9" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "soroban-sdk", ] [[package]] name = "soroban-token-spec" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ab6a6940dc083e3ad979affd4511f4dcb0783a267b98dca3c1f6c561a4e40c" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "soroban-sdk", "soroban-token-sdk", @@ -5325,9 +5352,8 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stellar-asset-spec" -version = "23.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7d0cd5bf3557d26abba06fc649b7c49c1f991d66327d3aea8fe055f4527f1b" +version = "23.3.0" +source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" dependencies = [ "soroban-sdk", "soroban-token-sdk", @@ -5382,8 +5408,7 @@ dependencies = [ [[package]] name = "stellar-rpc-client" version = "23.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061da047abb73d3de3b93cef460757ca1e99850e68bdf677e1102d575b8345a7" +source = "git+https://github.com/stellar/rs-stellar-rpc-client?branch=protocol-25#08cee5e9fa3ce75a3c4949be801ac84f39422a51" dependencies = [ "clap", "hex", @@ -5396,7 +5421,7 @@ dependencies = [ "serde_json", "serde_with", "sha2 0.10.9", - "stellar-strkey 0.0.9", + "stellar-strkey 0.0.15", "stellar-xdr", "termcolor", "termcolor_output", @@ -5415,17 +5440,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "stellar-strkey" -version = "0.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3aa3ed00e70082cb43febc1c2afa5056b9bb3e348bbb43d0cd0aa88a611144" -dependencies = [ - "crate-git-revision", - "data-encoding", - "thiserror 1.0.69", -] - [[package]] name = "stellar-strkey" version = "0.0.13" @@ -5453,9 +5467,9 @@ dependencies = [ [[package]] name = "stellar-xdr" -version = "23.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d2848e1694b0c8db81fd812bfab5ea71ee28073e09ccc45620ef3cf7a75a9b" +checksum = "10d20dafed80076b227d4b17c0c508a4bbc4d5e4c3d4c1de7cd42242df4b1eaf" dependencies = [ "arbitrary", "base64 0.22.1", @@ -6407,6 +6421,17 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "visibility" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "wait-timeout" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 3edb8905ca..cfeecfb8c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,34 +47,48 @@ path = "cmd/crates/stellar-ledger" # Dependencies from the rs-stellar-xdr repo: [workspace.dependencies.stellar-xdr] -version = "23.0.0" +version = "25.0.0" # Dependencies from the rs-soroban-sdk repo: [workspace.dependencies.soroban-spec] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" [workspace.dependencies.soroban-spec-rust] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" [workspace.dependencies.soroban-sdk] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" [workspace.dependencies.soroban-env-host] -version = "23.0.1" +version = "25.0.0" [workspace.dependencies.soroban-token-sdk] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" [workspace.dependencies.stellar-asset-spec] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" [workspace.dependencies.soroban-ledger-snapshot] -version = "23.0.1" +# version = "23.3.0" +git = "https://github.com/fnando/rs-soroban-sdk" +branch = "stellar-xdr-v25" # Dependencies from the rs-stellar-rpc-client repo: [workspace.dependencies.soroban-rpc] package = "stellar-rpc-client" -version = "23.2.1" +# version = "23.2.1" +git = "https://github.com/stellar/rs-stellar-rpc-client" +branch = "protocol-25" # Dependencies from elsewhere shared by crates: [workspace.dependencies] diff --git a/cmd/crates/soroban-spec-typescript/src/lib.rs b/cmd/crates/soroban-spec-typescript/src/lib.rs index f97e758145..9ad27ed8c9 100644 --- a/cmd/crates/soroban-spec-typescript/src/lib.rs +++ b/cmd/crates/soroban-spec-typescript/src/lib.rs @@ -55,7 +55,7 @@ pub fn generate_from_file( pub fn generate_from_wasm(wasm: &[u8]) -> Result { let spec = from_wasm(wasm)?; - let json = generate(&spec); + let json = generate(spec.as_slice()); Ok(json) } From 99b92570c7c7bbea89150213903dcc6b7c2a9c42 Mon Sep 17 00:00:00 2001 From: Nando Vieira Date: Fri, 19 Dec 2025 13:11:41 -0300 Subject: [PATCH 2/2] Update repo. --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e243088cb5..17490671c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5123,7 +5123,7 @@ version = "23.3.0" [[package]] name = "soroban-ledger-snapshot" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "serde", "serde_json", @@ -5136,7 +5136,7 @@ dependencies = [ [[package]] name = "soroban-sdk" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "arbitrary", "bytes-lit", @@ -5159,7 +5159,7 @@ dependencies = [ [[package]] name = "soroban-sdk-macros" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "darling", "heck 0.5.0", @@ -5178,7 +5178,7 @@ dependencies = [ [[package]] name = "soroban-spec" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "base64 0.22.1", "stellar-xdr", @@ -5203,7 +5203,7 @@ dependencies = [ [[package]] name = "soroban-spec-rust" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "prettyplease", "proc-macro2", @@ -5295,7 +5295,7 @@ dependencies = [ [[package]] name = "soroban-token-sdk" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "soroban-sdk", ] @@ -5303,7 +5303,7 @@ dependencies = [ [[package]] name = "soroban-token-spec" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "soroban-sdk", "soroban-token-sdk", @@ -5353,7 +5353,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stellar-asset-spec" version = "23.3.0" -source = "git+https://github.com/fnando/rs-soroban-sdk?branch=stellar-xdr-v25#be65eada59222dbbc3c5cb1db422fcd1692f6226" +source = "git+https://github.com/stellar/rs-soroban-sdk?branch=release%2Fv25-preview#184c1e398317ddb6d75d014b18235f7cdb59b255" dependencies = [ "soroban-sdk", "soroban-token-sdk", diff --git a/Cargo.toml b/Cargo.toml index cfeecfb8c0..b38acbf919 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,36 +52,36 @@ version = "25.0.0" # Dependencies from the rs-soroban-sdk repo: [workspace.dependencies.soroban-spec] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" [workspace.dependencies.soroban-spec-rust] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" [workspace.dependencies.soroban-sdk] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" [workspace.dependencies.soroban-env-host] version = "25.0.0" [workspace.dependencies.soroban-token-sdk] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" [workspace.dependencies.stellar-asset-spec] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" [workspace.dependencies.soroban-ledger-snapshot] # version = "23.3.0" -git = "https://github.com/fnando/rs-soroban-sdk" -branch = "stellar-xdr-v25" +git = "https://github.com/stellar/rs-soroban-sdk" +branch = "release/v25-preview" # Dependencies from the rs-stellar-rpc-client repo: [workspace.dependencies.soroban-rpc]