Minor updates, formatting, name changes

Author: mrz1836

config/config.go

@@ -27,7 +27,7 @@ const (
 	EnvironmentStaging             = "staging"
 	EnvironmentTest                = "test"
 	HealthRequestPath              = "health"
-	Version                        = "v0.1.4"
+	Version                        = "v0.1.5"
 )
 
 // Local variables for configuration
@@ -58,7 +58,7 @@ type (
 		Mongo              *datastore.MongoDBConfig `json:"mongodb" mapstructure:"mongodb"`
 		Monitor            *MonitorOptions          `json:"monitor" mapstructure:"monitor"`
 		NewRelic           *NewRelicConfig          `json:"new_relic" mapstructure:"new_relic"`
-		Notifications    *NotificationsConfig     `json:"notifications" mapstructure:"notifications"`
+		Notifications      *NotificationsConfig     `json:"notifications" mapstructure:"notifications"`
 		Paymail            *PaymailConfig           `json:"paymail" mapstructure:"paymail"`
 		Redis              *RedisConfig             `json:"redis" mapstructure:"redis"`
 		RequestLogging     bool                     `json:"request_logging" mapstructure:"request_logging"`
@@ -99,17 +99,17 @@ type (
 
 	// MonitorOptions is the configuration for blockchain monitoring
 	MonitorOptions struct {
+		AuthToken                   string  `json:"auth_token" mapstructure:"auth_token"`                                       // Token to connect to the server with
+		CentrifugeServerURL         string  `json:"centrifuge_server_url" mapstructure:"centrifuge_server_url"`                 // The server url address
 		Debug                       bool    `json:"debug" mapstructure:"debug"`                                                 // true/false
 		Enabled                     bool    `json:"enabled" mapstructure:"enabled"`                                             // true/false
-		CentrifugeServer            string  `json:"centrifuge_server" mapstructure:"centrifuge_server"`                         // The server url address
-		Token                       string  `json:"token" mapstructure:"token"`                                                 // Token to connect to the server with
-		MonitorDays                 int     `json:"monitor_days" mapstructure:"monitor_days"`                                   // how many days in the past should we monitor an address (default: 7)
 		FalsePositiveRate           float64 `json:"false_positive_rate" mapstructure:"false_positive_rate"`                     // how many false positives do we except (default: 0.01)
-		SaveTransactionDestinations bool    `json:"save_transaction_destinations" mapstructure:"save_transaction_destinations"` // Whether to save destinations on monitored transactions
-		ProcessorType               string  `json:"processor_type" mapstructure:"processor_type"`                               // Type of processor to start monitor with. Default: bloom
-		LoadMonitoredDestinations   bool    `json:"load_monitored_destinations" mapstructure:"load_monitored_destinations"`     // Whehter to load monitored destinations`
+		LoadMonitoredDestinations   bool    `json:"load_monitored_destinations" mapstructure:"load_monitored_destinations"`     // Whether to load monitored destinations`
 		MaxNumberOfDestinations     int     `json:"max_number_of_destinations" mapstructure:"max_number_of_destinations"`       // how many destinations can the filter hold (default: 100,000)
+		MonitorDays                 int     `json:"monitor_days" mapstructure:"monitor_days"`                                   // how many days in the past should we monitor an address (default: 7)
 		ProcessMempoolOnConnect     bool    `json:"process_mempool_on_connect" mapstructure:"process_mempool_on_connect"`       // Whether to process all transactions in the mempool when connecting to centrifuge server
+		ProcessorType               string  `json:"processor_type" mapstructure:"processor_type"`                               // Type of processor to start monitor with. Default: bloom
+		SaveTransactionDestinations bool    `json:"save_transaction_destinations" mapstructure:"save_transaction_destinations"` // Whether to save destinations on monitored transactions
 	}
 
 	// NewRelicConfig is the configuration for New Relic

config/envs/development.json

@@ -33,8 +33,8 @@
   },
   "monitor": {
     "enabled": true,
-    "centrifuge_server": "ws://localhost:8000/websocket",
-    "token": "",
+    "centrifuge_server_url": "ws://localhost:8000/websocket",
+    "auth_token": "",
     "processMempoolOnConnect": true,
     "load_monitored_destinations": false,
     "save_destinations": true

config/envs/docker-compose.json

@@ -32,6 +32,14 @@
     "transactions": false,
     "uri": "mongodb://localhost:27017/bux"
   },
+  "monitor": {
+    "enabled": true,
+    "centrifuge_server_url": "ws://localhost:8000/websocket",
+    "auth_token": "",
+    "processMempoolOnConnect": true,
+    "load_monitored_destinations": false,
+    "save_destinations": true
+  },
   "new_relic": {
     "domain_name": "domain.com",
     "enabled": false,

config/envs/production.json

@@ -32,6 +32,14 @@
     "transactions": false,
     "uri": "mongodb://localhost:27017/bux"
   },
+  "monitor": {
+    "enabled": true,
+    "centrifuge_server_url": "ws://localhost:8000/websocket",
+    "auth_token": "",
+    "processMempoolOnConnect": true,
+    "load_monitored_destinations": false,
+    "save_destinations": true
+  },
   "new_relic": {
     "domain_name": "domain.com",
     "enabled": true,

config/envs/staging.json

@@ -32,6 +32,14 @@
     "transactions": false,
     "uri": "mongodb://localhost:27017/bux"
   },
+  "monitor": {
+    "enabled": true,
+    "centrifuge_server_url": "ws://localhost:8000/websocket",
+    "auth_token": "",
+    "processMempoolOnConnect": true,
+    "load_monitored_destinations": false,
+    "save_destinations": true
+  },
   "new_relic": {
     "domain_name": "domain.com",
     "enabled": true,

config/envs/test.json

@@ -37,6 +37,14 @@
     "enabled": false,
     "license_key": "BOGUS-LICENSE-KEY-1234567890987654321234"
   },
+  "monitor": {
+    "enabled": false,
+    "centrifuge_server_url": "ws://localhost:8000/websocket",
+    "auth_token": "",
+    "processMempoolOnConnect": true,
+    "load_monitored_destinations": false,
+    "save_destinations": true
+  },
   "paymail": {
     "enabled": false,
     "default_from_paymail": "from@domain.com",

config/services.go

@@ -204,26 +204,26 @@ func (s *AppServices) loadBux(ctx context.Context, appConfig *AppConfig) (err er
 		}
 	}
 
+	// Load the notifications
 	if appConfig.Notifications != nil && appConfig.Notifications.Enabled {
-		// configure the default notification handler
 		options = append(options, bux.WithNotifications(appConfig.Notifications.WebhookEndpoint))
 	}
 
+	// Load the monitor
 	if appConfig.Monitor != nil && appConfig.Monitor.Enabled {
-		if appConfig.Monitor.CentrifugeServer == "" {
-			err = errors.New("CentrifugeServer is required for monitoring to work")
-			return
+		if appConfig.Monitor.CentrifugeServerURL == "" {
+			return errors.New("CentrifugeServerURL is required for monitoring to work")
 		}
 		options = append(options, bux.WithMonitoring(ctx, &chainstate.MonitorOptions{
+			CentrifugeServer:            appConfig.Monitor.CentrifugeServerURL,
 			Debug:                       appConfig.Monitor.Debug,
-			CentrifugeServer:            appConfig.Monitor.CentrifugeServer,
-			MonitorDays:                 appConfig.Monitor.MonitorDays,
-			Token:                       appConfig.Monitor.Token,
 			FalsePositiveRate:           appConfig.Monitor.FalsePositiveRate,
-			MaxNumberOfDestinations:     appConfig.Monitor.MaxNumberOfDestinations,
-			SaveTransactionDestinations: appConfig.Monitor.SaveTransactionDestinations,
 			LoadMonitoredDestinations:   appConfig.Monitor.LoadMonitoredDestinations,
+			MaxNumberOfDestinations:     appConfig.Monitor.MaxNumberOfDestinations,
+			MonitorDays:                 appConfig.Monitor.MonitorDays,
 			ProcessMempoolOnConnect:     appConfig.Monitor.ProcessMempoolOnConnect,
+			SaveTransactionDestinations: appConfig.Monitor.SaveTransactionDestinations,
+			Token:                       appConfig.Monitor.AuthToken,
 		}))
 	}
 
@@ -280,6 +280,29 @@ func (s *AppServices) loadTestBux(ctx context.Context, appConfig *AppConfig) (er
 		return err
 	}
 
+	// Load the notifications
+	if appConfig.Notifications != nil && appConfig.Notifications.Enabled {
+		options = append(options, bux.WithNotifications(appConfig.Notifications.WebhookEndpoint))
+	}
+
+	// Load the monitor
+	if appConfig.Monitor != nil && appConfig.Monitor.Enabled {
+		if appConfig.Monitor.CentrifugeServerURL == "" {
+			return errors.New("CentrifugeServerURL is required for monitoring to work")
+		}
+		options = append(options, bux.WithMonitoring(ctx, &chainstate.MonitorOptions{
+			CentrifugeServer:            appConfig.Monitor.CentrifugeServerURL,
+			Debug:                       appConfig.Monitor.Debug,
+			FalsePositiveRate:           appConfig.Monitor.FalsePositiveRate,
+			LoadMonitoredDestinations:   appConfig.Monitor.LoadMonitoredDestinations,
+			MaxNumberOfDestinations:     appConfig.Monitor.MaxNumberOfDestinations,
+			MonitorDays:                 appConfig.Monitor.MonitorDays,
+			ProcessMempoolOnConnect:     appConfig.Monitor.ProcessMempoolOnConnect,
+			SaveTransactionDestinations: appConfig.Monitor.SaveTransactionDestinations,
+			Token:                       appConfig.Monitor.AuthToken,
+		}))
+	}
+
 	// Create the client
 	s.Bux, err = bux.NewClient(ctx, options...)