diff --git a/config/config.go b/config/config.go index 03680a25d..bca1c41fb 100644 --- a/config/config.go +++ b/config/config.go @@ -194,8 +194,6 @@ type PaymailConfig struct { Beef *BeefConfig `json:"beef" mapstructure:"beef"` // DefaultFromPaymail IE: from@domain.com. DefaultFromPaymail string `json:"default_from_paymail" mapstructure:"default_from_paymail"` - // DefaultNote IE: message needed for address resolution. - DefaultNote string `json:"default_note" mapstructure:"default_note"` // Domains is a list of allowed domains. Domains []string `json:"domains" mapstructure:"domains"` // DomainValidationEnabled should be turned off if hosted domain is not paymail related. diff --git a/config/defaults.go b/config/defaults.go index 957035fec..56c71fab8 100644 --- a/config/defaults.go +++ b/config/defaults.go @@ -69,17 +69,16 @@ func getDbDefaults() *DbConfig { URI: "mongodb://localhost:27017/xapi", }, SQL: &datastore.SQLConfig{ - Driver: "postgresql", - ExistingConnection: nil, - Host: "localhost", - Name: "xapi", - Password: "", - Port: "5432", - Replica: false, - SkipInitializeWithVersion: true, - TimeZone: "UTC", - TxTimeout: 10 * time.Second, - User: "postgres", + Driver: "postgresql", + ExistingConnection: nil, + Host: "localhost", + Name: "xapi", + Password: "", + Port: "5432", + Replica: false, + TimeZone: "UTC", + TxTimeout: 10 * time.Second, + User: "postgres", }, SQLite: &datastore.SQLiteConfig{ DatabasePath: "./bux.db", @@ -142,7 +141,6 @@ func getPaymailDefaults() *PaymailConfig { PulseAuthToken: "mQZQ6WmxURxWz5ch", // #nosec G101 }, DefaultFromPaymail: "from@domain.com", - DefaultNote: "bux Address Resolution", Domains: []string{"localhost"}, DomainValidationEnabled: true, Enabled: true, diff --git a/config/services.go b/config/services.go index f80a1b618..9651b2bd8 100644 --- a/config/services.go +++ b/config/services.go @@ -272,7 +272,6 @@ func loadPaymail(appConfig *AppConfig, options []bux.ClientOps) []bux.ClientOps options = append(options, bux.WithPaymailSupport( appConfig.Paymail.Domains, appConfig.Paymail.DefaultFromPaymail, - appConfig.Paymail.DefaultNote, appConfig.Paymail.DomainValidationEnabled, appConfig.Paymail.SenderValidationEnabled, )) diff --git a/go.mod b/go.mod index 9aaa21dc5..c9f05449b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.5 require ( github.com/99designs/gqlgen v0.17.42 - github.com/BuxOrg/bux v0.13.1-0.20240112122920-06feabacfc3c + github.com/BuxOrg/bux v0.13.1-0.20240116121339-e3456690d172 github.com/BuxOrg/bux-models v0.3.0 github.com/bitcoin-sv/go-broadcast-client v0.16.0 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible diff --git a/go.sum b/go.sum index 87cdf60de..72604467a 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,8 @@ github.com/99designs/gqlgen v0.17.42 h1:BVWDOb2VVHQC5k3m6oa0XhDnxltLLrU4so7x/u39Zu4= github.com/99designs/gqlgen v0.17.42/go.mod h1:GQ6SyMhwFbgHR0a8r2Wn8fYgEwPxxmndLFPhU63+cJE= -github.com/BuxOrg/bux v0.13.1-0.20240112122920-06feabacfc3c h1:g2GVA3RZ+NebgVmJltYF9RgXTBPm+CCnJFRHoHmfUTI= github.com/BuxOrg/bux v0.13.1-0.20240112122920-06feabacfc3c/go.mod h1:qqsUfSVqp3IJv5NajpoMcHiAouw+40IX7sBBCclhJvo= +github.com/BuxOrg/bux v0.13.1-0.20240116121339-e3456690d172 h1:f9PD1nqWwRWYOaiR0avX/fVVclPl1ksefWu3ihifwoQ= +github.com/BuxOrg/bux v0.13.1-0.20240116121339-e3456690d172/go.mod h1:qqsUfSVqp3IJv5NajpoMcHiAouw+40IX7sBBCclhJvo= github.com/BuxOrg/bux-models v0.3.0 h1:+pvpDdYaiIgeOhAO847RK07Vzc+vuUvy2ok/xJevQyg= github.com/BuxOrg/bux-models v0.3.0/go.mod h1:JCpoXxVnKZmCy3rg6nOtLQL5AXh6iEo2tBvcD/qAxEY= github.com/DATA-DOG/go-sqlmock v1.5.1 h1:FK6RCIUSfmbnI/imIICmboyQBkOckutaa6R5YYlLZyo=