chore: remove serde_tuple in favor of fvm_ipld_encoding::tuple

Cargo.toml

@@ -183,7 +183,6 @@ semver = "1"
 serde = { version = "1", default-features = false, features = ["derive"] }
 serde_ipld_dagcbor = "0.6"
 serde_json = { version = "1", features = ["raw_value"] }
-serde_tuple = "1"
 serde_with = { version = "3", features = ["chrono_0_4"] }
 serde_yaml = "0.9"
 sha2 = { version = "0.10", default-features = false }

src/beacon/beacon_entries.rs

@@ -4,8 +4,8 @@
 use crate::utils::encoding::serde_byte_array;
 use byteorder::{BigEndian, ByteOrder as _};
 use digest::Digest as _;
+use fvm_ipld_encoding::tuple::*;
 use get_size2::GetSize;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
 
 /// The result from getting an entry from `Drand`.
 /// The entry contains the round, or epoch as well as the BLS signature for that

src/blocks/block.rs

@@ -5,7 +5,7 @@ use crate::message::SignedMessage;
 use crate::shim::message::Message;
 use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 
 use super::CachingBlockHeader;
 

src/blocks/election_proof.rs

@@ -4,11 +4,11 @@
 use crate::blocks::VRFProof;
 use crate::shim::clock::BLOCKS_PER_EPOCH;
 use crate::utils::encoding::blake2b_256;
+use fvm_ipld_encoding::tuple::*;
 use num::{
     BigInt, Integer,
     bigint::{ParseBigIntError, Sign},
 };
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
 use std::sync::LazyLock;
 
 const PRECISION: u64 = 256;

src/blocks/gossip_block.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use cid::Cid;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 
 use crate::blocks::CachingBlockHeader;
 

src/blocks/header.rs

@@ -19,10 +19,10 @@ use crate::{
 use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::CborStore as _;
+use fvm_ipld_encoding::tuple::*;
 use multihash_derive::MultihashDigest as _;
 use num::BigInt;
 use serde::{Deserialize, Serialize};
-use serde_tuple::{Deserialize_tuple, Serialize_tuple};
 
 #[cfg(test)]
 mod test;

src/blocks/ticket.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use crate::blocks::VRFProof;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 
 /// A Ticket is a marker of a tick of the blockchain's clock.  It is the source
 /// of randomness for proofs of storage and leader election.  It is generated

src/cli/subcommands/state_cmd.rs

@@ -9,7 +9,7 @@ use crate::shim::clock::ChainEpoch;
 use crate::shim::econ::TokenAmount;
 use cid::Cid;
 use clap::Subcommand;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;

src/libp2p/chain_exchange/message.rs

@@ -7,9 +7,9 @@ use crate::blocks::{BLOCK_MESSAGE_LIMIT, Block, CachingBlockHeader, FullTipset,
 use crate::message::SignedMessage;
 use crate::shim::message::Message;
 use cid::Cid;
+use fvm_ipld_encoding::tuple::*;
 use nunny::Vec as NonEmpty;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
 
 /// `ChainExchange` Filecoin header set bit.
 pub const HEADERS: u64 = 0b01;

src/libp2p/hello/message.rs

@@ -4,8 +4,8 @@
 use crate::shim::bigint::BigInt;
 use crate::shim::clock::ChainEpoch;
 use cid::Cid;
+use fvm_ipld_encoding::tuple::*;
 use nunny::Vec as NonEmpty;
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
 
 /// Hello message <https://filecoin-project.github.io/specs/#hello-spec>
 #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]

src/lotus_json/mod.rs

@@ -55,7 +55,7 @@
 //!
 //! # Lotus JSON in Forest
 //! - Have a struct which represents a domain object: e.g [`GossipBlock`](crate::blocks::GossipBlock).
-//! - Implement [`serde::Serialize`] on that object, normally using [`serde_tuple::Serialize_tuple`].
+//! - Implement [`serde::Serialize`] on that object, normally using [`fvm_ipld_encoding::tuple::Serialize_tuple`].
 //!   This corresponds to the CBOR representation.
 //! - Implement [`HasLotusJson`] on the domain object.
 //!   This attaches a separate JSON type, which should implement (`#[derive(...)]`) [`serde::Serialize`] and [`serde::Deserialize`] AND conversions to and from the domain object

src/message/signed_message.rs

@@ -10,8 +10,8 @@ use crate::shim::{
     econ::TokenAmount,
     message::Message,
 };
+use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_encoding::{RawBytes, to_vec};
-use serde_tuple::{self, Deserialize_tuple, Serialize_tuple};
 
 /// Represents a wrapped message with signature bytes.
 #[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))]

src/rpc/methods/f3/types.rs

@@ -13,7 +13,7 @@ use byteorder::ByteOrder as _;
 use cid::Cid;
 use fil_actors_shared::fvm_ipld_bitfield::BitField;
 use flate2::read::DeflateDecoder;
-use fvm_ipld_encoding::tuple::{Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 use fvm_shared4::ActorID;
 use itertools::Itertools as _;
 use libp2p::PeerId;

src/rpc/methods/miner.rs

@@ -31,13 +31,13 @@ use bls_signatures::Serialize as _;
 use cid::Cid;
 use fil_actors_shared::fvm_ipld_amt::Amtv0 as Amt;
 use fvm_ipld_blockstore::Blockstore;
+use fvm_ipld_encoding::tuple::*;
 use fvm_shared2::crypto::signature::BLS_SIG_LEN;
 use group::prime::PrimeCurveAffine as _;
 use itertools::Itertools;
 use parking_lot::RwLock;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use serde_tuple::Serialize_tuple;
 
 use std::sync::Arc;
 

src/shim/actors/builtin/verifreg/mod.rs

@@ -14,8 +14,7 @@ use fil_actor_verifreg_state::{
 use fil_actors_shared::v8::{HAMT_BIT_WIDTH, make_map_with_root_and_bitwidth};
 use fil_actors_shared::v9::Keyer;
 use fvm_ipld_blockstore::Blockstore;
-use fvm_ipld_encoding::tuple::serde_tuple;
-use fvm_ipld_encoding::tuple::{Deserialize_tuple, Serialize_tuple};
+use fvm_ipld_encoding::tuple::*;
 use fvm_shared2::address::{Address, Protocol};
 use fvm_shared4::ActorID;
 use fvm_shared4::bigint::bigint_ser::BigIntDe;