Skip to content

btc: SERIALIZE macro fix (C2POOL_SERIALIZE_METHODS, PR#71 lockstep) [PR-B/3] #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frstrtr merged 1 commit into from
Jun 10, 2026
Merged

btc: SERIALIZE macro fix (C2POOL_SERIALIZE_METHODS, PR#71 lockstep) [PR-B/3] #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/impl/btc/coin/block.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct SmallBlockHeaderType
uint32_t m_bits{};
uint32_t m_nonce{};

SERIALIZE_METHODS(SmallBlockHeaderType) { READWRITE(VarInt(obj.m_version), obj.m_previous_block, obj.m_timestamp, obj.m_bits, obj.m_nonce); }
C2POOL_SERIALIZE_METHODS(SmallBlockHeaderType) { READWRITE(VarInt(obj.m_version), obj.m_previous_block, obj.m_timestamp, obj.m_bits, obj.m_nonce); }

SmallBlockHeaderType() {}

Expand Down
4 changes: 2 additions & 2 deletions src/impl/btc/coin/p2p_messages.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct btc_addr_record_t : addr_t

btc_addr_record_t() : addr_t() {}

SERIALIZE_METHODS(btc_addr_record_t) { READWRITE(obj.m_timestamp, AsBase<addr_t>(obj)); }
C2POOL_SERIALIZE_METHODS(btc_addr_record_t) { READWRITE(obj.m_timestamp, AsBase<addr_t>(obj)); }
};
//[+] void handle_message_tx(std::shared_ptr<coind::messages::message_tx> msg, CoindProtocol* protocol); //
//[+] void handle_message_block(std::shared_ptr<coind::messages::message_block> msg, CoindProtocol* protocol); //
Expand Down Expand Up @@ -118,7 +118,7 @@ struct inventory_type
return (static_cast<uint32_t>(m_type) & MSG_WITNESS_FLAG) != 0;
}

SERIALIZE_METHODS(inventory_type) {READWRITE(Using<EnumType<IntType<32>>>(obj.m_type), obj.m_hash);}
C2POOL_SERIALIZE_METHODS(inventory_type) {READWRITE(Using<EnumType<IntType<32>>>(obj.m_type), obj.m_hash);}
};

BEGIN_MESSAGE(inv)
Expand Down
6 changes: 3 additions & 3 deletions src/impl/btc/coin/transaction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class TxPrevOut
uint256 hash;
uint32_t index;

SERIALIZE_METHODS(TxPrevOut) { READWRITE(obj.hash, obj.index); }
C2POOL_SERIALIZE_METHODS(TxPrevOut) { READWRITE(obj.hash, obj.index); }
};

class TxIn
Expand All @@ -39,7 +39,7 @@ class TxIn
uint32_t sequence;
OPScriptWitness scriptWitness; //!< Only serialized through Transaction

SERIALIZE_METHODS(TxIn) { READWRITE(obj.prevout, obj.scriptSig, obj.sequence); }
C2POOL_SERIALIZE_METHODS(TxIn) { READWRITE(obj.prevout, obj.scriptSig, obj.sequence); }
};

class TxOut
Expand All @@ -48,7 +48,7 @@ class TxOut
int64_t value;
OPScript scriptPubKey;

SERIALIZE_METHODS(TxOut) { READWRITE(obj.value, obj.scriptPubKey); }
C2POOL_SERIALIZE_METHODS(TxOut) { READWRITE(obj.value, obj.scriptPubKey); }
};

class Transaction
Expand Down
12 changes: 6 additions & 6 deletions src/impl/btc/share_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct SegwitData
SegwitData() {}
SegwitData(MerkleLink txid_merkle_link, uint256 wtxid) : m_txid_merkle_link(txid_merkle_link), m_wtxid_merkle_root(wtxid) { }

SERIALIZE_METHODS(SegwitData) { READWRITE(MERKLE_LINK_SMALL(obj.m_txid_merkle_link), obj.m_wtxid_merkle_root); }
C2POOL_SERIALIZE_METHODS(SegwitData) { READWRITE(MERKLE_LINK_SMALL(obj.m_txid_merkle_link), obj.m_wtxid_merkle_root); }
};

struct SegwitDataDefault
Expand All @@ -98,7 +98,7 @@ struct TxHashRefs
TxHashRefs() = default;
TxHashRefs(uint64_t share, uint64_t tx) : m_share_count(share), m_tx_count(tx) {}

SERIALIZE_METHODS(TxHashRefs) { READWRITE(VarInt(obj.m_share_count), VarInt(obj.m_tx_count)); }
C2POOL_SERIALIZE_METHODS(TxHashRefs) { READWRITE(VarInt(obj.m_share_count), VarInt(obj.m_tx_count)); }
};

struct ShareTxInfo
Expand All @@ -111,7 +111,7 @@ struct ShareTxInfo
ShareTxInfo(const auto& new_tx_hashes, const auto& tx_hash_refs)
: m_new_transaction_hashes(new_tx_hashes), m_transaction_hash_refs(tx_hash_refs) { }

SERIALIZE_METHODS(ShareTxInfo) { READWRITE(obj.m_new_transaction_hashes, obj.m_transaction_hash_refs); }
C2POOL_SERIALIZE_METHODS(ShareTxInfo) { READWRITE(obj.m_new_transaction_hashes, obj.m_transaction_hash_refs); }
};

struct HashLinkType
Expand All @@ -120,7 +120,7 @@ struct HashLinkType
// FixedStrType<0> m_extra_data; //pack.FixedStrType(0) # bit of a hack, but since the donation script is at the end, const_ending is long enough to always make this empty
uint64_t m_length; //pack.VarIntType()

SERIALIZE_METHODS(HashLinkType) { READWRITE(obj.m_state, /*obj.m_extra_data,*/ VarInt(obj.m_length)); }
C2POOL_SERIALIZE_METHODS(HashLinkType) { READWRITE(obj.m_state, /*obj.m_extra_data,*/ VarInt(obj.m_length)); }
};

// V36 hash link — extra_data becomes VarStr (was FixedStr(0) pre-V36)
Expand All @@ -130,7 +130,7 @@ struct V36HashLinkType
BaseScript m_extra_data; // VarStr in V36
uint64_t m_length;

SERIALIZE_METHODS(V36HashLinkType) { READWRITE(obj.m_state, obj.m_extra_data, VarInt(obj.m_length)); }
C2POOL_SERIALIZE_METHODS(V36HashLinkType) { READWRITE(obj.m_state, obj.m_extra_data, VarInt(obj.m_length)); }
};

// V36 merged mining: per-chain address entry
Expand All @@ -139,7 +139,7 @@ struct MergedAddressEntry
uint32_t m_chain_id;
BaseScript m_script;

SERIALIZE_METHODS(MergedAddressEntry) { READWRITE(obj.m_chain_id, obj.m_script); }
C2POOL_SERIALIZE_METHODS(MergedAddressEntry) { READWRITE(obj.m_chain_id, obj.m_script); }
};

// V36 merged mining: per-chain coinbase verification entry
Expand Down
Loading