diff --git a/config/services.go b/config/services.go index 311f6191..bd2d2ba2 100644 --- a/config/services.go +++ b/config/services.go @@ -221,22 +221,21 @@ func (s *AppServices) loadBux(ctx context.Context, appConfig *AppConfig, testMod options = append(options, bux.WithNotifications(appConfig.Notifications.WebhookEndpoint)) } - // Load the monitor if appConfig.Monitor != nil && appConfig.Monitor.Enabled { if appConfig.Monitor.BuxAgentURL == "" { - return errors.New("BuxAgentURL is required for monitoring") + err = errors.New("CentrifugeServer is required for monitoring to work") + return } options = append(options, bux.WithMonitoring(ctx, &chainstate.MonitorOptions{ - AuthToken: appConfig.Monitor.AuthToken, - BuxAgentURL: appConfig.Monitor.BuxAgentURL, Debug: appConfig.Monitor.Debug, + BuxAgentURL: appConfig.Monitor.BuxAgentURL, + MonitorDays: appConfig.Monitor.MonitorDays, + AuthToken: appConfig.Monitor.AuthToken, FalsePositiveRate: appConfig.Monitor.FalsePositiveRate, - LoadMonitoredDestinations: appConfig.Monitor.LoadMonitoredDestinations, MaxNumberOfDestinations: appConfig.Monitor.MaxNumberOfDestinations, - MonitorDays: appConfig.Monitor.MonitorDays, - ProcessMempoolOnConnect: appConfig.Monitor.ProcessMempoolOnConnect, - ProcessorType: appConfig.Monitor.ProcessorType, SaveTransactionDestinations: appConfig.Monitor.SaveTransactionDestinations, + LoadMonitoredDestinations: appConfig.Monitor.LoadMonitoredDestinations, + ProcessMempoolOnConnect: appConfig.Monitor.ProcessMempoolOnConnect, })) } diff --git a/go.mod b/go.mod index e11d50a6..e60a09d7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/99designs/gqlgen v0.17.5 - github.com/BuxOrg/bux v0.2.19-0.20220502170204-cc77a95709a1 + github.com/BuxOrg/bux v0.2.19-0.20220503161152-b03a0fa5290b github.com/go-ozzo/ozzo-validation v3.6.0+incompatible github.com/go-redis/redis/v8 v8.11.5 github.com/gofrs/uuid v4.2.0+incompatible @@ -122,7 +122,7 @@ require ( golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.10 // indirect golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect - google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e // indirect + google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect google.golang.org/grpc v1.46.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect diff --git a/go.sum b/go.sum index ecb98bd4..0e5bb505 100644 --- a/go.sum +++ b/go.sum @@ -56,10 +56,8 @@ github.com/99designs/gqlgen v0.17.5 h1:bTgv7FQz3+NROg6ooHtlkaJ82Uqrp6e5sAziXTBo1 github.com/99designs/gqlgen v0.17.5/go.mod h1:SNpLVzaF37rRLSAXtu8FKVp5I4zycneMmFX6NT4XGSU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/BuxOrg/bux v0.2.19-0.20220502170204-cc77a95709a1 h1:Qx3biOmBiu9N9VkYh7HgH/Iwdv9BZ8d7DaOy/+oxn+I= -github.com/BuxOrg/bux v0.2.19-0.20220502170204-cc77a95709a1/go.mod h1:fX+AMr8IlIKq+2Df3p8mVJ40qiCeVt3eaHgxh/Z4sdM= -github.com/BuxOrg/bux v0.2.18 h1:DZeE3SfLjJXSv9sl1jGBXHA9F08sxORfjOkEicW4Ql4= -github.com/BuxOrg/bux v0.2.18/go.mod h1:z9ylPTyItBdvHeDtXftzAuQVo2yighfGH2nbUEH9wCE= +github.com/BuxOrg/bux v0.2.19-0.20220503161152-b03a0fa5290b h1:71yCUfNrxOJlRiRW+Uj7f3pw75te8Z2J+GsPs3KCqtM= +github.com/BuxOrg/bux v0.2.19-0.20220503161152-b03a0fa5290b/go.mod h1:UcPepsPZyBNO0hSdinSJ97OcHOvYJRMxNh3WqqxQNvo= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -608,8 +606,6 @@ github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ= -github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ= -github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ= github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/libsv/go-bc v0.1.11 h1:putnzopVpWy5i+HaVSSXya7ot4mLHFOUU39JZUFfBmM= github.com/libsv/go-bc v0.1.11/go.mod h1:55OsjWtvaIEXy4w02icUi2lIdThuwqkAiSeF4GPU5tw= @@ -778,7 +774,6 @@ github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= -github.com/pelletier/go-toml/v2 v2.0.0-beta.8 h1:dy81yyLYJDwMTifq24Oi/IslOslRrDSb3jwDggjz3Z0= github.com/pelletier/go-toml/v2 v2.0.0-beta.8/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= @@ -1522,8 +1517,8 @@ google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e h1:gMjH4zLGs9m+dGzR7qHCHaXMOwsJHJKKkHtyXhtOrJk= -google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= +google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=