diff --git a/internal/config/config.go b/internal/config/config.go index 16257fc..3ab64b7 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -19,6 +19,7 @@ import ( "os" "runtime" + "github.com/blinklabs-io/bluefin/internal/version" ouroboros "github.com/blinklabs-io/gouroboros" "github.com/kelseyhightower/envconfig" "gopkg.in/yaml.v2" @@ -62,8 +63,9 @@ type WalletConfig struct { } type MinerConfig struct { - WorkerCount int `yaml:"workers" envconfig:"WORKER_COUNT"` - HashRateInterval int `yaml:"hashRateInterval" envconfig:"HASH_RATE_INTERVAL"` + WorkerCount int `yaml:"workers" envconfig:"WORKER_COUNT"` + HashRateInterval int `yaml:"hashRateInterval" envconfig:"HASH_RATE_INTERVAL"` + Message string `yaml:"message" envconfig:"MINER_MESSAGE"` } type LoggingConfig struct { @@ -104,6 +106,7 @@ var globalConfig = &Config{ Miner: MinerConfig{ WorkerCount: max(1, runtime.NumCPU()/2), HashRateInterval: 60, + Message: fmt.Sprintf("Bluefin %s by Blink Labs", version.GetVersionString()), }, Network: "mainnet", Profile: "tuna-v1", diff --git a/internal/miner/miner.go b/internal/miner/miner.go index 2e8577f..8cfd78e 100644 --- a/internal/miner/miner.go +++ b/internal/miner/miner.go @@ -24,7 +24,6 @@ import ( "github.com/blinklabs-io/bluefin/internal/config" "github.com/blinklabs-io/bluefin/internal/logging" "github.com/blinklabs-io/bluefin/internal/storage" - "github.com/blinklabs-io/bluefin/internal/version" "github.com/blinklabs-io/bluefin/internal/wallet" models "github.com/blinklabs-io/cardano-models" @@ -208,7 +207,7 @@ func (m *Miner) Start() { 0, cbor.IndefLengthList{ userPkh, - []byte(fmt.Sprintf("Bluefin %s by Blink Labs", version.GetVersionString())), + []byte(cfg.Miner.Message), }, ) minerCredCbor, err := cbor.Encode(&minerCredential) @@ -302,13 +301,8 @@ func (m *Miner) Start() { DifficultyNumber: difficultyNumber, EpochTime: epochTime, RealTimeNow: 90000 + realTimeNow, - Extra: []byte( - fmt.Sprintf( - "Bluefin %s by Blink Labs", - version.GetVersionString(), - ), - ), - Interlink: currentInterlink, + Extra: []byte(cfg.Miner.Message), + Interlink: currentInterlink, } } else { blockData := m.blockData.(models.TunaV2State) diff --git a/internal/tx/tx.go b/internal/tx/tx.go index e75bedc..0e1b3e0 100644 --- a/internal/tx/tx.go +++ b/internal/tx/tx.go @@ -44,7 +44,6 @@ import ( "github.com/blinklabs-io/bluefin/internal/config" "github.com/blinklabs-io/bluefin/internal/logging" "github.com/blinklabs-io/bluefin/internal/storage" - "github.com/blinklabs-io/bluefin/internal/version" "github.com/blinklabs-io/bluefin/internal/wallet" ) @@ -238,7 +237,7 @@ func createTx(blockData any, nonce [16]byte) ([]byte, error) { 0, cbor.IndefLengthList{ userPkh, - []byte(fmt.Sprintf("Bluefin %s by Blink Labs", version.GetVersionString())), + []byte(cfg.Miner.Message), }, ) // Convert old and new block numbers to byte representation for use in token names