diff --git a/Cargo.lock b/Cargo.lock index 5c6db9fe51be..e986927dcd06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3263,7 +3263,7 @@ dependencies = [ "openrpc-types", "parity-db", "parking_lot", - "paste", + "pastey", "pathfinding", "petgraph 0.8.3", "pin-project-lite", diff --git a/Cargo.toml b/Cargo.toml index 6b4093543307..607f1b4f83c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,6 +90,7 @@ futures = { workspace = true } fvm2 = { package = "fvm", version = "~2.11", default-features = false } fvm3 = { package = "fvm", version = "~3.13", default-features = false } fvm4 = { package = "fvm", version = "~4.7", default-features = false, features = ["verify-signature", "nv28-dev"] } +fvm_actor_utils = "14" fvm_ipld_blockstore = "0.3.1" fvm_ipld_encoding = "0.5.3" fvm_shared2 = { package = "fvm_shared", version = "~2.11" } @@ -160,6 +161,7 @@ nunny = { version = "0.2", features = ["serde", "quickcheck", "schemars1"] } openrpc-types = "0.5" parity-db = { version = "0.5" } parking_lot = { version = "0.12", features = ["deadlock_detection"] } +pastey = "0.1" pathfinding = "4" pin-project-lite = "0.2" positioned-io = "0.3" @@ -223,8 +225,6 @@ zstd = "0.13" # optional dependencies console-subscriber = { version = "0.4", features = ["parking_lot"], optional = true } -fvm_actor_utils = "14.0.0" -paste = "1" tikv-jemallocator = { version = "0.6", optional = true } tracing-chrome = { version = "0.7", optional = true } tracing-loki = { version = "0.2", default-features = false, features = ["compat-0-2-1", "rustls"], optional = true } diff --git a/src/lotus_json/actors/params/account_params.rs b/src/lotus_json/actors/params/account_params.rs index a0fbb2013c73..5023f3a007be 100644 --- a/src/lotus_json/actors/params/account_params.rs +++ b/src/lotus_json/actors/params/account_params.rs @@ -4,7 +4,7 @@ use super::*; use crate::shim::address::Address; use jsonrpsee::core::Serialize; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::Deserialize; diff --git a/src/lotus_json/actors/params/cron_params.rs b/src/lotus_json/actors/params/cron_params.rs index b97298c0ad1a..d1d9239aea72 100644 --- a/src/lotus_json/actors/params/cron_params.rs +++ b/src/lotus_json/actors/params/cron_params.rs @@ -3,7 +3,7 @@ use super::*; use crate::shim::actors::cron::Entry; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/src/lotus_json/actors/params/eam_params.rs b/src/lotus_json/actors/params/eam_params.rs index b9023da1fb97..cc86d8102346 100644 --- a/src/lotus_json/actors/params/eam_params.rs +++ b/src/lotus_json/actors/params/eam_params.rs @@ -3,7 +3,7 @@ use super::*; use fvm_ipld_encoding::RawBytes; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/src/lotus_json/actors/params/evm_params.rs b/src/lotus_json/actors/params/evm_params.rs index 13b72bd0e40e..58466bfa56eb 100644 --- a/src/lotus_json/actors/params/evm_params.rs +++ b/src/lotus_json/actors/params/evm_params.rs @@ -5,7 +5,7 @@ use crate::rpc::eth::types::GetStorageAtParams; use crate::shim::econ::TokenAmount; use ::cid::Cid; use fvm_ipld_encoding::RawBytes; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use std::fmt::Debug; diff --git a/src/lotus_json/actors/params/init_params.rs b/src/lotus_json/actors/params/init_params.rs index a754fac3945f..32b94795317c 100644 --- a/src/lotus_json/actors/params/init_params.rs +++ b/src/lotus_json/actors/params/init_params.rs @@ -5,7 +5,7 @@ use super::*; use ::cid::Cid; use fvm_ipld_encoding::RawBytes; use jsonrpsee::core::Serialize; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::Deserialize; use std::fmt::Debug; diff --git a/src/lotus_json/actors/params/market_params.rs b/src/lotus_json/actors/params/market_params.rs index ddd78cedab62..60db603acabd 100644 --- a/src/lotus_json/actors/params/market_params.rs +++ b/src/lotus_json/actors/params/market_params.rs @@ -12,7 +12,7 @@ use crate::test_snapshots; use fil_actors_shared::fvm_ipld_bitfield::BitField; use ::cid::Cid; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use std::fmt::Debug; diff --git a/src/lotus_json/actors/params/miner_params.rs b/src/lotus_json/actors/params/miner_params.rs index df102e8a87d9..495bf120eaa3 100644 --- a/src/lotus_json/actors/params/miner_params.rs +++ b/src/lotus_json/actors/params/miner_params.rs @@ -15,7 +15,7 @@ use fvm_ipld_encoding::{BytesDe, RawBytes}; use fvm_shared4::deal::DealID; use fvm_shared4::sector::RegisteredUpdateProof; use num::BigInt; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/src/lotus_json/actors/params/multisig_params.rs b/src/lotus_json/actors/params/multisig_params.rs index b34e7f3c6177..2839edceac23 100644 --- a/src/lotus_json/actors/params/multisig_params.rs +++ b/src/lotus_json/actors/params/multisig_params.rs @@ -7,7 +7,7 @@ use crate::shim::clock::ChainEpoch; use crate::shim::econ::TokenAmount; use crate::shim::message::MethodNum; use fvm_ipld_encoding::RawBytes; -use paste::paste; +use pastey::paste; use serde::{Deserialize, Serialize}; // ConstructorParams diff --git a/src/lotus_json/actors/params/paych_params.rs b/src/lotus_json/actors/params/paych_params.rs index 0bff50ed1901..bdc126608914 100644 --- a/src/lotus_json/actors/params/paych_params.rs +++ b/src/lotus_json/actors/params/paych_params.rs @@ -6,7 +6,7 @@ use crate::shim::address::Address; use crate::shim::clock::ChainEpoch; use crate::shim::econ::TokenAmount; use fvm_ipld_encoding::RawBytes; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/src/lotus_json/actors/params/power_params.rs b/src/lotus_json/actors/params/power_params.rs index 2207cdf108bc..b9e1e091d380 100644 --- a/src/lotus_json/actors/params/power_params.rs +++ b/src/lotus_json/actors/params/power_params.rs @@ -9,7 +9,7 @@ use crate::shim::sector::RegisteredPoStProof; use fvm_ipld_encoding::{BytesDe, RawBytes}; use fvm_shared4::ActorID; use num::BigInt; -use paste::paste; +use pastey::paste; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] diff --git a/src/lotus_json/actors/params/reward_params.rs b/src/lotus_json/actors/params/reward_params.rs index 004dbd3cce64..5d005d765c53 100644 --- a/src/lotus_json/actors/params/reward_params.rs +++ b/src/lotus_json/actors/params/reward_params.rs @@ -5,7 +5,7 @@ use super::*; use crate::shim::address::Address; use crate::shim::econ::TokenAmount; use num_bigint::BigInt; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/src/lotus_json/actors/params/verified_reg_params.rs b/src/lotus_json/actors/params/verified_reg_params.rs index a358e03c9f85..3317150482ea 100644 --- a/src/lotus_json/actors/params/verified_reg_params.rs +++ b/src/lotus_json/actors/params/verified_reg_params.rs @@ -8,7 +8,7 @@ use crate::shim::sector::SectorNumber; use ::cid::Cid; use fvm_ipld_encoding::RawBytes; use fvm_shared4::{ActorID, bigint::BigInt}; -use paste::paste; +use pastey::paste; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] diff --git a/src/lotus_json/actors/states/evm_state.rs b/src/lotus_json/actors/states/evm_state.rs index faf1b9c43606..df0e97406542 100644 --- a/src/lotus_json/actors/states/evm_state.rs +++ b/src/lotus_json/actors/states/evm_state.rs @@ -4,7 +4,7 @@ use super::*; use crate::shim::actors::evm::{State, TombstoneState}; use ::cid::Cid; -use paste::paste; +use pastey::paste; #[derive(Debug, Serialize, Deserialize, JsonSchema)] #[serde(rename_all = "PascalCase")] diff --git a/src/lotus_json/actors/states/vesting_funds.rs b/src/lotus_json/actors/states/vesting_funds.rs index 71d763da10d1..28bd9d7dcb87 100644 --- a/src/lotus_json/actors/states/vesting_funds.rs +++ b/src/lotus_json/actors/states/vesting_funds.rs @@ -4,7 +4,7 @@ use super::*; use crate::shim::{clock::ChainEpoch, econ::TokenAmount}; use ::cid::Cid; -use paste::paste; +use pastey::paste; // Single LotusJson struct for VestingFund (used by all versions) #[derive(Debug, Serialize, Deserialize, JsonSchema, Clone)] diff --git a/src/lotus_json/bytecode_hash.rs b/src/lotus_json/bytecode_hash.rs index 74f7c907abfe..b2bb84bfce30 100644 --- a/src/lotus_json/bytecode_hash.rs +++ b/src/lotus_json/bytecode_hash.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0, MIT use super::*; -use paste::paste; +use pastey::paste; #[derive(Debug, Serialize, Deserialize, JsonSchema)] #[serde(rename_all = "PascalCase")] diff --git a/src/lotus_json/filter_estimate.rs b/src/lotus_json/filter_estimate.rs index e5c29c4b55d9..99bbb7c982cd 100644 --- a/src/lotus_json/filter_estimate.rs +++ b/src/lotus_json/filter_estimate.rs @@ -3,7 +3,7 @@ use super::*; use num::BigInt; -use paste::paste; +use pastey::paste; #[derive(Debug, Serialize, Deserialize, JsonSchema)] #[serde(rename_all = "PascalCase")] diff --git a/src/lotus_json/mod.rs b/src/lotus_json/mod.rs index 868e5cdbd249..a20be0692645 100644 --- a/src/lotus_json/mod.rs +++ b/src/lotus_json/mod.rs @@ -248,7 +248,7 @@ pub use vec::*; macro_rules! test_snapshots { ($module:path: $ty:ident: $($version:literal),+ $(,)?) => { $( - paste::paste! { + pastey::paste! { #[test] fn []() { use super::*; @@ -260,7 +260,7 @@ macro_rules! test_snapshots { ($module:path: $nested_path:path: $ty:ident: $($version:literal),+ $(,)?) => { $( - paste::paste! { + pastey::paste! { #[test] fn []() { use super::*; diff --git a/src/lotus_json/transient_data.rs b/src/lotus_json/transient_data.rs index 94089b74fdb4..5e40674c0229 100644 --- a/src/lotus_json/transient_data.rs +++ b/src/lotus_json/transient_data.rs @@ -4,7 +4,7 @@ use super::*; use ::cid::Cid; use fvm_shared4::ActorID; -use paste::paste; +use pastey::paste; #[derive(Debug, Serialize, Deserialize, JsonSchema)] #[serde(rename_all = "PascalCase")] diff --git a/src/rpc/registry/actors/verified_reg.rs b/src/rpc/registry/actors/verified_reg.rs index ee71ed12a681..7e8ca8a2eab6 100644 --- a/src/rpc/registry/actors/verified_reg.rs +++ b/src/rpc/registry/actors/verified_reg.rs @@ -6,7 +6,7 @@ use crate::shim::address::Address; use crate::shim::message::MethodNum; use cid::Cid; use fil_actors_shared::actor_versions::ActorVersion; -use paste::paste; +use pastey::paste; // Core methods present in all versions macro_rules! register_core_methods { diff --git a/src/shim/actors/state_load.rs b/src/shim/actors/state_load.rs index 8d4d6c05397d..b60bb44ae127 100644 --- a/src/shim/actors/state_load.rs +++ b/src/shim/actors/state_load.rs @@ -1,7 +1,7 @@ // Copyright 2019-2025 ChainSafe Systems // SPDX-License-Identifier: Apache-2.0, MIT use cid::Cid; -use paste::paste; +use pastey::paste; use super::version::*; use fvm_ipld_blockstore::Blockstore; diff --git a/src/shim/actors/version.rs b/src/shim/actors/version.rs index 6b862f4e8235..80a37d83fbe7 100644 --- a/src/shim/actors/version.rs +++ b/src/shim/actors/version.rs @@ -3,7 +3,7 @@ use crate::utils::multihash::prelude::*; use cid::Cid; use fil_actors_shared::v11::runtime::builtins::Type; -use paste::paste; +use pastey::paste; use std::sync::LazyLock; macro_rules! impl_actor_cids_type_actor { diff --git a/src/shim/version.rs b/src/shim/version.rs index 7a5290a46e38..1c33782f4442 100644 --- a/src/shim/version.rs +++ b/src/shim/version.rs @@ -10,7 +10,7 @@ use super::fvm_shared_latest::version::NetworkVersion as NetworkVersion_latest; pub use fvm_shared2::version::NetworkVersion as NetworkVersion_v2; use fvm_shared3::version::NetworkVersion as NetworkVersion_v3; use fvm_shared4::version::NetworkVersion as NetworkVersion_v4; -use paste::paste; +use pastey::paste; use schemars::JsonSchema; use serde::{Deserialize, Serialize};