StaticAddr: fix deposit detection #864
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
hieblmi
force-pushed
the
fix-deposit-detection
branch
from
b5cba1f to
d8953be
Compare
bhandras
reviewed
Dec 9, 2024
hieblmi
force-pushed
the
fix-deposit-detection
branch
from
d8953be to
7b6e602
Compare
starius
reviewed
Dec 9, 2024
staticaddr/address/interface.go
Outdated
| @@ -18,7 +18,8 @@ var ( | |||
| type Store interface { | |||
| // CreateStaticAddress inserts a new static address with its parameters | |||
| // into the store. | |||
| CreateStaticAddress(ctx context.Context, addrParams *Parameters) error | |||
| CreateStaticAddress(ctx context.Context, addrParams *Parameters, | |||
| currentHeight int32) error | |||
There was a problem hiding this comment.
Why a separate argument currentHeight is needed? addrParams has new field InitiationHeight.
There was a problem hiding this comment.
removed currentHeight and use the InitiationHeight.
hieblmi
force-pushed
the
fix-deposit-detection
branch
from
7b6e602 to
23cc7ca
Compare
starius
approved these changes
Dec 9, 2024
| @@ -147,6 +171,7 @@ func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot, | |||
| ProtocolVersion: version.AddressProtocolVersion( | |||
| protocolVersion, | |||
| ), | |||
| InitiationHeight: m.currentHeight, | |||
There was a problem hiding this comment.
Can currentHeight be uninitialized (0) at this point? IMHO we should either return an error here if currentHeight is 0 (if we are sure that this won't happen) or wait for its initialization (e.g. using a cond var).
There was a problem hiding this comment.
For now I've added a check on entry of NewAddress.
staticaddr/address/manager_test.go
Outdated
| @@ -97,7 +97,7 @@ func TestManager(t *testing.T) { | |||
| // Start the manager. | |||
| go func() { | |||
| err := testContext.manager.Run(ctxb) | |||
| require.NoError(t, err) | |||
| require.ErrorContains(t, err, "context canceled") | |||
There was a problem hiding this comment.
nit: require.ErrorIs(t, err, context.Canceled)
hieblmi
force-pushed
the
fix-deposit-detection
branch
from
23cc7ca to
b1c19e8
Compare
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.
The height hint for deposit confirmations was previously set to the initiation height of the deposit manager, which does not work in case the manager is restarted before a deposit was confirmed.