From a790800e4544a6bc4df5e7b8277bc7a7c0cfd501 Mon Sep 17 00:00:00 2001 From: Waylon Jepsen <57912727+0xJepsen@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:23:21 -0600 Subject: [PATCH] Some repository Tender Loving Care. Should fix release please once merged. (#959) * Some TLS chore: remove submodule chore: rm --cached examples/template chore: bump dependancies * ignore mdbook tests for now * toolchain upgrade to fix ld linking error in ci * toolchain upgrade to fix ld linking error in ci --- .github/workflows/test.yaml | 9 +- .gitmodules | 3 - Cargo.lock | 461 ++++++++++----------- Cargo.toml | 26 +- bindings/lib/forge-std | 2 +- core/Cargo.toml | 6 +- core/src/console/mod.rs | 1 - core/src/database/inspector.rs | 3 +- core/src/database/mod.rs | 2 +- core/src/environment/mod.rs | 6 +- core/src/lib.rs | 1 - docs/src/usage/arbiter_core/environment.md | 6 +- docs/src/usage/arbiter_core/middleware.md | 4 +- engine/src/agent.rs | 2 +- examples/template | 1 - 15 files changed, 242 insertions(+), 291 deletions(-) delete mode 160000 examples/template diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fb98077c..9bd67175 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,13 +16,6 @@ jobs: - name: install rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.75.0 - override: true - - name: git submodule update - run: git submodule update --init --recursive + toolchain: stable - name: test run: cargo test --workspace --all-features - # - name: template example - # run: cargo run --example minter simulate examples/minter/config.toml - # - name: minter example - # run: cargo run --example minter simulate examples/minter/config.toml diff --git a/.gitmodules b/.gitmodules index f6d3ae33..daad162e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [submodule "bindings/lib/ds-test"] path = bindings/lib/ds-test url = https://github.com/dapphub/ds-test -[submodule "examples/template"] - path = examples/template - url = https://github.com/primitivefinance/arbiter-template diff --git a/Cargo.lock b/Cargo.lock index ade4cf43..90330e1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alloy-primitives" @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.6.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d34d8de81e23b6d909c094e23b3d357e01ca36b78a8c5424c501eedbe86f0" +checksum = "50c715249705afa1e32be79dabfd35e2ef0f1cc02ad2cf48c9d1e20026ee637b" dependencies = [ "alloy-rlp", "bytes", @@ -217,10 +217,10 @@ version = "0.4.19" dependencies = [ "Inflector", "anyhow", - "arbiter-bindings 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-core 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-engine 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arbiter-bindings", + "arbiter-core", + "arbiter-engine", + "arbiter-macros", "assert_cmd", "async-trait", "clap", @@ -230,7 +230,7 @@ dependencies = [ "proc-macro2", "rayon", "revm", - "revm-primitives 2.0.0", + "revm-primitives 3.1.1", "serde", "serde_json", "syn 2.0.60", @@ -250,21 +250,11 @@ dependencies = [ "serde", ] -[[package]] -name = "arbiter-bindings" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7189a325b0e3e56b5e695d3c2fbe8dd70fffcb04b13678ff2be1ad2bb754a38" -dependencies = [ - "ethers", - "serde", -] - [[package]] name = "arbiter-core" version = "0.10.3" dependencies = [ - "arbiter-bindings 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "arbiter-bindings", "assert_matches", "async-stream", "async-trait", @@ -282,7 +272,7 @@ dependencies = [ "polars", "rand", "revm", - "revm-primitives 2.0.0", + "revm-primitives 3.1.1", "serde", "serde_json", "thiserror", @@ -292,43 +282,14 @@ dependencies = [ "uint", ] -[[package]] -name = "arbiter-core" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1761b5f12d6e4bb74264a863a0612031555817d78334513c40a0677c4ef6a596" -dependencies = [ - "arbiter-bindings 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "async-stream", - "async-trait", - "bytes", - "crossbeam-channel", - "ethers", - "futures-locks", - "futures-timer", - "futures-util", - "hashbrown 0.14.3", - "hex", - "polars", - "rand", - "revm", - "revm-primitives 2.0.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "uint", -] - [[package]] name = "arbiter-engine" version = "0.3.2" dependencies = [ "anyhow", - "arbiter-bindings 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-core 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "arbiter-bindings", + "arbiter-core", + "arbiter-macros", "async-stream", "async-trait", "crossbeam-channel", @@ -346,31 +307,6 @@ dependencies = [ "tracing-test", ] -[[package]] -name = "arbiter-engine" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e540e9fa8de7802a1269f493e8f70ae7e3adcab632f1faabe79e3d47d48b6f57" -dependencies = [ - "anyhow", - "arbiter-bindings 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-core 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", - "arbiter-macros 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "async-stream", - "async-trait", - "crossbeam-channel", - "ethers", - "futures", - "futures-util", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "toml 0.8.12", - "tracing", -] - [[package]] name = "arbiter-macros" version = "0.1.3" @@ -379,16 +315,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "arbiter-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4a04ffa19e2845c4ea58bb8470d19b13d3c95a8c846e7524d718b7dc182020" -dependencies = [ - "quote", - "syn 2.0.60", -] - [[package]] name = "argminmax" version = "0.6.2" @@ -634,9 +560,9 @@ dependencies = [ [[package]] name = "aurora-engine-modexp" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfacad86e9e138fca0670949eb8ed4ffdf73a55bded8887efe0863cd1a3a6f70" +checksum = "0aef7712851e524f35fbbb74fa6599c5cd8692056a1c36f9ca0d2001b670e7e5" dependencies = [ "hex", "num", @@ -818,9 +744,9 @@ checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -856,9 +782,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -886,9 +812,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a4bc5367b6284358d2a6a6a1dc2d92ec4b86034561c3b9d3341909752fd848" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" dependencies = [ "blst", "cc", @@ -932,12 +858,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -957,7 +884,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1092,13 +1019,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", - "strum 0.25.0", - "strum_macros 0.25.3", + "strum", + "strum_macros 0.26.2", "unicode-width", ] @@ -1479,9 +1406,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -1513,9 +1440,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1596,7 +1523,7 @@ dependencies = [ "sha2", "sha3", "thiserror", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -1756,7 +1683,7 @@ dependencies = [ "rlp", "serde", "serde_json", - "strum 0.26.2", + "strum", "syn 2.0.60", "tempfile", "thiserror", @@ -1956,9 +1883,9 @@ dependencies = [ [[package]] name = "figment" -version = "0.10.15" +version = "0.10.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7270677e7067213e04f323b55084586195f18308cd7546cfac9f873344ccceb6" +checksum = "d032832d74006f99547004d49410a4b4218e4c33382d56ca3ff89df74f86b953" dependencies = [ "atomic", "pear", @@ -1988,9 +1915,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7" dependencies = [ "crc32fast", "miniz_oxide", @@ -2158,9 +2085,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers", "send_wrapper 0.4.0", @@ -2206,9 +2133,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -2593,9 +2520,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2620,6 +2547,17 @@ dependencies = [ "serde", ] +[[package]] +name = "jsonpath_lib_polars_vendor" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4bd9354947622f7471ff713eacaabdb683ccb13bba4edccaab9860abf480b7d" +dependencies = [ + "log", + "serde", + "serde_json", +] + [[package]] name = "jsonwebtoken" version = "8.3.0" @@ -2806,9 +2744,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2974,9 +2912,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" dependencies = [ "num-bigint", "num-complex", @@ -3181,9 +3119,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -3191,15 +3129,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3495,25 +3433,29 @@ dependencies = [ [[package]] name = "polars" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43795c49010cb851d45227caa17769e83760e21d260ba6285c563b754e1652f" +checksum = "f01006048a264047d6cba081fed8e11adbd69c15956f9e53185a9ac4a541853c" dependencies = [ "getrandom", + "polars-arrow", "polars-core", + "polars-error", "polars-io", "polars-lazy", "polars-ops", + "polars-parquet", "polars-sql", "polars-time", + "polars-utils", "version_check", ] [[package]] name = "polars-arrow" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faacd21a2548fa6d50c72d6b8d4649a8e029a0f3c6c5545b7f436f0610e49b0f" +checksum = "25197f40d71f82b2f79bb394f03e555d3cc1ce4db1dd052c28318721c71e96ad" dependencies = [ "ahash", "atoi", @@ -3557,23 +3499,25 @@ dependencies = [ [[package]] name = "polars-compute" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d9dc87f8003ae0edeef5ad9ac92b2a345480bbe17adad64496113ae84706dd" +checksum = "c354515f73cdbbad03c2bf723fcd68e6825943b3ec503055abc8a8cb08ce46bb" dependencies = [ "bytemuck", + "either", "num-traits", "polars-arrow", "polars-error", "polars-utils", + "strength_reduce", "version_check", ] [[package]] name = "polars-core" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "befd4d280a82219a01035c4f901319ceba65998c594d0c64f9a439cdee1d7777" +checksum = "6f20d3c227186f74aa3c228c64ef72f5a15617322fed30b4323eaf53b25f8e7b" dependencies = [ "ahash", "bitflags 2.5.0", @@ -3603,9 +3547,9 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f2435b02d1ba36d8c1f6a722cad04e4c0b2705a3112c5706e6960d405d7798" +checksum = "d66dd0ce51f8bd620eb8bd376502fe68a2b1a446d5433ecd2e75270b0755ce76" dependencies = [ "polars-arrow-format", "regex", @@ -3615,9 +3559,9 @@ dependencies = [ [[package]] name = "polars-io" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51fba2cf014cb39c2b38353d601540fb9db643be65abb9ca8ff44b9c4c4a88e" +checksum = "b40bef2edcdc58394792c4d779465144283a09ff1836324e7b72df7978a6e992" dependencies = [ "ahash", "async-trait", @@ -3653,9 +3597,9 @@ dependencies = [ [[package]] name = "polars-json" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "973d1f40ba964e70cf0038779056a7850f649538f72d8828c21bc1a7bce312ed" +checksum = "ef86aca08f10ddc939fe95aabb44e1d2582dcb08b55d4dadb93353ce42adc248" dependencies = [ "ahash", "chrono", @@ -3674,9 +3618,9 @@ dependencies = [ [[package]] name = "polars-lazy" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83343e413346f048f3a5ad07c0ea4b5d0bada701a482878213142970b0ddff8" +checksum = "c27df26a19d3092298d31d47614ad84dc330c106e38aa8cd53727cd91c07cf56" dependencies = [ "ahash", "bitflags 2.5.0", @@ -3698,9 +3642,9 @@ dependencies = [ [[package]] name = "polars-ops" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6395f5fd5e1adf016fd6403c0a493181c1a349a7a145b2687cdf50a0d630310a" +checksum = "7f8a51c3bdc9e7c34196ff6f5c3cb17da134e5aafb1756aaf24b76c7118e63dc" dependencies = [ "ahash", "argminmax", @@ -3712,15 +3656,18 @@ dependencies = [ "hashbrown 0.14.3", "hex", "indexmap", + "jsonpath_lib_polars_vendor", "memchr", "num-traits", "polars-arrow", "polars-compute", "polars-core", "polars-error", + "polars-json", "polars-utils", "rayon", "regex", + "serde_json", "smartstring", "unicode-reverse", "version_check", @@ -3728,9 +3675,9 @@ dependencies = [ [[package]] name = "polars-parquet" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b664cac41636cc9f146fba584a8e7c2790d7335a278964529fa3e9b4eae96daf" +checksum = "b8824ee00fbbe83d69553f2711014c50361238d210ed81a7a297695b7db97d42" dependencies = [ "ahash", "async-stream", @@ -3754,9 +3701,9 @@ dependencies = [ [[package]] name = "polars-pipe" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390a831b864bc57a4cb260b0595030dfb6a4260a3723cf8ca17968ee2078b8ff" +checksum = "0c5e2c1f14e81d60cfa9afe4e611a9bad9631a2cb7cd19b7c0094d0dc32f0231" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -3773,14 +3720,15 @@ dependencies = [ "polars-utils", "rayon", "smartstring", + "uuid 1.8.0", "version_check", ] [[package]] name = "polars-plan" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb7d7527be2aa33baace9000f6772eb9df7cd57ec010a4b273435d2dc1349e8" +checksum = "ff48362bd1b078bbbec7e7ba9ec01fea58fee2887db22a8e3deaf78f322fa3c4" dependencies = [ "ahash", "bytemuck", @@ -3804,10 +3752,11 @@ dependencies = [ [[package]] name = "polars-row" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4984d97aad3d0db92afe76ebcab10b5e37a1216618b5703ae0d2917ccd6168c" +checksum = "63029da56ff6a720b190490bbc7b6263f9b72d1134311b1f381fc8d306d37770" dependencies = [ + "bytemuck", "polars-arrow", "polars-error", "polars-utils", @@ -3815,9 +3764,9 @@ dependencies = [ [[package]] name = "polars-sql" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f62a8b8f93146ec1eb2ef340d77eeb174e8010035e449bfdd424d2b1fd944a" +checksum = "3652c362959f608d1297196b973d1e3acb508a9562b886ac39bf7606b841052b" dependencies = [ "hex", "polars-arrow", @@ -3833,9 +3782,9 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d75348a51d0c97f3b83df860ecb35a6ac6c5dafc6278cac4e1ac101d96dc753" +checksum = "86eb74ea6ddfe675aa5c3f33c00dadbe2b85f0e8e3887b85db1fd5a3397267fd" dependencies = [ "atoi", "chrono", @@ -3853,9 +3802,9 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.37.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f9c955bb1e9b55d835aeb7fe4e4e8826e01abe5f0ada979ceb7d2b9af7b569" +checksum = "694656a7d2b0cd8f07660dbc8d0fb7a81066ff57a452264907531d805c1e58c4" dependencies = [ "ahash", "bytemuck", @@ -3864,6 +3813,7 @@ dependencies = [ "num-traits", "once_cell", "polars-error", + "raw-cpuid", "rayon", "smartstring", "sysinfo", @@ -3917,9 +3867,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", "syn 2.0.60", @@ -4079,6 +4029,15 @@ dependencies = [ "rand_core", ] +[[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "rayon" version = "1.10.0" @@ -4101,11 +4060,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -4226,15 +4185,15 @@ dependencies = [ [[package]] name = "revm" -version = "5.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f86bdefa6dac07d92e2f5c37d7d183f2575b2f9e0ee9cba9402dfde912524" +checksum = "72a454c1c650b2b2e23f0c461af09e6c31e1d15e1cbebe905a701c46b8a50afc" dependencies = [ "auto_impl", "cfg-if", + "dyn-clone", "ethers-core", "ethers-providers", - "futures", "revm-interpreter", "revm-precompile", "serde", @@ -4244,26 +4203,25 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "2.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a80b516cc706630e604e2fd47c281501d2fb222712be4328921361388b7d2df" +checksum = "d322f2730cd300e99d271a1704a2dfb8973d832428f5aa282aaa40e2473b5eec" dependencies = [ - "revm-primitives 2.0.0", + "revm-primitives 3.1.1", "serde", ] [[package]] name = "revm-precompile" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6912fafe7f70a264ec5895875ce2f2d0621a39263844280c9ee7f85e35bbb9e" +checksum = "931f692f3f4fc72ec39d5d270f8e9d208c4a6008de7590ee96cf948e3b6d3f8d" dependencies = [ "aurora-engine-modexp", - "blst", "c-kzg", "k256", "once_cell", - "revm-primitives 2.0.0", + "revm-primitives 3.1.1", "ripemd", "secp256k1", "sha2", @@ -4288,18 +4246,18 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "2.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b3683a40f1e94e7389c8e81e5f26bb5d30875ed0b48ab07985ec32eb6d6c712" +checksum = "cbbc9640790cebcb731289afb7a7d96d16ad94afeb64b5d0b66443bd151e79d6" dependencies = [ - "alloy-primitives 0.6.4", + "alloy-primitives 0.7.1", "auto_impl", "bitflags 2.5.0", "bitvec", - "blst", "c-kzg", "cfg-if", "derive_more", + "dyn-clone", "enumn", "hashbrown 0.14.3", "hex", @@ -4462,9 +4420,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -4475,9 +4433,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.11" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", @@ -4506,9 +4464,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rusty-fork" @@ -4548,9 +4506,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.1" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788745a868b0e751750388f4e6546eb921ef714a4317fa6954f7cde114eb2eb7" +checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" dependencies = [ "cfg-if", "derive_more", @@ -4560,9 +4518,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.1" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dc2f4e8bc344b9fc3d5f74f72c2e55bfc38d28dc2ebc69c194a3df424e4d9ac" +checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -4618,6 +4576,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ + "rand", "secp256k1-sys", ] @@ -4791,9 +4750,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -4810,9 +4769,9 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b84c23a1066e1d650ebc99aa8fb9f8ed0ab96fd36e2e836173c92fc9fb29bc" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ "ahash", "getrandom", @@ -4979,15 +4938,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" - -[[package]] -name = "strum" -version = "0.25.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -5106,9 +5059,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.8" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b1a378e48fb3ce3a5cf04359c456c9c98ff689bcf1c1bc6e6a31f247686f275" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5182,18 +5135,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -5221,9 +5174,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5242,9 +5195,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -5376,7 +5329,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.12", ] [[package]] @@ -5425,15 +5378,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.7", ] [[package]] @@ -5694,6 +5647,15 @@ dependencies = [ "serde", ] +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", +] + [[package]] name = "valuable" version = "0.1.0" @@ -5852,11 +5814,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -5872,7 +5834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5881,7 +5843,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5899,7 +5861,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -5919,17 +5881,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5940,9 +5903,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5952,9 +5915,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5964,9 +5927,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5976,9 +5945,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5988,9 +5957,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -6000,9 +5969,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -6012,9 +5981,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -6027,9 +5996,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 21bd9bfc..feaa1db2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,10 +23,6 @@ keywords = ["ethereum", "evm", "emulator", "testing", "smart-contracts"] name = "arbiter" path = "bin/main.rs" -[[example]] -name = "template" -path = "examples/template/src/main.rs" - [[example]] name = "minter" path = "examples/minter/main.rs" @@ -34,19 +30,19 @@ path = "examples/minter/main.rs" [workspace.dependencies] # Arbiter local for development -# arbiter-bindings = { path = "arbiter-bindings" } -# arbiter-core = { path = "arbiter-core" } -# arbiter-engine = { path = "arbiter-engine" } -# arbiter-macros = { path = "arbiter-macros" } +arbiter-bindings = { path = "bindings" } +arbiter-core = { path = "core" } +arbiter-engine = { path = "engine" } +arbiter-macros = { path = "macros" } # Arbiter crates.io for release, these need to be used to do crate releases! -arbiter-bindings = "0.1.4" -arbiter-core = "0.10.2" -arbiter-engine = "0.3.0" -arbiter-macros = "0.1.1" +# arbiter-bindings = "0.1.4" +# arbiter-core = "0.10.2" +# arbiter-engine = "0.3.0" +# arbiter-macros = "0.1.1" -revm = { version = "5.0.0", features = ["ethersdb", "std", "serde"] } -revm-primitives = "=2.0.0" +revm = { version = "8.0.0", features = ["ethersdb", "std", "serde"] } +revm-primitives = "3.1.1" ethers = { version = "2.0.14" } serde = { version = "1.0.198", features = ["derive"] } @@ -64,7 +60,7 @@ syn = { version = "2.0.60", features = ["full"] } proc-macro2 = { version = "1.0.79" } tracing = "0.1.40" -thiserror = { version = "1.0.58" } +thiserror = { version = "1.0.59" } anyhow = "1.0.82" # Dependencies for the release build of Arbiter bin diff --git a/bindings/lib/forge-std b/bindings/lib/forge-std index 2f6762e4..3725a22a 160000 --- a/bindings/lib/forge-std +++ b/bindings/lib/forge-std @@ -1 +1 @@ -Subproject commit 2f6762e4f73f3d835457c220b5f62dfeeb6f6341 +Subproject commit 3725a22ae52065de9966beaf32de69aee46fb530 diff --git a/core/Cargo.toml b/core/Cargo.toml index cb5b4ab6..0066355a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -26,7 +26,7 @@ serde.workspace = true serde_json.workspace = true # Types -bytes = { version = "=1.5.0" } +bytes = { version = "1.6.0" } hex = { version = "=0.4.3", default-features = false } hashbrown = "0.14.3" uint = "0.9.5" @@ -37,7 +37,7 @@ futures-util.workspace = true async-trait.workspace = true async-stream.workspace = true crossbeam-channel.workspace = true -futures-timer = { version = "=3.0.2" } +futures-timer = { version = "3.0.3" } futures-locks = { version = "=0.7.1" } # Randomness @@ -50,7 +50,7 @@ thiserror.workspace = true tracing.workspace = true # File types -polars = { version = "0.37.0", features = ["parquet", "csv", "json"] } +polars = { version = "0.38.3", features = ["parquet", "csv", "json"] } # Dependencies for the test build and development [dev-dependencies] diff --git a/core/src/console/mod.rs b/core/src/console/mod.rs index 70dcb555..baf01c9a 100644 --- a/core/src/console/mod.rs +++ b/core/src/console/mod.rs @@ -22,7 +22,6 @@ impl Inspector for ConsoleLogs { &mut self, _context: &mut EvmContext, call: &mut CallInputs, - _return_memory_offset: Range, ) -> Option { if call.contract == CONSOLE_ADDRESS { self.0.push(call.input.clone()); diff --git a/core/src/database/inspector.rs b/core/src/database/inspector.rs index c1c1a22c..d311369d 100644 --- a/core/src/database/inspector.rs +++ b/core/src/database/inspector.rs @@ -62,10 +62,9 @@ impl Inspector for ArbiterInspector { &mut self, context: &mut EvmContext, inputs: &mut CallInputs, - return_memory_offset: Range, ) -> Option { if let Some(console_log) = &mut self.console_log { - console_log.call(context, inputs, return_memory_offset) + console_log.call(context, inputs) } else { None } diff --git a/core/src/database/mod.rs b/core/src/database/mod.rs index 19a9edf2..3be75040 100644 --- a/core/src/database/mod.rs +++ b/core/src/database/mod.rs @@ -159,7 +159,7 @@ impl DatabaseRef for ArbiterDB { impl DatabaseCommit for ArbiterDB { fn commit( &mut self, - changes: hashbrown::HashMap, + changes: revm_primitives::HashMap, ) { self.state.write().unwrap().commit(changes) } diff --git a/core/src/environment/mod.rs b/core/src/environment/mod.rs index d47eada8..4586c52b 100644 --- a/core/src/environment/mod.rs +++ b/core/src/environment/mod.rs @@ -480,7 +480,7 @@ impl Environment { match logs.get_mut(&evm.block().number) { Some(log_vec) => { log_vec.extend(revm_logs_to_ethers_logs( - execution_result.logs(), + execution_result.logs().to_vec(), &receipt_data, )); } @@ -488,7 +488,7 @@ impl Environment { logs.insert( evm.block().number, revm_logs_to_ethers_logs( - execution_result.logs(), + execution_result.logs().to_vec(), &receipt_data, ), ); @@ -496,7 +496,7 @@ impl Environment { } match event_broadcaster.send(Broadcast::Event( - execution_result.logs(), + execution_result.logs().to_vec(), receipt_data.clone(), )) { Ok(_) => {} diff --git a/core/src/lib.rs b/core/src/lib.rs index b8cab2c2..2990cc91 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -41,7 +41,6 @@ use std::{ collections::{BTreeMap, HashMap}, convert::Infallible, fmt::Debug, - ops::Range, sync::{Arc, RwLock}, }; diff --git a/docs/src/usage/arbiter_core/environment.md b/docs/src/usage/arbiter_core/environment.md index 2586b53e..17fb80b1 100644 --- a/docs/src/usage/arbiter_core/environment.md +++ b/docs/src/usage/arbiter_core/environment.md @@ -6,7 +6,7 @@ The `Socket` is a struct owned by the `Environment` that manages all inward and ## Usage To create an `Environment`, we use a builder pattern that allows you to pre-load an `Environment` with your own database. We can do the following to create a default `Environment`: -```rust +```rust, ignore use arbiter_core::environment::Environment; fn main() { @@ -18,7 +18,7 @@ Note that the call to `.build()` will start the `Environment`'s thread and begin ### Inspector Configuration The `Environment` also supports the ability to inspect the `revm` instance's state at any point in time which can be useful for debugging and managing gas. By default, the `Environment` will not inspect the `revm` instance's state at all (which should provide the highest speed), but you can enable these features by doing the following: -```rust +```rust, ignore use arbiter_core::environment::Environment; fn main() { @@ -48,7 +48,7 @@ This will create an `Environment` that has been forked from the database at the `Environment` supports more customization for the `gas_limit` and `contract_size_limit` of the `revm` instance. You can do the following: -```rust +```rust, ignore use arbiter_core::environment::Environment; fn main() { diff --git a/docs/src/usage/arbiter_core/middleware.md b/docs/src/usage/arbiter_core/middleware.md index 8c9209cd..627f8553 100644 --- a/docs/src/usage/arbiter_core/middleware.md +++ b/docs/src/usage/arbiter_core/middleware.md @@ -16,7 +16,7 @@ Fortunately, for almost every usecase of `ArbiterMiddleware`, you will not need ## Usage To create a `ArbiterMiddleware` that is associated with an account in the `Environment`'s world state, we can do the following: -```rust +```rust, ignore use arbiter_core::{middleware::ArbiterMiddleware, environment::Environment}; fn main() { @@ -31,7 +31,7 @@ fn main() { } ``` These created clients can then get access to making calls and transactions to contracts deployed into the `Environment`'s world state. We can do the following: -```rust +```rust, ignore use arbiter_core::{middleware::ArbiterMiddleware, environment::Environment}; use arbiter_bindings::bindings::arbiter_token::ArbiterToken; diff --git a/engine/src/agent.rs b/engine/src/agent.rs index 9d74ba2b..67dc927e 100644 --- a/engine/src/agent.rs +++ b/engine/src/agent.rs @@ -80,7 +80,7 @@ impl AgentBuilder { /// when the agent builder is added to the [`crate::world::World`] pub fn with_behavior( mut self, - behavior: impl Behavior + Serialize + DeserializeOwned + 'static, + behavior: impl Behavior + 'static, ) -> Self { let engine = Engine::new(behavior); if let Some(engines) = &mut self.behavior_engines { diff --git a/examples/template b/examples/template deleted file mode 160000 index 6211811e..00000000 --- a/examples/template +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6211811ee2748d803fa27a755d51f5298a80f9e4