Update to latest upstream deps, fewer patches

Author: merkle-maren

README.md

@@ -32,5 +32,15 @@ Build the WASI component:
 Run it via the wasmtime host:
 
 ```sh
-./client/wasi/run.sh
+# Makes a general rest call and gets json response
+./client/wasi/run.sh 3
+
+# Call soroban rpc and gets general health info
+# Requires XLM_RPC_URL set for the RPC endpoint
+./client/wasi/run.sh health
+
+# Call soroban rpc and gets account details
+# Requires XLM_RPC_URL set for the RPC endpoint
+# Requires XLM_ACCOUNT set for the XLM account to query
+./client/wasi/run.sh account
 ```

client/wasi/build.sh

@@ -3,4 +3,4 @@ set -euo pipefail
 
 cd "$(dirname "$0")/wasi"
 
-RUSTFLAGS="--cfg tokio_unstable" cargo +nightly build --target wasm32-wasip2 --release
+RUSTFLAGS="--cfg tokio_unstable" cargo build --target wasm32-wasip2 --release

client/wasi/wasi/Cargo.lock

@@ -12,20 +12,13 @@ hyper = { version = "1", features = ["client", "http1"] }
 hyper-util = { version = "0.1", features = ["tokio"] }
 http-body-util = "0.1"
 bytes = "1"
-jsonrpsee-http-client = { git = "https://github.com/warp-driver/jsonrpsee", branch = "wasip2-support", default-features = false, features = ["tls-rustcrypto"] }
-jsonrpsee-core = { git = "https://github.com/warp-driver/jsonrpsee", branch = "wasip2-support", features = ["client"] }
-soroban-rs = { git = "https://github.com/warp-driver/soroban-helpers", branch = "wasip2-support" }
+# branch = "wasip2-support"
+jsonrpsee-http-client = { git = "https://github.com/warp-driver/jsonrpsee", rev="8a1a7f45c29227c2b92c010e9b870723e0f444d4", default-features = false, features = ["tls-rustcrypto"] }
+jsonrpsee-core = { git = "https://github.com/warp-driver/jsonrpsee", rev="8a1a7f45c29227c2b92c010e9b870723e0f444d4", features = ["client"] }
+soroban-rs = { git = "https://github.com/warp-driver/soroban-helpers", rev = "afc5a819ec65d427a775f0cf392fc7f699a1ae49" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 
-# mio with wasip2 support (not yet released to crates.io)
-mio = { git = "https://github.com/tokio-rs/mio", branch = "master", features = ["os-poll", "net"] }
-
-# tokio with wasip2 cfg tweaks (dicej's draft branch)
-tokio = { git = "https://github.com/dicej/tokio", branch = "wasip2-take2", features = ["rt", "net", "io-util", "time", "macros", "sync"] }
-
-[patch.crates-io]
-# wasip2 support (not yet released)
-socket2 = { git = "https://github.com/rust-lang/socket2", branch = "master" }
-mio = { git = "https://github.com/tokio-rs/mio", branch = "master" }
-tokio = { git = "https://github.com/dicej/tokio", branch = "wasip2-take2" }
+# tokio and mio with wasip2 support (just released)
+mio = "1.2.0"
+tokio = { version = "1.51.0", features = ["rt", "net", "io-util", "time", "macros", "sync"] }

client/wasi/wasi/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly"
+channel = "1.94.0"
 targets = ["wasm32-wasip2"]