diff --git a/Cargo.lock b/Cargo.lock index 098e8def..fd35aaa8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "ahash" version = "0.8.11" @@ -83,7 +68,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -100,7 +85,7 @@ dependencies = [ "ark-std", "derivative", "digest", - "itertools 0.10.5", + "itertools", "num-bigint", "num-traits", "paste", @@ -183,33 +168,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - [[package]] name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - [[package]] name = "base64" version = "0.13.1" @@ -592,12 +556,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "group" version = "0.13.0" @@ -720,15 +678,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.14" @@ -790,15 +739,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "miniz_oxide" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" -dependencies = [ - "adler2", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -844,15 +784,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.20.2" @@ -913,10 +844,10 @@ dependencies = [ "rand", "serde_json", "sha2", - "soroban-env-host 21.2.1", "soroban-env-host 22.1.3", - "soroban-simulation 21.2.1", + "soroban-env-host 23.0.0", "soroban-simulation 22.1.3", + "soroban-simulation 23.0.0", ] [[package]] @@ -986,12 +917,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - [[package]] name = "rustc_version" version = "0.4.1" @@ -1139,11 +1064,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "soroban-builtin-sdk-macros" -version = "21.2.1" +version = "22.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f57a68ef8777e28e274de0f3a88ad9a5a41d9a2eb461b4dd800b086f0e83b80" +checksum = "cf2e42bf80fcdefb3aae6ff3c7101a62cf942e95320ed5b518a1705bc11c6b2f" dependencies = [ - "itertools 0.11.0", + "itertools", "proc-macro2", "quote", "syn 2.0.96", @@ -1151,11 +1076,10 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "22.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2e42bf80fcdefb3aae6ff3c7101a62cf942e95320ed5b518a1705bc11c6b2f" +version = "23.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=11e5f3195d3ee6d3d85187323cc79ecc2300160f#11e5f3195d3ee6d3d85187323cc79ecc2300160f" dependencies = [ - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 2.0.96", @@ -1163,47 +1087,49 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "21.2.1" +version = "22.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd1c89463835fe6da996318156d39f424b4f167c725ec692e5a7a2d4e694b3d" +checksum = "027cd856171bfd6ad2c0ffb3b7dfe55ad7080fb3050c36ad20970f80da634472" dependencies = [ "arbitrary", "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 21.2.1", - "soroban-wasmi", + "soroban-env-macros 22.1.3", + "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", - "stellar-xdr 21.2.0", + "stellar-xdr 22.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser", ] [[package]] name = "soroban-env-common" -version = "22.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027cd856171bfd6ad2c0ffb3b7dfe55ad7080fb3050c36ad20970f80da634472" +version = "23.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=11e5f3195d3ee6d3d85187323cc79ecc2300160f#11e5f3195d3ee6d3d85187323cc79ecc2300160f" dependencies = [ "arbitrary", "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 22.1.3", - "soroban-wasmi", + "soroban-env-macros 23.0.0", + "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "static_assertions", - "stellar-xdr 22.1.0", + "stellar-xdr 22.1.0 (git+https://github.com/stellar/rs-stellar-xdr?rev=28391e81229ad20a3d9ec56e1e1f382205335085)", "wasmparser", ] [[package]] name = "soroban-env-host" -version = "21.2.1" +version = "22.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b7a32c28f281c423189f1298960194f0e0fc4eeb72378028171e556d8cd6160" +checksum = "66e8b03a4191d485eab03f066336112b2a50541a7553179553dc838b986b94dd" dependencies = [ - "backtrace", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", "curve25519-dalek", "ecdsa", "ed25519-dalek", @@ -1222,19 +1148,18 @@ dependencies = [ "sec1", "sha2", "sha3", - "soroban-builtin-sdk-macros 21.2.1", - "soroban-env-common 21.2.1", - "soroban-wasmi", + "soroban-builtin-sdk-macros 22.1.3", + "soroban-env-common 22.1.3", + "soroban-wasmi 0.31.1-soroban.20.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", - "stellar-strkey 0.0.8", + "stellar-strkey", "wasmparser", ] [[package]] name = "soroban-env-host" -version = "22.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e8b03a4191d485eab03f066336112b2a50541a7553179553dc838b986b94dd" +version = "23.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=11e5f3195d3ee6d3d85187323cc79ecc2300160f#11e5f3195d3ee6d3d85187323cc79ecc2300160f" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1258,66 +1183,64 @@ dependencies = [ "sec1", "sha2", "sha3", - "soroban-builtin-sdk-macros 22.1.3", - "soroban-env-common 22.1.3", - "soroban-wasmi", + "soroban-builtin-sdk-macros 23.0.0", + "soroban-env-common 23.0.0", + "soroban-wasmi 0.31.1-soroban.20.0.1 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "static_assertions", - "stellar-strkey 0.0.9", + "stellar-strkey", "wasmparser", ] [[package]] name = "soroban-env-macros" -version = "21.2.1" +version = "22.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "242926fe5e0d922f12d3796cd7cd02dd824e5ef1caa088f45fce20b618309f64" +checksum = "00eff744764ade3bc480e4909e3a581a240091f3d262acdce80b41f7069b2bd9" dependencies = [ - "itertools 0.11.0", + "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr 21.2.0", + "stellar-xdr 22.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "syn 2.0.96", ] [[package]] name = "soroban-env-macros" -version = "22.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00eff744764ade3bc480e4909e3a581a240091f3d262acdce80b41f7069b2bd9" +version = "23.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=11e5f3195d3ee6d3d85187323cc79ecc2300160f#11e5f3195d3ee6d3d85187323cc79ecc2300160f" dependencies = [ - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr 22.1.0", + "stellar-xdr 22.1.0 (git+https://github.com/stellar/rs-stellar-xdr?rev=28391e81229ad20a3d9ec56e1e1f382205335085)", "syn 2.0.96", ] [[package]] name = "soroban-simulation" -version = "21.2.1" +version = "22.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dcefe58639da31a775f2a2fd19620a03dda33f70a1a1c81461483c20230ad5" +checksum = "03c34f8fec24bcac3ea26fa8d5feb83e876f5e42e264e544c532f55a93bea254" dependencies = [ "anyhow", "rand", - "soroban-env-host 21.2.1", + "soroban-env-host 22.1.3", "static_assertions", "thiserror", ] [[package]] name = "soroban-simulation" -version = "22.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c34f8fec24bcac3ea26fa8d5feb83e876f5e42e264e544c532f55a93bea254" +version = "23.0.0" +source = "git+https://github.com/stellar/rs-soroban-env?rev=11e5f3195d3ee6d3d85187323cc79ecc2300160f#11e5f3195d3ee6d3d85187323cc79ecc2300160f" dependencies = [ "anyhow", "rand", - "soroban-env-host 22.1.3", + "soroban-env-host 23.0.0", "static_assertions", "thiserror", ] @@ -1330,8 +1253,20 @@ checksum = "710403de32d0e0c35375518cb995d4fc056d0d48966f2e56ea471b8cb8fc9719" dependencies = [ "smallvec", "spin", - "wasmi_arena", - "wasmi_core", + "wasmi_arena 0.4.1", + "wasmi_core 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmparser-nostd", +] + +[[package]] +name = "soroban-wasmi" +version = "0.31.1-soroban.20.0.1" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +dependencies = [ + "smallvec", + "spin", + "wasmi_arena 0.4.0", + "wasmi_core 0.13.0 (git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0)", "wasmparser-nostd", ] @@ -1357,17 +1292,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stellar-strkey" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d2bf45e114117ea91d820a846fd1afbe3ba7d717988fee094ce8227a3bf8bd" -dependencies = [ - "base32", - "crate-git-revision", - "thiserror", -] - [[package]] name = "stellar-strkey" version = "0.0.9" @@ -1381,23 +1305,22 @@ dependencies = [ [[package]] name = "stellar-xdr" -version = "21.2.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2675a71212ed39a806e415b0dbf4702879ff288ec7f5ee996dda42a135512b50" +checksum = "2ce69db907e64d1e70a3dce8d4824655d154749426a6132b25395c49136013e4" dependencies = [ "arbitrary", "base64 0.13.1", "crate-git-revision", "escape-bytes", "hex", - "stellar-strkey 0.0.8", + "stellar-strkey", ] [[package]] name = "stellar-xdr" version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce69db907e64d1e70a3dce8d4824655d154749426a6132b25395c49136013e4" +source = "git+https://github.com/stellar/rs-stellar-xdr?rev=28391e81229ad20a3d9ec56e1e1f382205335085#28391e81229ad20a3d9ec56e1e1f382205335085" dependencies = [ "arbitrary", "base64 0.13.1", @@ -1406,7 +1329,7 @@ dependencies = [ "hex", "serde", "serde_with", - "stellar-strkey 0.0.9", + "stellar-strkey", ] [[package]] @@ -1576,6 +1499,11 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" + [[package]] name = "wasmi_arena" version = "0.4.1" @@ -1594,6 +1522,17 @@ dependencies = [ "paste", ] +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "git+https://github.com/stellar/wasmi?rev=0ed3f3dee30dc41ebe21972399e0a73a41944aa0#0ed3f3dee30dc41ebe21972399e0a73a41944aa0" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.116.1" @@ -1697,7 +1636,7 @@ dependencies = [ "rand", "serde_json", "sha2", - "stellar-xdr 22.1.0", + "stellar-xdr 22.1.0 (git+https://github.com/stellar/rs-stellar-xdr?rev=28391e81229ad20a3d9ec56e1e1f382205335085)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5f073bf0..52111f07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,26 +11,25 @@ rust-version = "1.79.0" [workspace.dependencies.soroban-env-host-prev] package = "soroban-env-host" -version = "=21.2.1" - -[workspace.dependencies.soroban-env-host-curr] -package = "soroban-env-host" version = "=22.1.3" -#git = "https://github.com/stellar/rs-soroban-env" -#rev = "0497816694bef2b103494c8c61b7c8a06a72c7d3" [workspace.dependencies.soroban-simulation-prev] package = "soroban-simulation" -version = "=21.2.1" +version = "=22.1.3" + +[workspace.dependencies.soroban-env-host-curr] +package = "soroban-env-host" +git = "https://github.com/stellar/rs-soroban-env" +rev = "11e5f3195d3ee6d3d85187323cc79ecc2300160f" [workspace.dependencies.soroban-simulation-curr] package = "soroban-simulation" -version = "=22.1.3" -# git = "https://github.com/stellar/rs-soroban-env" -# rev = "0497816694bef2b103494c8c61b7c8a06a72c7d3" +git = "https://github.com/stellar/rs-soroban-env" +rev = "11e5f3195d3ee6d3d85187323cc79ecc2300160f" [workspace.dependencies.stellar-xdr] -version = "=22.1.0" +git = "https://github.com/stellar/rs-stellar-xdr" +rev = "28391e81229ad20a3d9ec56e1e1f382205335085" features = [ "serde" ] [workspace.dependencies] diff --git a/cmd/stellar-rpc/internal/methods/send_transaction.go b/cmd/stellar-rpc/internal/methods/send_transaction.go index 10bf833f..da3f2483 100644 --- a/cmd/stellar-rpc/internal/methods/send_transaction.go +++ b/cmd/stellar-rpc/internal/methods/send_transaction.go @@ -118,7 +118,7 @@ func NewSendTransactionHandler( } } - diagEvents := xdr.DiagnosticEvents{} + diagEvents := []xdr.DiagnosticEvent{} err = xdr.SafeUnmarshalBase64(resp.DiagnosticEvents, &diagEvents) if err != nil { logger.WithField("tx", request.Transaction). diff --git a/cmd/stellar-rpc/lib/preflight/Cargo.toml b/cmd/stellar-rpc/lib/preflight/Cargo.toml index acb2be04..925846d7 100644 --- a/cmd/stellar-rpc/lib/preflight/Cargo.toml +++ b/cmd/stellar-rpc/lib/preflight/Cargo.toml @@ -18,7 +18,7 @@ sha2 = { workspace = true } # when stellar rpc is configured to run with --preflight-enable-debug soroban-env-host-prev = { workspace = true, features = ["recording_mode", "testutils"]} soroban-simulation-prev = { workspace = true } -soroban-env-host-curr = { workspace = true, features = ["recording_mode", "testutils"]} +soroban-env-host-curr = { workspace = true, features = ["recording_mode", "testutils" ]} soroban-simulation-curr = { workspace = true } anyhow = { workspace = true } diff --git a/cmd/stellar-rpc/lib/preflight/src/lib.rs b/cmd/stellar-rpc/lib/preflight/src/lib.rs index fc7b0e35..e0748c87 100644 --- a/cmd/stellar-rpc/lib/preflight/src/lib.rs +++ b/cmd/stellar-rpc/lib/preflight/src/lib.rs @@ -16,7 +16,7 @@ extern crate soroban_env_host_prev; extern crate soroban_simulation_curr; extern crate soroban_simulation_prev; -// We support two different versions of soroban simutlaneously, switching on the +// We support two different versions of soroban simultaneously, switching on the // protocol version each supports. This is the exact same mechanism we use in // stellar-core to switch soroban hosts on protocol boundaries, and allows // synchronously cutting over between significantly different versions of the @@ -49,9 +49,7 @@ mod prev { #[allow(clippy::duplicate_mod)] pub(crate) mod shared; - pub(crate) const PROTOCOL: u32 = soroban_env_host::meta::get_ledger_protocol_version( - soroban_env_host::meta::INTERFACE_VERSION, - ); + pub(crate) const PROTOCOL: u32 = soroban_env_host::meta::INTERFACE_VERSION.protocol; } use std::cell::RefCell; diff --git a/go.mod b/go.mod index fbe97525..e85ab9f2 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/stellar/go v0.0.0-20250206032706-4e70599a66af + github.com/stellar/go v0.0.0-20250225004107-c5828bcf20c6 github.com/stretchr/testify v1.9.0 ) diff --git a/go.sum b/go.sum index 93e0484f..02d93ed3 100644 --- a/go.sum +++ b/go.sum @@ -342,8 +342,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= -github.com/stellar/go v0.0.0-20250206032706-4e70599a66af h1:yG64bllyRf+nCOEXgXHZ721pX+D6NgZnNL2e1pQTUCA= -github.com/stellar/go v0.0.0-20250206032706-4e70599a66af/go.mod h1:ewcAL4pit/jqFszQws9C2U6pwGSy4ZKZD3J/vvjCtgQ= +github.com/stellar/go v0.0.0-20250225004107-c5828bcf20c6 h1:tPV4hOYuez6mSAmLj1ErgVckrW3ov7/oXgt53W1VNq8= +github.com/stellar/go v0.0.0-20250225004107-c5828bcf20c6/go.mod h1:pIh0xYFVnaMP9fLnjFT7URY9Zhwy5wuc6tQkYybKkUY= github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 h1:OzCVd0SV5qE3ZcDeSFCmOWLZfEWZ3Oe8KtmSOYKEVWE= github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=