diff --git a/Cargo.lock b/Cargo.lock index 05caf458..baedf31c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ dependencies = [ "ethers", "js-sys", "once_cell", - "serde 1.0.136", + "serde 1.0.137", "sha3 0.9.1", "thiserror", "wasm-bindgen", @@ -94,9 +94,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" [[package]] name = "arrayvec" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "0.5.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4" +checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" dependencies = [ "proc-macro-error", "proc-macro2", @@ -202,9 +202,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", @@ -219,7 +219,7 @@ dependencies = [ name = "balance-exporter" version = "0.1.0" dependencies = [ - "clap 3.1.6", + "clap 3.1.18", "color-eyre 0.6.1", "ethers-core", "futures", @@ -228,7 +228,7 @@ dependencies = [ "metrics-exporter-prometheus", "nomad-base", "nomad-ethereum", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "tokio", ] @@ -285,7 +285,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-slice-cast" @@ -453,7 +453,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -469,11 +469,11 @@ dependencies = [ [[package]] name = "camino" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -482,7 +482,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -494,7 +494,7 @@ dependencies = [ "camino", "cargo-platform", "semver", - "serde 1.0.136", + "serde 1.0.137", "serde_json", ] @@ -536,8 +536,8 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.14", - "serde 1.0.136", + "num-traits 0.2.15", + "serde 1.0.137", "winapi", ] @@ -552,9 +552,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", @@ -578,16 +578,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.6" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", "clap_derive", + "clap_lex", "indexmap", "lazy_static", - "os_str_bytes", "strsim 0.10.0", "termcolor", "textwrap 0.15.0", @@ -595,9 +595,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.4" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -606,6 +606,15 @@ dependencies = [ "syn", ] +[[package]] +name = "clap_lex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "coins-bip32" version = "0.6.0" @@ -620,7 +629,7 @@ dependencies = [ "hmac 0.11.0", "k256", "lazy_static", - "serde 1.0.136", + "serde 1.0.137", "sha2 0.9.9", "thiserror", ] @@ -656,7 +665,7 @@ dependencies = [ "generic-array 0.14.5", "hex", "ripemd160", - "serde 1.0.136", + "serde 1.0.137", "serde_derive", "sha2 0.9.9", "sha3 0.9.1", @@ -689,7 +698,7 @@ dependencies = [ "eyre", "indenter", "once_cell", - "owo-colors 3.3.0", + "owo-colors 3.4.0", "tracing-error 0.2.0", ] @@ -712,7 +721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" dependencies = [ "once_cell", - "owo-colors 3.3.0", + "owo-colors 3.4.0", "tracing-core", "tracing-error 0.2.0", ] @@ -737,7 +746,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.136", + "serde 1.0.137", "serde-hjson", "serde_json", "toml", @@ -753,7 +762,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", - "serde 1.0.136", + "serde 1.0.137", "serde-hjson", "serde_json", "toml", @@ -1059,9 +1068,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ "cfg-if 1.0.0", ] @@ -1080,7 +1089,7 @@ dependencies = [ "pbkdf2 0.10.1", "rand", "scrypt", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "sha2 0.10.2", "sha3 0.10.1", @@ -1098,7 +1107,7 @@ dependencies = [ "hex", "once_cell", "regex", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "sha3 0.10.1", "thiserror", @@ -1135,7 +1144,7 @@ dependencies = [ [[package]] name = "ethers" version = "0.6.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "ethers-addressbook", "ethers-contract", @@ -1150,18 +1159,18 @@ dependencies = [ [[package]] name = "ethers-addressbook" version = "0.1.0" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "ethers-core", "once_cell", - "serde 1.0.136", + "serde 1.0.137", "serde_json", ] [[package]] name = "ethers-contract" version = "0.6.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "ethers-contract-abigen", "ethers-contract-derive", @@ -1171,7 +1180,7 @@ dependencies = [ "hex", "once_cell", "pin-project", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", ] @@ -1179,7 +1188,7 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" version = "0.6.3" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "Inflector", "cfg-if 1.0.0", @@ -1191,7 +1200,7 @@ dependencies = [ "proc-macro2", "quote", "reqwest", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "syn", "url", @@ -1201,7 +1210,7 @@ dependencies = [ [[package]] name = "ethers-contract-derive" version = "0.6.3" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "ethers-contract-abigen", "ethers-core", @@ -1215,7 +1224,7 @@ dependencies = [ [[package]] name = "ethers-core" version = "0.6.3" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "arrayvec 0.7.2", "bytes", @@ -1232,7 +1241,8 @@ dependencies = [ "rand", "rlp", "rlp-derive", - "serde 1.0.136", + "rust_decimal", + "serde 1.0.137", "serde_json", "strum", "syn", @@ -1244,13 +1254,13 @@ dependencies = [ [[package]] name = "ethers-etherscan" version = "0.2.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "ethers-core", "ethers-solc", "reqwest", "semver", - "serde 1.0.136", + "serde 1.0.137", "serde-aux", "serde_json", "thiserror", @@ -1260,7 +1270,7 @@ dependencies = [ [[package]] name = "ethers-middleware" version = "0.6.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "async-trait", "ethers-contract", @@ -1272,7 +1282,7 @@ dependencies = [ "futures-util", "instant", "reqwest", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tokio", @@ -1284,7 +1294,7 @@ dependencies = [ [[package]] name = "ethers-providers" version = "0.6.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "async-trait", "auto_impl", @@ -1301,7 +1311,7 @@ dependencies = [ "parking_lot 0.11.2", "pin-project", "reqwest", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tokio", @@ -1319,7 +1329,7 @@ dependencies = [ [[package]] name = "ethers-signers" version = "0.6.2" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "async-trait", "coins-bip32", @@ -1340,7 +1350,7 @@ dependencies = [ [[package]] name = "ethers-solc" version = "0.3.0" -source = "git+https://github.com/gakonst/ethers-rs?branch=master#4d9916570f05934d845450f629b467da04498be4" +source = "git+https://github.com/gakonst/ethers-rs?branch=master#00b38c437a7cae6fbe9f846ffbb12a03fbed0df5" dependencies = [ "cfg-if 1.0.0", "colored", @@ -1357,7 +1367,7 @@ dependencies = [ "rayon", "regex", "semver", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "solang-parser", "thiserror", @@ -1369,9 +1379,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9289ed2c0440a6536e65119725cf91fc2c6b5e513bfd2e36e1134d7cca6ca12f" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" dependencies = [ "indenter", "once_cell", @@ -1394,9 +1404,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" dependencies = [ "rand_core", "subtle", @@ -1416,9 +1426,9 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "float-cmp" @@ -1426,7 +1436,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -1588,18 +1598,20 @@ dependencies = [ ] [[package]] -name = "gelato-relay" -version = "0.1.0" +name = "gelato-sdk" +version = "0.1.0-alpha" +source = "git+https://github.com/nomad-xyz/gelato-sdk?branch=main#fb73348de7ae4628b580930d1c8068e6ce3f050d" dependencies = [ - "async-trait", - "color-eyre 0.5.11", - "ethers", - "futures-util", + "ethers-core", + "ethers-signers", + "eyre", + "hex", + "once_cell", "reqwest", - "serde 1.0.136", + "serde 1.0.137", "serde_json", + "serde_repr", "thiserror", - "tokio", "tracing", ] @@ -1660,9 +1672,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes", "fnv", @@ -1673,7 +1685,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.2", "tracing", ] @@ -1780,9 +1792,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ "bytes", "fnv", @@ -1791,9 +1803,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1802,9 +1814,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1820,7 +1832,7 @@ checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" dependencies = [ "backtrace", "os_type", - "serde 1.0.136", + "serde 1.0.137", "serde_derive", "termcolor", "toml", @@ -1829,9 +1841,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ "bytes", "futures-channel", @@ -1912,7 +1924,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -1934,9 +1946,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg", "hashbrown", @@ -1956,9 +1968,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" @@ -1971,9 +1983,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jobserver" @@ -1986,9 +1998,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -2026,7 +2038,7 @@ dependencies = [ "nomad-xyz-configuration", "prometheus", "rand", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serial_test", "thiserror", @@ -2038,15 +2050,15 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kms-cli" version = "0.1.0" dependencies = [ - "clap 3.1.6", + "clap 3.1.18", "color-eyre 0.5.11", "ethers", "ethers-signers", @@ -2060,9 +2072,9 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852b75a095da6b69da8c5557731c3afd06525d4f655a4fc1c799e2ec8bc4dce4" +checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" dependencies = [ "ascii-canvas", "atty", @@ -2083,9 +2095,9 @@ dependencies = [ [[package]] name = "lalrpop-util" -version = "0.19.7" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d265705249fe209280676d8f68887859fa42e1d34f342fc05bd47726a5e188" +checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" dependencies = [ "regex", ] @@ -2117,9 +2129,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -2133,8 +2145,8 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#180e65e1b00f6b032e1513d94a4f0a4de7cafba1" +version = "0.7.0+7.1.2" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#59434f93ed91e4252d8ff64bfd28b4f3203572a4" dependencies = [ "bindgen", "bzip2-sys", @@ -2147,9 +2159,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.5" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "pkg-config", @@ -2184,9 +2196,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] @@ -2237,9 +2249,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -2258,9 +2270,9 @@ checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "metrics" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" +checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" dependencies = [ "ahash", "metrics-macros", @@ -2268,9 +2280,9 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b93b470b04c005178058e18ac8bb2eb3fda562cf87af5ea05ba8d44190d458c" +checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" dependencies = [ "hyper", "indexmap", @@ -2297,9 +2309,9 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107a38013e91c04ddf31826b0d0dcc2e0d4ebedded8234cc0dc2b7bbd0c121e8" +checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50" dependencies = [ "atomic-shim", "crossbeam-epoch", @@ -2336,35 +2348,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -2506,7 +2506,7 @@ dependencies = [ "rocksdb", "rusoto_core", "rusoto_kms", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tokio", @@ -2559,7 +2559,7 @@ dependencies = [ "rusoto_credential", "rusoto_kms", "rusoto_sts", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "sha3 0.9.1", "thiserror", @@ -2581,7 +2581,7 @@ dependencies = [ "ethers-providers", "ethers-signers", "futures-util", - "gelato-relay", + "gelato-sdk", "hex", "nomad-core", "nomad-types", @@ -2591,7 +2591,7 @@ dependencies = [ "prometheus", "reqwest", "rocksdb", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tokio", @@ -2617,7 +2617,7 @@ dependencies = [ "prometheus", "rand", "rocksdb", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tokio", @@ -2633,7 +2633,7 @@ dependencies = [ "ethers", "hex", "prometheus", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "thiserror", "tracing-subscriber 0.2.25", @@ -2651,7 +2651,7 @@ dependencies = [ "nomad-test", "nomad-types", "once_cell", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serde_yaml", "serial_test", @@ -2665,15 +2665,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num" version = "0.4.0" @@ -2685,7 +2676,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -2696,39 +2687,39 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", - "serde 1.0.136", + "num-traits 0.2.15", + "serde 1.0.137", ] [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "97fbc387afefefd5e9e39493299f3069e14a140dd34dc19b4c1c1a8fddb6a790" dependencies = [ - "num-traits 0.2.14", - "serde 1.0.136", + "num-traits 0.2.15", + "serde 1.0.137", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-iter" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] @@ -2740,8 +2731,8 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.14", - "serde 1.0.136", + "num-traits 0.2.15", + "serde 1.0.137", ] [[package]] @@ -2750,14 +2741,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.14", + "num-traits 0.2.15", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -2774,9 +2765,9 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "memchr", ] @@ -2801,18 +2792,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2821,9 +2824,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" dependencies = [ "autocfg", "cc", @@ -2853,12 +2856,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" [[package]] name = "os_type" @@ -2877,9 +2877,9 @@ checksum = "2386b4ebe91c2f7f51082d4cefa145d030e33a1842a96b12e4885cc3c01f7a55" [[package]] name = "owo-colors" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e72e30578e0d0993c8ae20823dd9cff2bc5517d2f586a8aef462a581e8a03eb" +checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b" [[package]] name = "parity-scale-codec" @@ -2892,7 +2892,7 @@ dependencies = [ "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive", - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -2920,12 +2920,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.2", + "parking_lot_core 0.9.3", ] [[package]] @@ -2944,9 +2944,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3022,9 +3022,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "petgraph" -version = "0.5.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -3112,9 +3112,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -3263,7 +3263,7 @@ dependencies = [ "rocksdb", "rusoto_core", "rusoto_s3", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serial_test", "thiserror", @@ -3318,9 +3318,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -3390,9 +3390,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3463,7 +3463,7 @@ dependencies = [ "nomad-test", "nomad-xyz-configuration", "prometheus", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serial_test", "thiserror", @@ -3510,7 +3510,7 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serde_urlencoded", "tokio", @@ -3585,7 +3585,7 @@ dependencies = [ [[package]] name = "rocksdb" version = "0.18.0" -source = "git+https://github.com/rust-rocksdb/rust-rocksdb#180e65e1b00f6b032e1513d94a4f0a4de7cafba1" +source = "git+https://github.com/rust-rocksdb/rust-rocksdb#59434f93ed91e4252d8ff64bfd28b4f3203572a4" dependencies = [ "libc", "librocksdb-sys", @@ -3610,7 +3610,7 @@ dependencies = [ "rusoto_credential", "rusoto_signature", "rustc_version", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "tokio", "xml-rs", @@ -3627,7 +3627,7 @@ dependencies = [ "dirs-next", "futures", "hyper", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "shlex", "tokio", @@ -3644,7 +3644,7 @@ dependencies = [ "bytes", "futures", "rusoto_core", - "serde 1.0.136", + "serde 1.0.137", "serde_json", ] @@ -3682,7 +3682,7 @@ dependencies = [ "pin-project-lite", "rusoto_credential", "rustc_version", - "serde 1.0.136", + "serde 1.0.137", "sha2 0.9.9", "tokio", ] @@ -3708,6 +3708,17 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" +[[package]] +name = "rust_decimal" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ee7337df68898256ad0d4af4aad178210d9e44d2ff900ce44064a97cd86530" +dependencies = [ + "arrayvec 0.7.2", + "num-traits 0.2.15", + "serde 1.0.137", +] + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -3737,9 +3748,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -3764,9 +3775,9 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "safemem" @@ -3794,12 +3805,12 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "winapi", + "windows-sys", ] [[package]] @@ -3879,7 +3890,7 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -3896,9 +3907,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] @@ -3909,7 +3920,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93abf9799c576f004252b2a05168d58527fb7c54de12e94b4d12fe3475ffad24" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", "serde_json", ] @@ -3928,9 +3939,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -3939,13 +3950,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa", "ryu", - "serde 1.0.136", + "serde 1.0.137", +] + +[[package]] +name = "serde_repr" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -3966,18 +3988,18 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.136", + "serde 1.0.137", ] [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.8.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" dependencies = [ "indexmap", "ryu", - "serde 1.0.136", + "serde 1.0.137", "yaml-rust", ] @@ -4129,15 +4151,15 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b" +checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -4207,7 +4229,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.0", + "parking_lot 0.12.1", "phf_shared", "precomputed-hash", ] @@ -4278,9 +4300,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", @@ -4388,9 +4410,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -4403,9 +4425,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "0f392c8f16bda3456c0b00c6de39cb100449b98de55ac41c6cdd2bfcf53a1245" dependencies = [ "bytes", "libc", @@ -4443,9 +4465,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -4507,9 +4529,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", @@ -4519,13 +4541,27 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -4536,9 +4572,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "log", @@ -4549,9 +4585,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", @@ -4560,11 +4596,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -4585,7 +4621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", - "tracing-subscriber 0.3.9", + "tracing-subscriber 0.3.11", ] [[package]] @@ -4600,9 +4636,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -4628,7 +4664,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ - "serde 1.0.136", + "serde 1.0.137", "tracing-core", ] @@ -4643,7 +4679,7 @@ dependencies = [ "lazy_static", "matchers", "regex", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "sharded-slab", "smallvec", @@ -4656,9 +4692,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "sharded-slab", "thread_local", @@ -4749,9 +4785,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" @@ -4813,7 +4849,7 @@ dependencies = [ "nomad-xyz-configuration", "prometheus", "rocksdb", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serial_test", "thiserror", @@ -4849,7 +4885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom", - "serde 1.0.136", + "serde 1.0.137", ] [[package]] @@ -4916,13 +4952,13 @@ dependencies = [ "percent-encoding", "pin-project", "scoped-tls", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", "tokio-tungstenite 0.15.0", - "tokio-util", + "tokio-util 0.6.10", "tower-service", "tracing", ] @@ -4941,21 +4977,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -4968,9 +5004,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4980,9 +5016,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4990,9 +5026,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -5003,9 +5039,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "wasm-timer" @@ -5041,7 +5077,7 @@ dependencies = [ "nomad-xyz-configuration", "prometheus", "rocksdb", - "serde 1.0.136", + "serde 1.0.137", "serde_json", "serial_test", "thiserror", @@ -5054,9 +5090,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -5074,9 +5110,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ "webpki", ] @@ -5126,9 +5162,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -5139,33 +5175,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_i686_gnu" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" @@ -5220,9 +5256,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" +checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" [[package]] name = "zstd-sys" diff --git a/Cargo.toml b/Cargo.toml index 67523445..54350ccb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,5 +18,4 @@ members = [ "tools/kms-cli", "tools/nomad-cli", "tools/balance-exporter", - "gelato-relay", ] diff --git a/agents/relayer/src/relayer.rs b/agents/relayer/src/relayer.rs index f3d5af88..422df0bd 100644 --- a/agents/relayer/src/relayer.rs +++ b/agents/relayer/src/relayer.rs @@ -194,7 +194,6 @@ mod test { use nomad_test::test_utils; use std::collections::HashMap; use tokio::time::{sleep, Duration}; - use tokio_test::assert_err; use super::*; @@ -293,7 +292,8 @@ mod test { ::run(agent.build_channel("moonbeam")) .await .expect("Couldn't join relayer's run task"); - assert_err!(run_result, "Must have returned error"); + + assert!(run_result.is_err(), "Must have returned error"); let run_report_error_task = agent .run_report_error(channel_name.to_string()) diff --git a/agents/watcher/src/watcher.rs b/agents/watcher/src/watcher.rs index 375c8e51..02ee3873 100644 --- a/agents/watcher/src/watcher.rs +++ b/agents/watcher/src/watcher.rs @@ -866,10 +866,12 @@ mod test { // Second update_history call returns zero -> first update // and should return WatcherError::SyncingFinished - history_sync - .update_history() - .await - .expect_err("Should have received WatcherError::SyncingFinished"); + let res = history_sync.update_history().await; + assert_eq!( + res.unwrap_err().to_string(), + WatcherError::SyncingFinished.to_string(), + "Should have received WatcherError::SyncingFinished" + ); assert_eq!(history_sync.committed_root, zero_root); assert_eq!(rx.recv().await.unwrap(), first_signed_update) diff --git a/chains/nomad-ethereum/CHANGELOG.md b/chains/nomad-ethereum/CHANGELOG.md index 1d10aca9..6d39c99d 100644 --- a/chains/nomad-ethereum/CHANGELOG.md +++ b/chains/nomad-ethereum/CHANGELOG.md @@ -2,4 +2,5 @@ ### Unreleased +- use gelato-sdk as a github dep rather than a crate - adds a changelog diff --git a/chains/nomad-ethereum/Cargo.toml b/chains/nomad-ethereum/Cargo.toml index 4a36a639..4bcafc6c 100644 --- a/chains/nomad-ethereum/Cargo.toml +++ b/chains/nomad-ethereum/Cargo.toml @@ -10,11 +10,6 @@ edition = "2021" # Main block serde = "1.0.120" serde_json = { version = "1.0.61", default-features = false } -ethers = {git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["abigen"]} -ethers-core = {git = "https://github.com/gakonst/ethers-rs", branch = "master"} -ethers-providers = {git = "https://github.com/gakonst/ethers-rs", branch = "master"} -ethers-signers = {git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["aws"]} -ethers-contract = { git = "https://github.com/gakonst/ethers-rs", branch = "master", features=["legacy"] } async-trait = { version = "0.1.42", default-features = false } tracing = "0.1.22" color-eyre = "0.5.0" @@ -31,10 +26,17 @@ thiserror = "1.0.30" reqwest = { version = "0.11.10", features = ["json"]} once_cell = "1.8.0" +ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["abigen"] } +ethers-core = { git = "https://github.com/gakonst/ethers-rs", branch = "master" } +ethers-providers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" } +ethers-signers = { git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["aws"] } +ethers-contract = { git = "https://github.com/gakonst/ethers-rs", branch = "master", features=["legacy"] } + +gelato-sdk = { git = "https://github.com/nomad-xyz/gelato-sdk", branch = "main" } + nomad-xyz-configuration = { path = "../../configuration" } nomad-types = { path = "../../nomad-types" } nomad-core = { path = "../../nomad-core" } -gelato-relay = { path = "../../gelato-relay" } [build-dependencies] -ethers = {git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["abigen"]} +ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master", features = ["abigen"] } diff --git a/chains/nomad-ethereum/src/bindings/home.rs b/chains/nomad-ethereum/src/bindings/home.rs index fa6c32ec..b4487b29 100644 --- a/chains/nomad-ethereum/src/bindings/home.rs +++ b/chains/nomad-ethereum/src/bindings/home.rs @@ -1,6 +1,6 @@ pub use home_mod::*; -#[allow(clippy::too_many_arguments)] -mod home_mod { +#[allow(clippy::too_many_arguments, non_camel_case_types)] +pub mod home_mod { #![allow(clippy::enum_variant_names)] #![allow(dead_code)] #![allow(clippy::type_complexity)] diff --git a/chains/nomad-ethereum/src/bindings/replica.rs b/chains/nomad-ethereum/src/bindings/replica.rs index e55e8548..ea0b9767 100644 --- a/chains/nomad-ethereum/src/bindings/replica.rs +++ b/chains/nomad-ethereum/src/bindings/replica.rs @@ -1,6 +1,6 @@ pub use replica_mod::*; -#[allow(clippy::too_many_arguments)] -mod replica_mod { +#[allow(clippy::too_many_arguments, non_camel_case_types)] +pub mod replica_mod { #![allow(clippy::enum_variant_names)] #![allow(dead_code)] #![allow(clippy::type_complexity)] diff --git a/chains/nomad-ethereum/src/bindings/xappconnectionmanager.rs b/chains/nomad-ethereum/src/bindings/xappconnectionmanager.rs index 253d4c5f..c664ea8a 100644 --- a/chains/nomad-ethereum/src/bindings/xappconnectionmanager.rs +++ b/chains/nomad-ethereum/src/bindings/xappconnectionmanager.rs @@ -1,6 +1,6 @@ pub use xappconnectionmanager_mod::*; -#[allow(clippy::too_many_arguments)] -mod xappconnectionmanager_mod { +#[allow(clippy::too_many_arguments, non_camel_case_types)] +pub mod xappconnectionmanager_mod { #![allow(clippy::enum_variant_names)] #![allow(dead_code)] #![allow(clippy::type_complexity)] diff --git a/chains/nomad-ethereum/src/gelato/mod.rs b/chains/nomad-ethereum/src/gelato.rs similarity index 65% rename from chains/nomad-ethereum/src/gelato/mod.rs rename to chains/nomad-ethereum/src/gelato.rs index 9d04a80e..d6d603ef 100644 --- a/chains/nomad-ethereum/src/gelato/mod.rs +++ b/chains/nomad-ethereum/src/gelato.rs @@ -1,22 +1,19 @@ -use ethers::signers::Signer; -use ethers::types::transaction::eip2718::TypedTransaction; -use ethers::types::{Address, H256}; -use ethers::{prelude::Bytes, providers::Middleware}; -use gelato_relay::{GelatoClient, RelayResponse, TaskState}; -use nomad_core::{ChainCommunicationError, Signers, TxOutcome}; -use std::{str::FromStr, sync::Arc}; +use ethers::{ + prelude::{Address, Bytes, H256, U64}, + providers::Middleware, + types::transaction::eip2718::TypedTransaction, +}; +use gelato_sdk::{ + get_forwarder, + rpc::{RelayResponse, TaskState}, + FeeToken, ForwardRequestBuilder, GelatoClient, +}; +use std::sync::Arc; use tokio::task::JoinHandle; use tokio::time::{sleep, Duration}; use tracing::info; -use utils::CHAIN_ID_TO_FORWARDER; - -/// EIP-712 forward request structure -mod types; -pub use types::*; - -pub mod utils; -pub(crate) const GAS_TANK_PAYMENT: usize = 1; +use nomad_core::{ChainCommunicationError, Signers, TxOutcome}; pub(crate) const ACCEPTABLE_STATES: [TaskState; 4] = [ TaskState::CheckPending, @@ -37,9 +34,9 @@ pub struct SingleChainGelatoClient { /// Gelato relay forwarder address pub forwarder: Address, /// Chain id - pub chain_id: usize, + pub chain_id: u64, /// Fee token - pub fee_token: String, + pub fee_token: FeeToken, /// Transactions are of high priority pub is_high_priority: bool, } @@ -57,19 +54,17 @@ where pub fn with_default_url( eth_client: Arc, sponsor: Signers, - chain_id: usize, - fee_token: String, + chain_id: u64, + fee_token: impl Into, is_high_priority: bool, ) -> Self { Self { gelato: GelatoClient::default().into(), eth_client, sponsor, - forwarder: *CHAIN_ID_TO_FORWARDER - .get(&chain_id) - .expect("!forwarder proxy"), + forwarder: get_forwarder(chain_id).expect("!forwarder proxy"), chain_id, - fee_token, + fee_token: fee_token.into(), is_high_priority, } } @@ -81,7 +76,10 @@ where contract_address: Address, tx: &TypedTransaction, ) -> Result { - let RelayResponse { task_id } = self.dispatch_tx(domain, contract_address, tx).await?; + let task_id = self + .dispatch_tx(domain, contract_address, tx) + .await? + .task_id(); info!(task_id = ?&task_id, "Submitted tx to Gelato relay."); @@ -108,8 +106,9 @@ where .await .map_err(|e| ChainCommunicationError::MiddlewareError(e.into()))?, ) - .as_usize(); - let data = tx.data().expect("!tx data"); + .as_u64() + .into(); + let data = tx.data().cloned().unwrap_or_default(); info!( domain = domain, @@ -126,14 +125,14 @@ where /// otherwise. pub fn poll_task_id( &self, - task_id: String, + task_id: H256, ) -> JoinHandle> { let gelato = self.gelato(); tokio::spawn(async move { loop { let status = gelato - .get_task_status(&task_id) + .get_task_status(task_id) .await .map_err(|e| ChainCommunicationError::TxSubmissionError(e.into()))? .expect("!task status"); @@ -152,9 +151,7 @@ where "Gelato relay executed tx." ); - let tx_hash = &execution.transaction_hash; - let txid = H256::from_str(tx_hash) - .unwrap_or_else(|_| panic!("Malformed tx hash from Gelato")); + let txid = execution.transaction_hash; return Ok(TxOutcome { txid }); } @@ -169,51 +166,44 @@ where } /// Format and sign forward request, then dispatch to Gelato relay service. + /// + /// This function pads gas by 100k to allow for gelato ops pub async fn send_forward_request( &self, target: Address, - data: &Bytes, - gas_limit: usize, + data: impl Into, + gas_limit: U64, ) -> Result { + // add 100k gas padding for Gelato contract ops + let adjusted_limit = gas_limit + U64::from(100_000); + let max_fee = self .gelato() - .get_estimated_fee(self.chain_id, &self.fee_token, gas_limit + 100_000, false) + .get_estimated_fee(self.chain_id, self.fee_token, adjusted_limit, false) .await - .map_err(|e| ChainCommunicationError::CustomError(e.into()))?; // add 100k gas padding for Gelato contract ops - - let target = format!("{:#x}", target); - let sponsor = format!("{:#x}", self.sponsor.address()); - let data = data.to_string().strip_prefix("0x").unwrap().to_owned(); - - let unfilled_request = UnfilledForwardRequest { - chain_id: self.chain_id, - target, - data, - fee_token: self.fee_token.to_owned(), - payment_type: GAS_TANK_PAYMENT, // gas tank - max_fee, - gas: gas_limit, - sponsor, - sponsor_chain_id: self.chain_id, - nonce: 0, // default, not needed - enforce_sponsor_nonce: false, // replay safety builtin to contracts - enforce_sponsor_nonce_ordering: false, - }; - - info!(request = ?unfilled_request, "Signing gelato forward request."); - - let sponsor_signature = self - .sponsor - .sign_typed_data(&unfilled_request) + .map_err(|e| ChainCommunicationError::CustomError(e.into()))?; + + let request = ForwardRequestBuilder::default() + .chain_id(self.chain_id) + .target(target) + .data(data.into()) + .fee_token(self.fee_token) + .max_fee(max_fee) + .gas(gas_limit) + .sponsored_by(&self.sponsor) + .sponsor_chain_id(self.chain_id) + .enforce_sponsor_nonce(false) + .build() .await - .unwrap(); - - let filled_request = unfilled_request.into_filled(sponsor_signature.to_vec()); + .expect("signer doesn't fail"); - info!(request = ?filled_request, "Signed gelato forward request."); + info!( + request = serde_json::to_string(&request).unwrap().as_str(), + "Signed gelato forward request." + ); self.gelato() - .send_forward_request(&filled_request) + .send_forward_request(&request) .await .map_err(|e| ChainCommunicationError::TxSubmissionError(e.into())) } diff --git a/chains/nomad-ethereum/src/gelato/types.rs b/chains/nomad-ethereum/src/gelato/types.rs deleted file mode 100644 index 12d42496..00000000 --- a/chains/nomad-ethereum/src/gelato/types.rs +++ /dev/null @@ -1,167 +0,0 @@ -use super::utils::CHAIN_ID_TO_FORWARDER; -use ethers::abi::{self, Token}; -use ethers::types::{transaction::eip712::*, Address}; -use ethers::utils::hex::FromHexError; -use ethers::utils::keccak256; -use gelato_relay::ForwardRequest; -use std::str::FromStr; - -const FORWARD_REQUEST_TYPE: &str = "ForwardRequest(uint256 chainId,address target,bytes data,address feeToken,uint256 paymentType,uint256 maxFee,uint256 gas,address sponsor,uint256 sponsorChainId,uint256 nonce,bool enforceSponsorNonce,bool enforceSponsorNonceOrdering)"; - -/// Unfilled Gelato forward request. This request is signed and filled according -/// to EIP-712 then sent to Gelato. Gelato executes the provided tx `data` on -/// the `target` contract address. -#[derive(Debug, Clone)] -pub struct UnfilledForwardRequest { - /// Target chain id - pub chain_id: usize, - /// Target contract address - pub target: String, - /// Encoded tx data - pub data: String, - /// Fee token address - pub fee_token: String, - /// Payment method - pub payment_type: usize, // 1 = gas tank - /// Max fee - pub max_fee: usize, - /// Contract call gas limit + buffer for gelato forwarder - pub gas: usize, - /// Sponsor address - pub sponsor: String, - /// Sponsor resident chain id - pub sponsor_chain_id: usize, // same as chain_id - /// Nonce for replay protection - pub nonce: usize, // can default 0 if next field false - /// Enforce nonce replay protection - pub enforce_sponsor_nonce: bool, // default false given replay safe - /// Enforce ordering based on provided nonces. Only considered if - /// `enforce_sponsor_nonce` true. - pub enforce_sponsor_nonce_ordering: bool, -} - -/// ForwardRequest error -#[derive(Debug, thiserror::Error, Clone, Copy)] -pub enum ForwardRequestError { - /// Hex decoding error - #[error("Hex decoding error: {0}")] - FromHexError(#[from] FromHexError), -} - -impl Eip712 for UnfilledForwardRequest { - type Error = ForwardRequestError; - - fn domain(&self) -> Result { - Ok(EIP712Domain { - name: "GelatoRelayForwarder".to_owned(), - version: "V1".to_owned(), - chain_id: self.chain_id.into(), - verifying_contract: *CHAIN_ID_TO_FORWARDER - .get(&self.chain_id) - .expect("!forwarder"), - salt: None, - }) - } - - fn type_hash() -> Result<[u8; 32], Self::Error> { - Ok(keccak256(FORWARD_REQUEST_TYPE)) - } - - fn struct_hash(&self) -> Result<[u8; 32], Self::Error> { - let encoded_request = abi::encode(&[ - Token::FixedBytes(Self::type_hash()?.to_vec()), - Token::Uint(self.chain_id.into()), - Token::Address(Address::from_str(&self.target).expect("!target")), - Token::FixedBytes(keccak256(hex::decode(&self.data)?).to_vec()), - Token::Address(Address::from_str(&self.fee_token).expect("!fee token")), - Token::Uint(self.payment_type.into()), - Token::Uint(self.max_fee.into()), - Token::Uint(self.gas.into()), - Token::Address(Address::from_str(&self.sponsor).expect("!sponsor")), - Token::Uint(self.sponsor_chain_id.into()), - Token::Uint(self.nonce.into()), - Token::Bool(self.enforce_sponsor_nonce), - Token::Bool(self.enforce_sponsor_nonce_ordering), - ]); - - Ok(keccak256(encoded_request)) - } -} - -impl UnfilledForwardRequest { - /// Fill ForwardRequest with sponsor signature and return full request struct - pub fn into_filled(self, sponsor_signature: Vec) -> ForwardRequest { - let hex_sig = format!("0x{}", hex::encode(sponsor_signature)); - let hex_data = format!("0x{}", self.data); - - ForwardRequest { - type_id: "ForwardRequest".to_owned(), - chain_id: self.chain_id, - target: self.target, - data: hex_data, - fee_token: self.fee_token, - payment_type: self.payment_type, - max_fee: self.max_fee.to_string(), - gas: self.gas.to_string(), - sponsor: self.sponsor, - sponsor_chain_id: self.sponsor_chain_id, - nonce: self.nonce, - enforce_sponsor_nonce: self.enforce_sponsor_nonce, - enforce_sponsor_nonce_ordering: self.enforce_sponsor_nonce_ordering, - sponsor_signature: hex_sig, - } - } -} - -#[cfg(test)] -mod test { - use crate::UnfilledForwardRequest; - use ethers::signers::LocalWallet; - use ethers::signers::Signer; - use ethers::types::transaction::eip712::Eip712; - use once_cell::sync::Lazy; - - const DOMAIN_SEPARATOR: &str = - "0x1b927f522830945610cf8f0521ef8b3f69352936e1b0920968dcad9cf1e30762"; - const DUMMY_SPONSOR_KEY: &str = - "9cb3a530d61728e337290409d967db069f5219279f89e5ddb5ae4af76a8da5f4"; - const DUMMY_SPONSOR_ADDRESS: &str = "0x4e4f0d95bc1a4275b748a63221796080b1aa5c10"; - const SPONSOR_SIGNATURE: &str = "0x23c272c0cba2b897de0fd8fe87d419f0f273c82ef10917520b733da889688b1c6fec89412c6f121fccbc30ce89b20a3de2f405018f1ac1249b9ff705fdb62a521b"; - - static REQUEST: Lazy = Lazy::new(|| UnfilledForwardRequest { - chain_id: 42, - target: "0x61bBe925A5D646cE074369A6335e5095Ea7abB7A".to_owned(), - data: "4b327067000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeaeeeeeeeeeeeeeeeee" - .to_owned(), - fee_token: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE".to_owned(), - payment_type: 1, - max_fee: 10000000000000000000, - gas: 200000, - sponsor: DUMMY_SPONSOR_ADDRESS.to_owned(), - sponsor_chain_id: 42, - nonce: 0, - enforce_sponsor_nonce: false, - enforce_sponsor_nonce_ordering: false, - }); - - #[test] - fn it_computes_domain_separator() { - let domain_separator = REQUEST.domain_separator().unwrap(); - - assert_eq!( - format!("0x{}", hex::encode(domain_separator)), - DOMAIN_SEPARATOR, - ); - } - - #[tokio::test] - async fn it_computes_and_signs_digest() { - let sponsor: LocalWallet = DUMMY_SPONSOR_KEY.parse().unwrap(); - assert_eq!(DUMMY_SPONSOR_ADDRESS, format!("{:#x}", sponsor.address())); - - let signature = sponsor.sign_typed_data(&*REQUEST).await.unwrap().to_vec(); - - let hex_sig = format!("0x{}", hex::encode(signature)); - assert_eq!(SPONSOR_SIGNATURE, hex_sig); - } -} diff --git a/chains/nomad-ethereum/src/gelato/utils.rs b/chains/nomad-ethereum/src/gelato/utils.rs deleted file mode 100644 index d289d0c0..00000000 --- a/chains/nomad-ethereum/src/gelato/utils.rs +++ /dev/null @@ -1,46 +0,0 @@ -use std::collections::HashMap; - -use ethers::types::Address; -use once_cell::sync::Lazy; -use std::str::FromStr; - -pub static CHAIN_ID_TO_FORWARDER: Lazy> = Lazy::new(|| { - HashMap::from([ - // Kovan - ( - 42, - Address::from_str("0x4F36f93F58d36DcbC1E60b9bdBE213482285C482") - .expect("!forwarder proxy"), - ), - // Goerli - ( - 5, - Address::from_str("0x61BF11e6641C289d4DA1D59dC3E03E15D2BA971c") - .expect("!forwarder proxy"), - ), - // Rinkeby - ( - 4, - Address::from_str("0x9B79b798563e538cc326D03696B3Be38b971D282") - .expect("!forwarder proxy"), - ), - // Evmos - ( - 9001, - Address::from_str("0x9561aCdf04C2B639dFfeCB357438e7B3eD979C5C") - .expect("!forwarder proxy"), - ), - // BSC - ( - 56, - Address::from_str("0xeeea839E2435873adA11d5dD4CAE6032742C0445") - .expect("!forwarder proxy"), - ), - // Polygon - ( - 137, - Address::from_str("0xc2336e796F77E4E57b6630b6dEdb01f5EE82383e") - .expect("!forwarder proxy"), - ), - ]) -}); diff --git a/chains/nomad-ethereum/src/macros.rs b/chains/nomad-ethereum/src/macros.rs index b4103bf1..b9b84fdf 100644 --- a/chains/nomad-ethereum/src/macros.rs +++ b/chains/nomad-ethereum/src/macros.rs @@ -168,14 +168,14 @@ macro_rules! tx_submitter_gelato { ($base_provider:expr, $gelato_conf:ident) => {{ let signer = nomad_core::Signers::try_from_signer_conf(&$gelato_conf.sponsor).await?; let sponsor = signer.clone(); - let chain_id = $base_provider.get_chainid().await?.as_usize(); + let chain_id = $base_provider.get_chainid().await?.as_u64(); let signing_provider: Arc<_> = wrap_with_signer!($base_provider.clone(), signer); // kludge: only using signing provider for type consistency with TxSubmitter::Local let client = SingleChainGelatoClient::with_default_url( signing_provider, sponsor, chain_id, - $gelato_conf.fee_token, + $gelato_conf.fee_token.parse::().expect("invalid gelato fee token"), false, ); TxSubmitter::new(client.into()) diff --git a/gelato-relay/CHANGELOG.md b/gelato-relay/CHANGELOG.md deleted file mode 100644 index 704285cf..00000000 --- a/gelato-relay/CHANGELOG.md +++ /dev/null @@ -1,6 +0,0 @@ -# Changelog - -# Unreleased - -- adds bindings getting estimated relayer fee -- adds bindings for sending relay txs, getting supported chains, and fetching task status diff --git a/gelato-relay/Cargo.toml b/gelato-relay/Cargo.toml deleted file mode 100644 index de3d75f1..00000000 --- a/gelato-relay/Cargo.toml +++ /dev/null @@ -1,22 +0,0 @@ -[package] -name = "gelato-relay" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -tokio = { version = "1.0.1", features = ["rt", "macros"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0", default-features = false } -ethers = { git = "https://github.com/gakonst/ethers-rs", branch = "master" } -thiserror = { version = "1.0.22", default-features = false } -async-trait = { version = "0.1.42", default-features = false } -futures-util = "0.3.12" -color-eyre = "0.5.0" -reqwest = { version = "0.11.10", features = ["json"]} -tracing = "0.1.22" - -[[bin]] -name = "status" -path = "bin/status.rs" \ No newline at end of file diff --git a/gelato-relay/README.md b/gelato-relay/README.md deleted file mode 100644 index 7d724035..00000000 --- a/gelato-relay/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Gelato Relay SDK Bindings - -This crate reimplements [Gelato's Relay SDK](https://github.com/gelatodigital/relay-sdks-monorepo/tree/07b8cec8b8370547e5632b3a6c33362df2f80125/packages/relay-sdk) in Rust. It simply wraps Gelato Relay requests and responses to/from Gelato endpoints with Rust types and methods. diff --git a/gelato-relay/bin/status.rs b/gelato-relay/bin/status.rs deleted file mode 100644 index da832393..00000000 --- a/gelato-relay/bin/status.rs +++ /dev/null @@ -1,14 +0,0 @@ -use gelato_relay::*; - -#[tokio::main] -async fn main() -> Result<(), reqwest::Error> { - let gelato = GelatoClient::default(); - - let task_status = gelato - .get_task_status("0x6265e895da9daf43ad028392669809127e4524760528488953e775f2be2b2b3e") - .await - .unwrap(); - println!("Task status: {:?}", task_status); - - Ok(()) -} diff --git a/gelato-relay/src/lib.rs b/gelato-relay/src/lib.rs deleted file mode 100644 index 9396a057..00000000 --- a/gelato-relay/src/lib.rs +++ /dev/null @@ -1,112 +0,0 @@ -mod types; -pub use types::*; - -use color_eyre::eyre::Result; - -const DEFAULT_URL: &str = "https://relay.gelato.digital"; - -#[derive(Debug, Clone)] -pub struct GelatoClient { - url: String, -} - -impl Default for GelatoClient { - fn default() -> Self { - Self::new(DEFAULT_URL.to_owned()) - } -} - -impl GelatoClient { - pub fn new(url: String) -> Self { - Self { url } - } - - pub async fn send_relay_transaction( - &self, - chain_id: usize, - dest: &str, - data: &str, - token: &str, - relayer_fee: usize, - ) -> Result { - let params = RelayRequest { - dest: dest.to_owned(), - data: data.to_owned(), - token: token.to_owned(), - relayer_fee: relayer_fee.to_string(), - }; - - let url = format!("{}/relays/{}", &self.url, chain_id); - let res = reqwest::Client::new() - .post(url) - .json(¶ms) - .send() - .await?; - - res.json().await - } - - pub async fn send_forward_request( - &self, - params: &ForwardRequest, - ) -> Result { - let url = format!("{}/metabox-relays/{}", self.url, params.chain_id); - - let res = reqwest::Client::new() - .post(url) - .json(¶ms) - .send() - .await?; - - res.json().await - } - - pub async fn is_chain_supported(&self, chain_id: usize) -> Result { - let supported_chains = self.get_gelato_relay_chains().await?; - Ok(supported_chains.contains(&chain_id.to_string())) - } - - pub async fn get_gelato_relay_chains(&self) -> Result, reqwest::Error> { - let url = format!("{}/relays", self.url); - let res = reqwest::get(url).await?; - Ok(res.json::().await?.relays) - } - - pub async fn get_estimated_fee( - &self, - chain_id: usize, - payment_token: &str, - gas_limit: usize, - is_high_priority: bool, - ) -> Result { - let payment_token = payment_token.to_string(); - let gas_limit = gas_limit.to_string(); - let is_high_priority = is_high_priority.to_string(); - let params = [ - ("paymentToken", payment_token), - ("gasLimit", gas_limit), - ("isHighPriority", is_high_priority), - ]; - - let base_url = format!("{}/oracles/{}/estimate", self.url, chain_id); - let url = reqwest::Url::parse_with_params(&base_url, ¶ms).expect("!url"); - let res = reqwest::get(url).await?; - - Ok(res - .json::() - .await? - .estimated_fee - .parse() - .expect("!string to int")) - } - - pub async fn get_task_status( - &self, - task_id: &str, - ) -> Result, reqwest::Error> { - let url = format!("{}/tasks/GelatoMetaBox/{}", self.url, task_id); - let res = reqwest::get(url).await?; - let task_status: TaskStatusResponse = res.json().await?; - Ok(task_status.data.first().cloned()) - } -} diff --git a/gelato-relay/src/types.rs b/gelato-relay/src/types.rs deleted file mode 100644 index 3cc2a49f..00000000 --- a/gelato-relay/src/types.rs +++ /dev/null @@ -1,130 +0,0 @@ -use serde::{Deserialize, Serialize}; - -/// Request for forwarding tx to gas-tank based relay service. -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct ForwardRequest { - pub type_id: String, - pub chain_id: usize, - pub target: String, - pub data: String, - pub fee_token: String, - pub payment_type: usize, // 1 = gas tank - pub max_fee: String, - pub gas: String, - pub sponsor: String, - pub sponsor_chain_id: usize, // same as chain_id - pub nonce: usize, // can default 0 if next field false - pub enforce_sponsor_nonce: bool, // default false given replay safe - pub enforce_sponsor_nonce_ordering: bool, - pub sponsor_signature: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct RelayRequest { - pub dest: String, - pub data: String, - pub token: String, - pub relayer_fee: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct EstimatedFeeRequest { - pub payment_token: String, - pub gas_limit: usize, - pub is_high_priority: bool, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct RelayResponse { - pub task_id: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct EstimatedFeeResponse { - pub estimated_fee: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct RelayChainsResponse { - pub relays: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct TaskStatusResponse { - pub data: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct TaskStatus { - pub service: String, - pub chain: String, - pub task_id: String, - pub task_state: TaskState, - #[serde(rename = "created_at")] - pub created_at: String, // date - pub last_check: Option, - pub execution: Option, - pub last_execution: String, // date -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct Execution { - pub status: String, - pub transaction_hash: String, - pub block_number: usize, - #[serde(rename = "created_at")] - pub created_at: String, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(untagged, rename_all = "camelCase")] -pub enum CheckOrDate { - Check(Check), - Date(String), -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct Check { - pub task_state: TaskState, - pub message: Option, - #[serde(rename = "created_at")] - pub created_at: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct Payload { - pub to: String, - pub data: String, - pub fee_data: FeeData, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -#[serde(rename_all = "camelCase")] -pub struct FeeData { - pub gas_price: usize, - pub max_fee_per_gas: usize, - pub max_priority_fee_per_gas: usize, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -pub enum TaskState { - CheckPending, - ExecPending, - ExecSuccess, - ExecReverted, - WaitingForConfirmation, - Blacklisted, - Cancelled, - NotFound, -} diff --git a/gelato-relay/tests/relay_integration_test.rs b/gelato-relay/tests/relay_integration_test.rs deleted file mode 100644 index 3d94e6a0..00000000 --- a/gelato-relay/tests/relay_integration_test.rs +++ /dev/null @@ -1,31 +0,0 @@ -use gelato_relay::*; - -#[tokio::test] -async fn bindings_query_data() -> Result<(), reqwest::Error> { - let gelato = GelatoClient::default(); - - // Ensure calling get chains returns non-empty array - let chains = gelato.get_gelato_relay_chains().await.unwrap(); - assert!(chains.len() > 0); - - // Ensure calling get task status returns a result - let task_status = gelato - .get_task_status("0xce52ae7a6a3032848d76b161ac4c131fa995dcc67e3be5392dfb8466275d6679") - .await - .unwrap(); - assert!(task_status.is_some()); - - // Ensure we calling estimate fee on mainnet ethereum doesn't return error - let mainnet: usize = chains[0].parse().unwrap(); - let _ = gelato - .get_estimated_fee( - mainnet, - "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", - 100_000, - true, - ) - .await - .unwrap(); - - Ok(()) -}