diff --git a/Cargo.lock b/Cargo.lock index df9775e31..3fb5389fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -235,27 +235,7 @@ dependencies = [ [[package]] name = "alloy-ethers-typecast" version = "0.2.0" -source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66#0881930a22e84db49ba955c5b88e790e1266ac66" -dependencies = [ - "alloy", - "async-trait", - "derive_builder 0.12.0", - "ethers", - "getrandom", - "once_cell", - "rain-error-decoding", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "alloy-ethers-typecast" -version = "0.2.0" -source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698#0e636d2bc865a49c6eaea95ab139465708a65698" +source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=65a68f207287d024cba934bf1e3c8b3f63d2834a#65a68f207287d024cba934bf1e3c8b3f63d2834a" dependencies = [ "alloy", "async-trait", @@ -6171,10 +6151,10 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rain-erc" version = "0.0.0" -source = "git+https://github.com/rainlanguage/rain.erc?rev=80bb411b161c1ee992a7974d325a783214046d5b#80bb411b161c1ee992a7974d325a783214046d5b" +source = "git+https://github.com/rainlanguage/rain.erc?rev=0106e645ebd49334addc698c5aad9a85370eb54d#0106e645ebd49334addc698c5aad9a85370eb54d" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66)", + "alloy-ethers-typecast", "thiserror", ] @@ -6231,7 +6211,7 @@ name = "rain-metadata" version = "0.0.2-alpha.6" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66)", + "alloy-ethers-typecast", "anyhow", "clap", "deflate", @@ -6310,7 +6290,7 @@ name = "rain_interpreter_dispair" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "ethers", "rain_interpreter_bindings", "serde", @@ -6326,7 +6306,7 @@ name = "rain_interpreter_parser" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "ethers", "rain_interpreter_bindings", "rain_interpreter_dispair", @@ -6385,7 +6365,7 @@ name = "rain_orderbook_cli" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "anyhow", "chrono", "clap", @@ -6413,7 +6393,7 @@ name = "rain_orderbook_common" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "chrono", "csv", "dotrain", @@ -6468,7 +6448,7 @@ name = "rain_orderbook_js_api" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "base64 0.22.1", "bincode", "cynic", @@ -6503,7 +6483,7 @@ name = "rain_orderbook_quote" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "anyhow", "clap", "httpmock", diff --git a/Cargo.toml b/Cargo.toml index e3cbbd34e..a357ee824 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ homepage = "https://github.com/rainprotocol/rain.orderbook" [workspace.dependencies] foundry-block-explorers = "0.2.6" alloy = { version = "0.1.4" } -alloy-ethers-typecast = { git = "https://github.com/rainlanguage/alloy-ethers-typecast", rev = "0e636d2bc865a49c6eaea95ab139465708a65698" } +alloy-ethers-typecast = { git = "https://github.com/rainlanguage/alloy-ethers-typecast", rev = "65a68f207287d024cba934bf1e3c8b3f63d2834a" } anyhow = "1.0.70" async-trait = "0.1.77" clap = { version = "4.2.5", features = ["cargo", "derive"] } @@ -52,7 +52,7 @@ derive_builder = "0.20.0" thirtyfour = "0.31.0" test-context = "0.3.0" portpicker = "0.1.1" -rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "e86b46bfce535f4c562b93a212171fbf19953a8f" } +rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "0106e645ebd49334addc698c5aad9a85370eb54d" } rain-error-decoding = { git = "https://github.com/rainlanguage/rain.error", rev = "72d9577fdaf7135113847027ba951f9a43b41827" } [workspace.dependencies.rain_orderbook_bindings] diff --git a/lib/rain.interpreter b/lib/rain.interpreter index c8685a23f..a5f869ae3 160000 --- a/lib/rain.interpreter +++ b/lib/rain.interpreter @@ -1 +1 @@ -Subproject commit c8685a23feb606282e22e4cc5e54ba721014ffdb +Subproject commit a5f869ae3562610707205b7a5b16ba2dcdf610e5 diff --git a/tauri-app/src-tauri/Cargo.lock b/tauri-app/src-tauri/Cargo.lock index 1f0fd74f1..6d6f73a3a 100644 --- a/tauri-app/src-tauri/Cargo.lock +++ b/tauri-app/src-tauri/Cargo.lock @@ -269,27 +269,7 @@ dependencies = [ [[package]] name = "alloy-ethers-typecast" version = "0.2.0" -source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66#0881930a22e84db49ba955c5b88e790e1266ac66" -dependencies = [ - "alloy", - "async-trait", - "derive_builder 0.12.0", - "ethers", - "getrandom 0.2.15", - "once_cell", - "rain-error-decoding", - "reqwest 0.11.27", - "serde", - "serde_json", - "thiserror", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "alloy-ethers-typecast" -version = "0.2.0" -source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698#0e636d2bc865a49c6eaea95ab139465708a65698" +source = "git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=65a68f207287d024cba934bf1e3c8b3f63d2834a#65a68f207287d024cba934bf1e3c8b3f63d2834a" dependencies = [ "alloy", "async-trait", @@ -8109,10 +8089,10 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rain-erc" version = "0.0.0" -source = "git+https://github.com/rainlanguage/rain.erc?rev=80bb411b161c1ee992a7974d325a783214046d5b#80bb411b161c1ee992a7974d325a783214046d5b" +source = "git+https://github.com/rainlanguage/rain.erc?rev=0106e645ebd49334addc698c5aad9a85370eb54d#0106e645ebd49334addc698c5aad9a85370eb54d" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66)", + "alloy-ethers-typecast", "thiserror", ] @@ -8169,7 +8149,7 @@ name = "rain-metadata" version = "0.0.2-alpha.6" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0881930a22e84db49ba955c5b88e790e1266ac66)", + "alloy-ethers-typecast", "anyhow", "clap", "deflate", @@ -8248,7 +8228,7 @@ name = "rain_interpreter_dispair" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "ethers", "rain_interpreter_bindings", "serde", @@ -8264,7 +8244,7 @@ name = "rain_interpreter_parser" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "ethers", "rain_interpreter_bindings", "rain_interpreter_dispair", @@ -8320,7 +8300,7 @@ name = "rain_orderbook_common" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "chrono", "csv", "dotrain", @@ -8362,7 +8342,7 @@ name = "rain_orderbook_quote" version = "0.0.0-alpha.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "anyhow", "clap", "js-sys", @@ -10498,7 +10478,7 @@ name = "tauri-app" version = "0.0.0" dependencies = [ "alloy", - "alloy-ethers-typecast 0.2.0 (git+https://github.com/rainlanguage/alloy-ethers-typecast?rev=0e636d2bc865a49c6eaea95ab139465708a65698)", + "alloy-ethers-typecast", "chrono", "dotrain", "futures", diff --git a/tauri-app/src-tauri/Cargo.toml b/tauri-app/src-tauri/Cargo.toml index f326c269b..79cdfafde 100644 --- a/tauri-app/src-tauri/Cargo.toml +++ b/tauri-app/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ rain_orderbook_quote = { path = "../../crates/quote" } rain_orderbook_subgraph_client = { path = "../../crates/subgraph" } rain_orderbook_app_settings = { path = "../../crates/settings" } rain_orderbook_bindings = { path = "../../crates/bindings" } -alloy-ethers-typecast = { git = "https://github.com/rainlanguage/alloy-ethers-typecast", rev = "0e636d2bc865a49c6eaea95ab139465708a65698" } +alloy-ethers-typecast = { git = "https://github.com/rainlanguage/alloy-ethers-typecast", rev = "65a68f207287d024cba934bf1e3c8b3f63d2834a" } alloy = { version = "0.1.4", features = ["full", "node-bindings"] } typeshare = "1.0.1" reqwest = { version = "0.11.22", features = ["json"] }