GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-18 13:08:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

build: update lndclient (btcd v2)

Browse source 
Include https://github.com/lightninglabs/lndclient/pull/280
multi: migrate to btcd v2 modules + add WalletKit.SubmitPackage

Migrate Loop imports and update Aperture and Taproot Assets to compatible
revisions so this commit remains green on its own.
This commit is contained in:
Boris Nagaev 2026-08-11 01:02:38 -05:00
parent aa79fa5262
commit 0ee07198f6
No known key found for this signature in database
170 changed files with 685 additions and 973 deletions
Download patch file Download diff file Expand all files Collapse all files

2
loopdb/loop.go
View file

@ -5,7 +5,7 @@ import (
"encoding/binary"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/btcutil/v2"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
)

11
loopdb/loopout.go
View file

@ -8,9 +8,10 @@ import (
"strings"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/wire"
btcaddr "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcutil/v2"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/wire/v2"
)
// LoopOutContract contains the data that is serialized to persistent storage
@ -22,7 +23,7 @@ type LoopOutContract struct {
SwapContract
// DestAddr is the destination address of the loop out swap.
DestAddr btcutil.Address
DestAddr btcaddr.Address
// IsExternalAddr indicates whether the destination address does not
// belong to the backing lnd node.
@ -202,7 +203,7 @@ func deserializeLoopOutContract(value []byte, chainParams *chaincfg.Params) (
if err != nil {
return nil, err
}
contract.DestAddr, err = btcutil.DecodeAddress(addr, chainParams)
contract.DestAddr, err = btcaddr.DecodeAddress(addr, chainParams)
if err != nil {
return nil, err
}

2
loopdb/meta.go
View file

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"go.etcd.io/bbolt"
)

6
loopdb/migrate_test.go
View file

@ -7,15 +7,15 @@ import (
"context"
"testing"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
btcaddr "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/stretchr/testify/require"
)
var (
boltDbFile = "../loopdb-kon"
addr = "bc1p4g493qcmzt79r87363fvyvq5sfz58q5gsz74g2c4ejqy5xnpcpesh3yq2y"
addrBtc, _ = btcutil.DecodeAddress(addr, &chaincfg.MainNetParams)
addrBtc, _ = btcaddr.DecodeAddress(addr, &chaincfg.MainNetParams)
)
// TestMigrationFromOnDiskBoltdb tests migrating from an on-disk boltdb to an

2
loopdb/migration_01_costs.go
View file

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"go.etcd.io/bbolt"
)

2
loopdb/migration_02_swap_publication_deadline.go
View file

@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"go.etcd.io/bbolt"
)

2
loopdb/migration_03_last_hop.go
View file

@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"go.etcd.io/bbolt"
)

2
loopdb/migration_04_updates.go
View file

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"go.etcd.io/bbolt"
)

2
loopdb/migration_04_updates_test.go
View file

@ -5,7 +5,7 @@ import (
"path/filepath"
"testing"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/stretchr/testify/require"
"go.etcd.io/bbolt"
)

2
loopdb/postgres.go
View file

@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
postgres_migrate "github.com/golang-migrate/migrate/v4/database/postgres"
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/lightninglabs/loop/loopdb/sqlc"

9
loopdb/sql_store.go
View file

@ -8,9 +8,10 @@ import (
"strings"
"time"
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
btcaddr "github.com/btcsuite/btcd/address/v2"
"github.com/btcsuite/btcd/btcutil/v2"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightninglabs/loop/loopdb/sqlc"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"
@ -586,7 +587,7 @@ func ConvertLoopOutRow(network *chaincfg.Params, row sqlc.GetLoopOutSwapRow,
return nil, err
}
destAddress, err := btcutil.DecodeAddress(row.DestAddress, network)
destAddress, err := btcaddr.DecodeAddress(row.DestAddress, network)
if err != nil {
return nil, err
}

2
loopdb/sql_test.go
View file

@ -9,7 +9,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightninglabs/loop/loopdb/sqlc"
"github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/keychain"

2
loopdb/sqlite.go
View file

@ -11,7 +11,7 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/v2"
sqlite_migrate "github.com/golang-migrate/migrate/v4/database/sqlite"
"github.com/lightninglabs/loop/loopdb/sqlc"
"github.com/lightningnetwork/lnd/zpay32"

4
loopdb/store.go
View file

@ -11,8 +11,8 @@ import (
"path/filepath"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightningnetwork/lnd/lntypes"
"go.etcd.io/bbolt"
bbolterrors "go.etcd.io/bbolt/errors"

4
loopdb/store_test.go
View file

@ -9,8 +9,8 @@ import (
"testing"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/chaincfg/v2"
"github.com/btcsuite/btcd/chainhash/v2"
"github.com/lightninglabs/loop/test"
"github.com/lightningnetwork/lnd/keychain"
"github.com/lightningnetwork/lnd/lntypes"

4
loopdb/swapstate.go
View file

@ -1,8 +1,8 @@
package loopdb
import (
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/btcutil/v2"
"github.com/btcsuite/btcd/chainhash/v2"
)
// SwapState indicates the current state of a swap. This enumeration is the