From 76f7a662594b08fa0f11725672508911d86dd78e Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sun, 18 Mar 2018 17:10:01 -0700 Subject: [PATCH] config+pilot: add new config params to specify min+max autopilot chan size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In this commit, we add two new configuration parameters to allow users to specify the min and max size that the autopilot agent will create. This is useful as now users can set the values to more or less the same size, which will allow them to control the size of each created channel. Before this commit, if this wasn’t set, then the agent would try to shove as much money into a channel up until the max chan size. This was nice on testnet, but on main net, users will likely not want all their funds to be in a single channel, and instead be distributed across many channels. With things like AMP, have more channels becomes more desirable. --- config.go | 51 +++++++++++++++++++++++++++++++++++++++++++++------ pilot.go | 6 ++---- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/config.go b/config.go index afe0f1b4..a200cf5f 100644 --- a/config.go +++ b/config.go @@ -121,10 +121,11 @@ type bitcoindConfig struct { } type autoPilotConfig struct { - // TODO(roasbeef): add - Active bool `long:"active" description:"If the autopilot agent should be active or not."` - MaxChannels int `long:"maxchannels" description:"The maximum number of channels that should be created"` - Allocation float64 `long:"allocation" description:"The percentage of total funds that should be committed to automatic channel establishment"` + Active bool `long:"active" description:"If the autopilot agent should be active or not."` + MaxChannels int `long:"maxchannels" description:"The maximum number of channels that should be created"` + Allocation float64 `long:"allocation" description:"The percentage of total funds that should be committed to automatic channel establishment"` + MinChannelSize int64 `long:"minchansize" description:"The smallest channel that the autopilot agent should create"` + MaxChannelSize int64 `long:"maxchansize" description:"The larget channel taht the autopilot agent should create"` } type torConfig struct { @@ -248,8 +249,10 @@ func loadConfig() (*config, error) { MaxPendingChannels: defaultMaxPendingChannels, NoEncryptWallet: defaultNoEncryptWallet, Autopilot: &autoPilotConfig{ - MaxChannels: 5, - Allocation: 0.6, + MaxChannels: 5, + Allocation: 0.6, + MinChannelSize: int64(minChanFundingSize), + MaxChannelSize: int64(maxFundingAmount), }, TrickleDelay: defaultTrickleDelay, Alias: defaultAlias, @@ -332,6 +335,42 @@ func loadConfig() (*config, error) { cfg.BitcoindMode.Dir = cleanAndExpandPath(cfg.BitcoindMode.Dir) cfg.LitecoindMode.Dir = cleanAndExpandPath(cfg.LitecoindMode.Dir) + // Ensure that the user didn't attempt to specify negative values for + // any of the autopilot params. + if cfg.Autopilot.MaxChannelSize < 0 { + str := "%s: autopilot.maxchansize must be greater than zero" + err := fmt.Errorf(str) + fmt.Fprintln(os.Stderr, err) + return nil, err + } + if cfg.Autopilot.Allocation < 0 { + str := "%s: autopilot.allocation must be greater than zero" + err := fmt.Errorf(str) + fmt.Fprintln(os.Stderr, err) + return nil, err + } + if cfg.Autopilot.MinChannelSize < 0 { + str := "%s: autopilot.minchansize must be greater than zero" + err := fmt.Errorf(str) + fmt.Fprintln(os.Stderr, err) + return nil, err + } + if cfg.Autopilot.MaxChannelSize < 0 { + str := "%s: autopilot.maxchansize must be greater than zero" + err := fmt.Errorf(str) + fmt.Fprintln(os.Stderr, err) + return nil, err + } + + // Ensure that the specified values for the min and max channel size + // don't are within the bounds of the normal chan size constraints. + if cfg.Autopilot.MinChannelSize < int64(minChanFundingSize) { + cfg.Autopilot.MinChannelSize = int64(minChanFundingSize) + } + if cfg.Autopilot.MaxChannelSize > int64(maxFundingAmount) { + cfg.Autopilot.MaxChannelSize = int64(maxFundingAmount) + } + // Setup dial and DNS resolution functions depending on the specified // options. The default is to use the standard golang "net" package // functions. When Tor's proxy is specified, the dial function is set to diff --git a/pilot.go b/pilot.go index dd0b6ab6..e29cc485 100644 --- a/pilot.go +++ b/pilot.go @@ -142,11 +142,9 @@ func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.Agent, error) // First, we'll create the preferential attachment heuristic, // initialized with the passed auto pilot configuration parameters. - // - // TODO(roasbeef): switch here to dispatch specified heuristic - minChanSize := svr.cc.wallet.Cfg.DefaultConstraints.DustLimit * 5 prefAttachment := autopilot.NewConstrainedPrefAttachment( - minChanSize, maxFundingAmount, + btcutil.Amount(cfg.MinChannelSize), + btcutil.Amount(cfg.MaxChannelSize), uint16(cfg.MaxChannels), cfg.Allocation, )