Added GetTransactionMerkle to Electrum client #3578
Merged
Conversation
This file contains 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
tomaszslabon
requested review from
pdyraga,
lukasz-zimnoch and
nkuba
and removed request for
pdyraga
tomaszslabon
force-pushed
the
modify-electrum
branch
from
fd1e44a to
150775e
Compare
pdyraga
reviewed
May 19, 2023
pdyraga
reviewed
May 19, 2023
pdyraga
reviewed
May 19, 2023
pdyraga
reviewed
May 19, 2023
pdyraga
reviewed
May 22, 2023
tomaszslabon
force-pushed
the
modify-electrum
branch
from
615e6b5 to
2b1f14c
Compare
nkuba
requested changes
May 23, 2023
pkg/bitcoin/electrum/electrum.go
Outdated
Comment on lines
311
to
323
| getMerkleProofResult, err := requestWithRetry( | ||
| c, | ||
| func( | ||
| ctx context.Context, | ||
| client *electrum.Client, | ||
| ) (*electrum.GetMerkleProofResult, error) { | ||
| return client.GetMerkleProof( | ||
| ctx, | ||
| transactionHash.String(), | ||
| uint32(blockHeight), | ||
| ) | ||
| }, | ||
| ) |
There was a problem hiding this comment.
We should pass the transaction hash in the ReversedByteOrder and be consistent with other functions implementations, see an example in the GetTransaction function.
Suggested change
| getMerkleProofResult, err := requestWithRetry( | |
| c, | |
| func( | |
| ctx context.Context, | |
| client *electrum.Client, | |
| ) (*electrum.GetMerkleProofResult, error) { | |
| return client.GetMerkleProof( | |
| ctx, | |
| transactionHash.String(), | |
| uint32(blockHeight), | |
| ) | |
| }, | |
| ) | |
| txID := transactionHash.Hex(bitcoin.ReversedByteOrder) | |
| getMerkleProofResult, err := requestWithRetry( | |
| c, | |
| func( | |
| ctx context.Context, | |
| client *electrum.Client, | |
| ) (*electrum.GetMerkleProofResult, error) { | |
| return client.GetMerkleProof( | |
| ctx, | |
| txID, | |
| uint32(blockHeight), | |
| ) | |
| }, | |
| ) |
There was a problem hiding this comment.
Done in c91b493.
| @@ -295,6 +301,88 @@ func TestGetBlockHeader_Negative_Integration(t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| func TestGetTransactionMerkleProof_Integration(t *testing.T) { | |||
| transactionHash, err := bitcoin.NewHashFromString( | |||
There was a problem hiding this comment.
Can we be consistent with other tests and define the transaction input and expected output in the test data package: "github.com/keep-network/keep-core/internal/testdata/bitcoin"?
There was a problem hiding this comment.
Moved the test data to keep-core/internal/testdata/bitcoin/transaction.go in c647f19.
pdyraga
approved these changes
May 23, 2023
|
Off to you @nkuba. |
nkuba
approved these changes
May 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds
GetTransactionMerkleProoffunction to the Electrum client implementation.This function is needed to assemble SPV proof.