Skip to content

Commit

Permalink
Merge pull request #132 from lightninglabs/proof-courier
Browse files Browse the repository at this point in the history
multi: add new proof.Courier interface for async proof distribution
  • Loading branch information
Roasbeef authored Sep 28, 2022
2 parents c427692 + 7cc14e7 commit 986e249
Show file tree
Hide file tree
Showing 15 changed files with 591 additions and 26 deletions.
14 changes: 13 additions & 1 deletion address/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ func Net(hrp string) (*ChainParams, error) {
return &SigNetTaro, nil

case SimNetTaro.TaroHRP:
// For simnet, we'll need to slighlty modify the coin type as
// lnd only ever expects the testnet coin type (1) instead of
// the simnet coin type (115).
simNet := SimNetTaro
simNet.HDCoinType = TestNet3Taro.HDCoinType

return &SimNetTaro, nil

default:
Expand All @@ -151,7 +157,13 @@ func ParamsForChain(name string) ChainParams {
return SigNetTaro

case chaincfg.SimNetParams.Name:
return SimNetTaro
// For simnet, we'll need to slighlty modify the coin type as
// lnd only ever expects the testnet coin type (1) instead of
// the simnet coin type (115).
simNet := SimNetTaro
simNet.HDCoinType = TestNet3Taro.HDCoinType

return simNet

default:
panic(fmt.Sprintf("unknown chain: %v", name))
Expand Down
2 changes: 1 addition & 1 deletion cmd/tarocli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func main() {
cli.StringFlag{
Name: "rpcserver",
Value: defaultRPCHostPort,
Usage: "The host:port of LN daemon.",
Usage: "The host:port of taro daemon.",
},
cli.StringFlag{
Name: "tarodir",
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
github.com/jessevdk/go-flags v1.4.0
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
github.com/lightninglabs/lndclient v0.16.0-1
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
github.com/lightningnetwork/lnd v0.15.0-beta.rc6.0.20220825081330-cf9a9864cf25
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,8 @@ github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
github.com/lightninglabs/lndclient v0.16.0-1 h1:DRnCRjYrGrCmE9HTVcW9aruqeO/GkPg8QV+ClMFJMDE=
github.com/lightninglabs/lndclient v0.16.0-1/go.mod h1:G4D4/rcEnbdl8I0cTUO7oaJgEGa8WrplMv2IuPy1xu0=
github.com/lightninglabs/neutrino v0.14.2 h1:yrnZUCYMZ5ECtXhgDrzqPq2oX8awoAN2D/cgCewJcCo=
Expand Down
6 changes: 6 additions & 0 deletions itest/tarod_harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ func newTarodHarness(ht *harnessTest, cfg tarodConfig) (*tarodHarness, error) {
return nil, err
}

// We'll modify the config slightly here, since we don't need to use
// the hashmail system for integration tests.
//
// TODO(roasbeef): make local aperture instance in future
finalCfg.HashMailAddr = ""

return &tarodHarness{
cfg: &cfg,
clientCfg: finalCfg,
Expand Down
2 changes: 2 additions & 0 deletions log.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package taro

import (
"github.com/btcsuite/btclog"
"github.com/lightninglabs/taro/proof"
"github.com/lightninglabs/taro/rpcperms"
"github.com/lightninglabs/taro/tarofreighter"
"github.com/lightninglabs/taro/tarogarden"
Expand Down Expand Up @@ -90,6 +91,7 @@ func SetupLoggers(root *build.RotatingLogWriter, interceptor signal.Interceptor)
AddSubLogger(
root, tarofreighter.Subsystem, interceptor, tarofreighter.UseLogger,
)
AddSubLogger(root, proof.Subsystem, interceptor, proof.UseLogger)
}

// AddSubLogger is a helper method to conveniently create and register the
Expand Down
Loading

0 comments on commit 986e249

Please sign in to comment.