From 7a6c2390c7bb10a0b5df2718e334fae9b028aecb Mon Sep 17 00:00:00 2001 From: Stas Stepanov Date: Mon, 19 Aug 2024 17:47:11 +0600 Subject: [PATCH] switch onto git source + patch revm-inspectors --- Cargo.lock | 39 ++++++++++++++++++++++++ Cargo.toml | 88 +++++++++++++++++++++++------------------------------- 2 files changed, 77 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a17223ee..72882c64f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3430,6 +3430,7 @@ dependencies = [ [[package]] name = "fluentbase-codec" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-primitives", "byteorder", @@ -3443,6 +3444,7 @@ dependencies = [ [[package]] name = "fluentbase-codec-derive" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "convert_case 0.6.0", "crypto-hashes", @@ -3454,6 +3456,7 @@ dependencies = [ [[package]] name = "fluentbase-core" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-rlp", "alloy-sol-types", @@ -3477,6 +3480,7 @@ dependencies = [ [[package]] name = "fluentbase-genesis" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-genesis", "byteorder", @@ -3494,6 +3498,7 @@ dependencies = [ [[package]] name = "fluentbase-poseidon" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "bitvec", "halo2curves 0.6.1 (git+https://github.com/privacy-scaling-explorations/halo2curves?tag=v0.6.1)", @@ -3505,6 +3510,7 @@ dependencies = [ [[package]] name = "fluentbase-runtime" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "byteorder", "chrono", @@ -3524,6 +3530,7 @@ dependencies = [ [[package]] name = "fluentbase-sdk" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-rlp", "byteorder", @@ -3540,6 +3547,7 @@ dependencies = [ [[package]] name = "fluentbase-sdk-derive" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "convert_case 0.6.0", "crypto-hashes", @@ -3555,6 +3563,7 @@ dependencies = [ [[package]] name = "fluentbase-types" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-primitives", "rwasm", @@ -3564,6 +3573,7 @@ dependencies = [ [[package]] name = "fluentbase-zktrie" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "byteorder", "fluentbase-poseidon", @@ -3613,6 +3623,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fuel-asm" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "bitflags 2.6.0", "fuel-types", @@ -3623,6 +3634,7 @@ dependencies = [ [[package]] name = "fuel-core" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-graphql", @@ -3671,6 +3683,7 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "bech32", @@ -3688,6 +3701,7 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "fuel-core-chain-config", @@ -3699,6 +3713,7 @@ dependencies = [ [[package]] name = "fuel-core-database" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "derive_more", @@ -3709,6 +3724,7 @@ dependencies = [ [[package]] name = "fuel-core-executor" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "fuel-core-storage", @@ -3722,6 +3738,7 @@ dependencies = [ [[package]] name = "fuel-core-gas-price-service" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-trait", @@ -3744,6 +3761,7 @@ dependencies = [ [[package]] name = "fuel-core-importer" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "derive_more", @@ -3759,6 +3777,7 @@ dependencies = [ [[package]] name = "fuel-core-metrics" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "parking_lot 0.12.3", "pin-project-lite", @@ -3770,6 +3789,7 @@ dependencies = [ [[package]] name = "fuel-core-poa" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-trait", @@ -3785,6 +3805,7 @@ dependencies = [ [[package]] name = "fuel-core-producer" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-trait", @@ -3799,6 +3820,7 @@ dependencies = [ [[package]] name = "fuel-core-services" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-trait", @@ -3812,6 +3834,7 @@ dependencies = [ [[package]] name = "fuel-core-storage" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "derive_more", @@ -3832,6 +3855,7 @@ dependencies = [ [[package]] name = "fuel-core-txpool" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "async-trait", @@ -3850,6 +3874,7 @@ dependencies = [ [[package]] name = "fuel-core-types" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "anyhow", "bs58", @@ -3867,6 +3892,7 @@ dependencies = [ [[package]] name = "fuel-core-upgradable-executor" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "fuel-core-executor", "fuel-core-storage", @@ -3876,6 +3902,7 @@ dependencies = [ [[package]] name = "fuel-crypto" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "coins-bip32 0.8.7", "coins-bip39 0.8.7", @@ -3895,6 +3922,7 @@ dependencies = [ [[package]] name = "fuel-derive" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "proc-macro2", "quote", @@ -3905,6 +3933,7 @@ dependencies = [ [[package]] name = "fuel-gas-price-algorithm" version = "0.31.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-core?branch=feat/fuel-vm#1b7ce6a19c4fc351f564ad4ea695381cb12f6cd9" dependencies = [ "proptest", "serde", @@ -3914,6 +3943,7 @@ dependencies = [ [[package]] name = "fuel-merkle" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "derive_more", "digest 0.10.7", @@ -3927,10 +3957,12 @@ dependencies = [ [[package]] name = "fuel-storage" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" [[package]] name = "fuel-tx" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "bitflags 2.6.0", "derivative", @@ -3952,6 +3984,7 @@ dependencies = [ [[package]] name = "fuel-types" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "fuel-derive", "hex", @@ -3962,6 +3995,7 @@ dependencies = [ [[package]] name = "fuel-vm" version = "0.55.0" +source = "git+https://github.com/fluentlabs-xyz/fuel-vm?branch=feat/fuel-vm#432b295f6a0cd360e1f86a7fb55aec0b5008df6a" dependencies = [ "anyhow", "async-trait", @@ -9698,6 +9732,7 @@ dependencies = [ [[package]] name = "revm-fluent" version = "9.0.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "auto_impl", "cfg-if", @@ -9718,6 +9753,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" +source = "git+https://github.com/fluentlabs-xyz/revm-inspectors.git?branch=devel#9ef3cf5aeccb8ca371ca11385322a7dd5c72cd77" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -9734,6 +9770,7 @@ dependencies = [ [[package]] name = "revm-interpreter-fluent" version = "5.0.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "revm-primitives", "serde", @@ -9742,6 +9779,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "7.0.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "aurora-engine-modexp", "blst", @@ -9759,6 +9797,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "4.0.0" +source = "git+https://github.com/fluentlabs-xyz/fluentbase?branch=devel#ff79e23e208ce62ed23ab738ccb4e451bc0b3dfd" dependencies = [ "alloy-primitives", "auto_impl", diff --git a/Cargo.toml b/Cargo.toml index 0c61bd1d6..19a443c79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -349,67 +349,55 @@ reth-trie-parallel = { path = "crates/trie/parallel" } #], default-features = false } #revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "4fe17f0" } - -# revm-inspectors = { git = "https://github.com/fluentlabs-xyz/revm-inspectors.git", branch = "devel", features = [ -# "rwasm", -# ] } - -#revm = { package = "revm-fluent", git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", features = [ -# "std", -# "secp256k1", -# "blst", -# "rwasm", -# # "debug_print", -#], default-features = false } -#revm-primitives = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", features = ["rwasm"] } - - -#fluentbase-poseidon = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -#fluentbase-core = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -#fluentbase-runtime = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -#fluentbase-sdk = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -#fluentbase-genesis = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -#fluentbase-types = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } - -revm = { package = "revm-fluent", path = "../fluentbase/revm/crates/revm_fluent", features = [ +revm = { package = "revm-fluent", git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", features = [ "std", "secp256k1", "blst", "rwasm", # "debug_print", ], default-features = false } +revm-primitives = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", features = ["rwasm"] } +revm-inspectors = { git = "https://github.com/fluentlabs-xyz/revm-inspectors.git", branch = "devel", features = [ + "rwasm", +] } +fluentbase-poseidon = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } +fluentbase-core = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } +fluentbase-runtime = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } +fluentbase-sdk = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } +fluentbase-genesis = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } +fluentbase-types = { git = "https://github.com/fluentlabs-xyz/fluentbase", branch = "devel", default-features = false } -revm-primitives = { package = "revm-primitives", path = "../fluentbase/revm/crates/primitives", features = ["rwasm"] } -revm-inspectors = { package = "revm-inspectors", path = "../revm-inspectors", features = ["rwasm"] } +#revm = { package = "revm-fluent", path = "../fluentbase/revm/crates/revm_fluent", features = [ +# "std", +# "secp256k1", +# "blst", +# "rwasm", +# # "debug_print", +#], default-features = false } +#revm-primitives = { package = "revm-primitives", path = "../fluentbase/revm/crates/primitives", features = ["rwasm"] } +#revm-inspectors = { package = "revm-inspectors", path = "../revm-inspectors", features = ["rwasm"] } -# rev = "db0921adb741c2673908b0d20d1e91b87f036598" - 'feat/fuel-vm' branch -#fluentbase-poseidon = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -#fluentbase-core = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -#fluentbase-runtime = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -#fluentbase-sdk = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -#fluentbase-genesis = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -#fluentbase-types = { git = "https://github.com/fluentlabs-xyz/fluentbase", rev = "db0921adb741c2673908b0d20d1e91b87f036598", default-features = false } -fluentbase-poseidon = { path = "../fluentbase/crates/poseidon", default-features = false } -fluentbase-core = { path = "../fluentbase/crates/core", default-features = false } -fluentbase-runtime = { path = "../fluentbase/crates/runtime", default-features = false } -fluentbase-sdk = { path = "../fluentbase/crates/sdk", default-features = false } -fluentbase-genesis = { path = "../fluentbase/crates/genesis", default-features = false } -fluentbase-types = { path = "../fluentbase/crates/types", default-features = false } +#fluentbase-poseidon = { path = "../fluentbase/crates/poseidon", default-features = false } +#fluentbase-core = { path = "../fluentbase/crates/core", default-features = false } +#fluentbase-runtime = { path = "../fluentbase/crates/runtime", default-features = false } +#fluentbase-sdk = { path = "../fluentbase/crates/sdk", default-features = false } +#fluentbase-genesis = { path = "../fluentbase/crates/genesis", default-features = false } +#fluentbase-types = { path = "../fluentbase/crates/types", default-features = false } # fuel -#fuel-tx = { git = "https://github.com/fluentlabs-xyz/fuel-vm", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } -#fuel-vm = { git = "https://github.com/fluentlabs-xyz/fuel-vm", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } -#fuel-core = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm" } -#fuel-core-types = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["serde", "alloc"] } -#fuel-core-executor = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } -#fuel-core-storage = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } -fuel-tx = { path = "../../fluentlabs-xyz/fuel-vm/fuel-tx", default-features = false, features = ["alloc"] } -fuel-vm = { path = "../../fluentlabs-xyz/fuel-vm/fuel-vm", default-features = false, features = ["alloc"] } -fuel-core = { path = "../fuel-core/crates/fuel-core" } -fuel-core-types = { path = "../fuel-core/crates/types", default-features = false, features = ["serde", "alloc"] } -fuel-core-executor = { path = "../fuel-core/crates/services/executor", default-features = false, features = ["alloc"] } -fuel-core-storage = { path = "../fuel-core/crates/storage", default-features = false, features = ["alloc"] } +fuel-tx = { git = "https://github.com/fluentlabs-xyz/fuel-vm", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } +fuel-vm = { git = "https://github.com/fluentlabs-xyz/fuel-vm", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } +fuel-core = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm" } +fuel-core-types = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["serde", "alloc"] } +fuel-core-executor = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } +fuel-core-storage = { git = "https://github.com/fluentlabs-xyz/fuel-core", branch = "feat/fuel-vm", default-features = false, features = ["alloc"] } +#fuel-tx = { path = "../../fluentlabs-xyz/fuel-vm/fuel-tx", default-features = false, features = ["alloc"] } +#fuel-vm = { path = "../../fluentlabs-xyz/fuel-vm/fuel-vm", default-features = false, features = ["alloc"] } +#fuel-core = { path = "../fuel-core/crates/fuel-core" } +#fuel-core-types = { path = "../fuel-core/crates/types", default-features = false, features = ["serde", "alloc"] } +#fuel-core-executor = { path = "../fuel-core/crates/services/executor", default-features = false, features = ["alloc"] } +#fuel-core-storage = { path = "../fuel-core/crates/storage", default-features = false, features = ["alloc"] } # eth alloy-chains = "0.1.15"