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/wasi/Cargo.lock

@@ -12,20 +12,20 @@ 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="25175f570a0be4e97a1bd4d7f1d2cbb486551a08", default-features = false, features = ["tls-rustcrypto"] }
+jsonrpsee-core = { git = "https://github.com/warp-driver/jsonrpsee", rev="25175f570a0be4e97a1bd4d7f1d2cbb486551a08", features = ["client"] }
+soroban-rs = { git = "https://github.com/warp-driver/soroban-helpers", rev = "55f1b11dcb77f64b64afae0437421e5378d07605" } # branch = "wasip2-support"
 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"] }
+# mio with wasip2 support (just released)
+mio = "1.2.0"
 
 # 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"] }
+tokio = { git = "https://github.com/dicej/tokio", rev="61e5db5", 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" }
+# socket2 = { git = "https://github.com/rust-lang/socket2", tag = "v0.6.3" }
+tokio = { git = "https://github.com/dicej/tokio", rev="61e5db5" } # branch = "wasip2-take2"