-
Notifications
You must be signed in to change notification settings - Fork 2.2k
lnrpc: added weight field to the transaction return for getTransactio… #10620
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.
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
Open
kushagra0902
wants to merge
1
commit into
lightningnetwork:master
Choose a base branch
from
kushagra0902:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+31
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| package lnrpc | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/hex" | ||
| "errors" | ||
| "fmt" | ||
| "sort" | ||
|
|
||
| "github.com/btcsuite/btcd/blockchain" | ||
| "github.com/btcsuite/btcd/btcutil" | ||
| "github.com/btcsuite/btcd/chaincfg/chainhash" | ||
| "github.com/btcsuite/btcd/wire" | ||
| "github.com/lightningnetwork/lnd/lnwallet" | ||
| "github.com/lightningnetwork/lnd/lnwallet/chainfee" | ||
| "github.com/lightningnetwork/lnd/sweep" | ||
|
|
@@ -62,6 +66,18 @@ func RPCTransaction(tx *lnwallet.TransactionDetail) *Transaction { | |
| var destAddresses []string | ||
| // Re-package destination output information. | ||
| var outputDetails []*OutputDetail | ||
|
|
||
| var txWeight int64 | ||
|
|
||
| if len(tx.RawTx) > 0 { | ||
| reader := bytes.NewReader(tx.RawTx) | ||
| var msgTx wire.MsgTx | ||
| if err := msgTx.Deserialize(reader); err == nil { | ||
| txWeight = blockchain.GetTransactionWeight( | ||
| btcutil.NewTx(&msgTx), | ||
| ) | ||
| } | ||
| } | ||
| for _, o := range tx.OutputDetails { | ||
| // Note: DestAddresses is deprecated but we keep | ||
| // populating it with addresses for backwards | ||
|
|
@@ -113,6 +129,7 @@ func RPCTransaction(tx *lnwallet.TransactionDetail) *Transaction { | |
| RawTxHex: hex.EncodeToString(tx.RawTx), | ||
| Label: tx.Label, | ||
| PreviousOutpoints: previousOutpoints, | ||
| Weight: txWeight, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -226,7 +243,7 @@ func GetChannelOutPoint(chanPoint *ChannelPoint) (*OutPoint, error) { | |
| OutputIndex: chanPoint.OutputIndex, | ||
| }, nil | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This line contains unnecessary whitespace. It should be a blank line to separate logical code blocks, as per the style guide. References
|
||
| // CalculateFeeRate uses either satPerByte or satPerVByte, but not both, from a | ||
| // request to calculate the fee rate. It provides compatibility for the | ||
| // deprecated field, satPerByte. Once the field is safe to be removed, the | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This new block for calculating transaction weight can be improved in two ways:
msgTx.Deserialize(reader)is silently ignored. If deserialization fails,txWeightwill be 0, which could be misleading for the RPC caller. It's better to log this error to aid in debugging potential issues with transaction data.Here is a suggested implementation addressing both points. Note that you'll need to make the package logger available to use
log.Errorf.References