From db6f5d71c4ad56fe1f589fe87e335f5b0a16995b Mon Sep 17 00:00:00 2001 From: Slyghtning Date: Thu, 7 Mar 2024 17:27:13 +0100 Subject: [PATCH] staticaddr: interfaces --- staticaddr/deposit/sql_store.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/staticaddr/deposit/sql_store.go b/staticaddr/deposit/sql_store.go index a35dc64..bdd3e4e 100644 --- a/staticaddr/deposit/sql_store.go +++ b/staticaddr/deposit/sql_store.go @@ -207,18 +207,11 @@ func (s *SqlStore) toDeposit(row sqlc.Deposit, Hash: *txHash, Index: uint32(row.OutIndex), }, -<<<<<<< HEAD - Value: btcutil.Amount(row.Amount), - ConfirmationHeight: row.ConfirmationHeight, - TimeOutSweepPkScript: row.TimeoutSweepPkScript, - ExpirySweepTxid: expirySweepTxid, -======= Value: btcutil.Amount(row.Amount), ConfirmationHeight: row.ConfirmationHeight, TimeOutSweepPkScript: row.TimeoutSweepPkScript, - ExpirySweepTxid: *expirySweepTxid, + ExpirySweepTxid: expirySweepTxid, WithdrawalSweepAddress: row.WithdrawalSweepAddress.String, ->>>>>>> bfb8cdb (add all in one commit for the moment) }, nil }