Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(BUX-147): integrate go-broadcast-client #287

Merged
merged 4 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ type (
UseMapiFeeQuotes bool `json:"use_mapi_fee_quotes" mapstructure:"use_mapi_fee_quotes"`
MinercraftAPI string `json:"minercraft_api" mapstructure:"minercraft_api"`
MinercraftCustomAPIs []*minercraft.MinerAPIs `json:"minercraft_custom_apis" mapstructure:"minercraft_custom_apis"`
BroadcastClientAPIs []string `json:"broadcast_client_apis" mapstructure:"broadcast_client_apis"`
}

// AuthenticationConfig is the configuration for Authentication
Expand Down
5 changes: 4 additions & 1 deletion config/envs/development.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,8 @@
"engine": "taskq",
"factory": "memory",
"queue_name": "development_queue"
}
},
"broadcast_client_apis": [
"url|token"
]
}
5 changes: 4 additions & 1 deletion config/envs/docker-compose.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,8 @@
"engine": "taskq",
"factory": "memory",
"queue_name": "development_queue"
}
},
"broadcast_client_apis": [
"url|token"
]
}
5 changes: 4 additions & 1 deletion config/envs/production.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,8 @@
"engine": "taskq",
"factory": "memory",
"queue_name": "production_queue"
}
},
"broadcast_client_apis": [
"url|token"
]
}
5 changes: 4 additions & 1 deletion config/envs/staging.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,8 @@
"engine": "taskq",
"factory": "memory",
"queue_name": "staging_queue"
}
},
"broadcast_client_apis": [
"url|token"
]
}
5 changes: 4 additions & 1 deletion config/envs/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,8 @@
"engine": "taskq",
"factory": "memory",
"queue_name": "test_queue"
}
},
"broadcast_client_apis": [
"url|token"
]
}
36 changes: 36 additions & 0 deletions config/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/BuxOrg/bux/cluster"
"github.com/BuxOrg/bux/taskmanager"
"github.com/BuxOrg/bux/utils"
broadcast_client "github.com/bitcoin-sv/go-broadcast-client/broadcast/broadcast-client"
"github.com/go-redis/redis/v8"
"github.com/mrz1836/go-cachestore"
"github.com/mrz1836/go-datastore"
Expand Down Expand Up @@ -302,6 +303,19 @@ func (s *AppServices) loadBux(ctx context.Context, appConfig *AppConfig, testMod
options = append(options, bux.WithMinercraftAPIs(appConfig.MinercraftCustomAPIs))
}

if appConfig.BroadcastClientAPIs != nil {
arcClientConfigs := splitBroadcastClientApis(appConfig.BroadcastClientAPIs)
fmt.Println("arcClientConfigs", arcClientConfigs)
options = append(options, bux.WithBroadcastClientAPIs(arcClientConfigs))

builder := broadcast_client.Builder()
for _, cfg := range arcClientConfigs {
builder.WithArc(cfg)
}
broadcastClient := builder.Build()
options = append(options, bux.WithBroadcastClient(broadcastClient))
}

// Create the new client
s.Bux, err = bux.NewClient(ctx, options...)

Expand Down Expand Up @@ -373,3 +387,25 @@ func loadDatastore(options []bux.ClientOps, appConfig *AppConfig) ([]bux.ClientO

return options, nil
}

// splitBroadcastClientApis splits the broadcast client apis into a list of broadcast_client.ArcClientConfig
func splitBroadcastClientApis(apis []string) []broadcast_client.ArcClientConfig {
var arcClients []broadcast_client.ArcClientConfig
for _, api := range apis {
separatorIndex := strings.Index(api, "|")
if separatorIndex != -1 {
apiURL := api[:separatorIndex]
token := api[separatorIndex+1:]

arcClients = append(arcClients, broadcast_client.ArcClientConfig{
APIUrl: apiURL,
Token: token,
})
} else {
arcClients = append(arcClients, broadcast_client.ArcClientConfig{
APIUrl: api,
})
}
}
return arcClients
}
2 changes: 1 addition & 1 deletion go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading