From aff1e215f613375bfa235ab136b1ab8898e6bfb5 Mon Sep 17 00:00:00 2001 From: ffranr Date: Tue, 19 Sep 2023 14:31:23 +0100 Subject: [PATCH] multi: remove config param AcceptRemoteUniverseProofs We can remove this parameter and use the macaroon whitelist to control this behaviour. --- config.go | 2 -- rpcserver.go | 4 ---- tapcfg/server.go | 11 +++++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/config.go b/config.go index 044c3a497..fbc38e568 100644 --- a/config.go +++ b/config.go @@ -83,8 +83,6 @@ type Config struct { // connecting to itself as a federation member. RuntimeID int64 - AcceptRemoteUniverseProofs bool - // TODO(roasbeef): use the Taproot Asset chain param wrapper here? ChainParams chaincfg.Params diff --git a/rpcserver.go b/rpcserver.go index cc0709b91..5289161e3 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -2921,10 +2921,6 @@ func (r *rpcServer) InsertProof(ctx context.Context, return nil, fmt.Errorf("key cannot be nil") } - if !r.cfg.AcceptRemoteUniverseProofs { - return nil, fmt.Errorf("remote proofs not accepted") - } - universeID, err := unmarshalUniID(req.Key.Id) if err != nil { return nil, err diff --git a/tapcfg/server.go b/tapcfg/server.go index 60c50bc5b..de993e31d 100644 --- a/tapcfg/server.go +++ b/tapcfg/server.go @@ -270,12 +270,11 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger, }) return &tap.Config{ - DebugLevel: cfg.DebugLevel, - RuntimeID: runtimeID, - AcceptRemoteUniverseProofs: cfg.Universe.AcceptRemoteProofs, - Lnd: lndServices, - ChainParams: cfg.ActiveNetParams, - ReOrgWatcher: reOrgWatcher, + DebugLevel: cfg.DebugLevel, + RuntimeID: runtimeID, + Lnd: lndServices, + ChainParams: cfg.ActiveNetParams, + ReOrgWatcher: reOrgWatcher, AssetMinter: tapgarden.NewChainPlanter(tapgarden.PlanterConfig{ GardenKit: tapgarden.GardenKit{ Wallet: walletAnchor,