Skip to content

Commit fa7ef1f

Browse files
tchardingtcharding
committed
Merge #381: fix(types): v24+ should use correct GetRawMempoolVerbose
7b5d159 fix(types): v24+ should use correct GetRawMempoolVerbose (Jose Storopoli) Pull request description: Some leftovers from the recent fixes. Sorry that I had not catch this earlier 😢 @tcharding this should be a patch release 0.10.1, what you think? EDIT: The diff is bad but what is doing is removing the `v17::GetRawMempoolVerbose` and adding to the `v24::GetRawMempoolVerbose` in all `v25`-`v29` versions. ACKs for top commit: tcharding: ACK 7b5d159 Tree-SHA512: bbb35dd71b2af2dee2fceac9c4c1cab0c917fee1cfa2103180eb135d9316a5338932477f8b831eac3f67e4a1b7fbf935704bbf916d6937828942273f2a9bea51
2 parents 9969c9d + 7b5d159 commit fa7ef1f

File tree

5 files changed

+45
-44
lines changed

5 files changed

+45
-44
lines changed

‎types/src/v25/mod.rs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,14 @@ pub use crate::{
274274
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
275275
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress,
276276
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
277-
GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
278-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut,
279-
GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance,
280-
GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
281-
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
282-
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
283-
LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
284-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType,
285-
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
277+
GetRawMempool, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
278+
GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError, GetTxOutSetInfo,
279+
GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfoError, ListAddressGroupings,
280+
ListAddressGroupingsError, ListAddressGroupingsItem, ListLabels, ListLockUnspent,
281+
ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError,
282+
ListUnspentItemError, ListWallets, LockUnspent, Locked, NumericError, PruneBlockchain,
283+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain,
284+
ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
286285
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
287286
SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject,
288287
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
@@ -321,11 +320,11 @@ pub use crate::{
321320
v24::{
322321
DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
323322
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
324-
GetPeerInfo, GetTransaction, GetTransactionDetail, GetTransactionError,
325-
GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub, ListSinceBlock,
326-
ListSinceBlockError, ListTransactions, ListUnspent, ListUnspentItem, MempoolEntry,
327-
MigrateWallet, PeerInfo, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
328-
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
323+
GetPeerInfo, GetRawMempoolVerbose, GetTransaction, GetTransactionDetail,
324+
GetTransactionError, GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub,
325+
ListSinceBlock, ListSinceBlockError, ListTransactions, ListUnspent, ListUnspentItem,
326+
MempoolEntry, MigrateWallet, PeerInfo, Proprietary, PsbtInput, PsbtOutput, SendAll,
327+
SendAllError, SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
329328
TaprootScriptPathSig, TransactionItem, TransactionItemError,
330329
},
331330
};

‎types/src/v26/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,9 @@ pub use crate::{
292292
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
293293
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress,
294294
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
295-
GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
296-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut,
297-
GetTxOutError, GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
295+
GetRawMempool, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
296+
GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError,
297+
GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
298298
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
299299
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
300300
LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
@@ -337,11 +337,11 @@ pub use crate::{
337337
v24::{
338338
DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
339339
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
340-
GetTransactionDetail, GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub,
341-
ListSinceBlock, ListSinceBlockError, ListTransactions, ListUnspent, ListUnspentItem,
342-
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
343-
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
344-
TaprootScriptPathSig, TransactionItem, TransactionItemError,
340+
GetRawMempoolVerbose, GetTransactionDetail, GetTxSpendingPrevout,
341+
GetTxSpendingPrevoutError, GlobalXpub, ListSinceBlock, ListSinceBlockError,
342+
ListTransactions, ListUnspent, ListUnspentItem, MempoolEntry, MigrateWallet, Proprietary,
343+
PsbtInput, PsbtOutput, SendAll, SendAllError, SimulateRawTransaction, TaprootBip32Deriv,
344+
TaprootLeaf, TaprootScript, TaprootScriptPathSig, TransactionItem, TransactionItemError,
345345
},
346346
v25::{
347347
GenerateBlock, GenerateBlockError, GetBlockStats, ListDescriptors, MempoolAcceptance,

‎types/src/v27/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ pub use crate::{
268268
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
269269
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress,
270270
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
271-
GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
272-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut,
273-
GetTxOutError, GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
271+
GetRawMempool, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
272+
GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError,
273+
GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
274274
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
275275
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
276276
LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
@@ -313,11 +313,11 @@ pub use crate::{
313313
v24::{
314314
DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
315315
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
316-
GetTransactionDetail, GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub,
317-
ListSinceBlock, ListSinceBlockError, ListTransactions, ListUnspent, ListUnspentItem,
318-
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
319-
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
320-
TaprootScriptPathSig, TransactionItem, TransactionItemError,
316+
GetRawMempoolVerbose, GetTransactionDetail, GetTxSpendingPrevout,
317+
GetTxSpendingPrevoutError, GlobalXpub, ListSinceBlock, ListSinceBlockError,
318+
ListTransactions, ListUnspent, ListUnspentItem, MempoolEntry, MigrateWallet, Proprietary,
319+
PsbtInput, PsbtOutput, SendAll, SendAllError, SimulateRawTransaction, TaprootBip32Deriv,
320+
TaprootLeaf, TaprootScript, TaprootScriptPathSig, TransactionItem, TransactionItemError,
321321
},
322322
v25::{
323323
GenerateBlock, GenerateBlockError, GetBlockStats, ListDescriptors, MempoolAcceptance,

‎types/src/v28/mod.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ pub use crate::{
289289
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
290290
GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError,
291291
GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool,
292-
GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
293-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut,
294-
GetTxOutError, GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
292+
GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
293+
GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError,
294+
GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
295295
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
296296
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
297297
LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
@@ -333,10 +333,11 @@ pub use crate::{
333333
v24::{
334334
DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
335335
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
336-
GetTransactionDetail, GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub,
337-
ListUnspent, ListUnspentItem, MempoolEntry, MigrateWallet, Proprietary, PsbtInput,
338-
PsbtOutput, SendAll, SendAllError, SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf,
339-
TaprootScript, TaprootScriptPathSig,
336+
GetRawMempoolVerbose, GetTransactionDetail, GetTxSpendingPrevout,
337+
GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem, MempoolEntry,
338+
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
339+
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
340+
TaprootScriptPathSig,
340341
},
341342
v25::{
342343
GenerateBlock, GenerateBlockError, GetBlockStats, ListDescriptors, MempoolAcceptance,

‎types/src/v29/mod.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ pub use crate::{
282282
GetBlockVerboseZero, GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty,
283283
GetMemoryInfoStats, GetMempoolInfoError, GetNetTotals, GetNetworkInfoAddress,
284284
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
285-
GetRawMempool, GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
286-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError, GetTxOut,
287-
GetTxOutError, GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
285+
GetRawMempool, GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
286+
GetReceivedByAddress, GetTransactionDetailError, GetTxOut, GetTxOutError,
287+
GetUnconfirmedBalance, ListAddressGroupings, ListAddressGroupingsError,
288288
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
289289
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
290290
LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
@@ -325,10 +325,11 @@ pub use crate::{
325325
v24::{
326326
DecodePsbt, DecodePsbtError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
327327
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
328-
GetTransactionDetail, GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub,
329-
ListUnspent, ListUnspentItem, MempoolEntry, MigrateWallet, Proprietary, PsbtInput,
330-
PsbtOutput, SendAll, SendAllError, SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf,
331-
TaprootScript, TaprootScriptPathSig,
328+
GetRawMempoolVerbose, GetTransactionDetail, GetTxSpendingPrevout,
329+
GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem, MempoolEntry,
330+
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
331+
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
332+
TaprootScriptPathSig,
332333
},
333334
v25::{
334335
GenerateBlock, GenerateBlockError, GetBlockStats, ListDescriptors, MempoolAcceptanceError,

0 commit comments

Comments
 (0)