diff --git a/cmd/dca/server/config.go b/cmd/dca/server/config.go index 5ba13f3..3507e3f 100644 --- a/cmd/dca/server/config.go +++ b/cmd/dca/server/config.go @@ -5,17 +5,17 @@ import ( "os" "github.com/spf13/viper" - "github.com/vultisig/verifier/vault" + "github.com/vultisig/verifier/vault_config" "github.com/vultisig/plugin/api" "github.com/vultisig/plugin/storage" ) type DCAServerConfig struct { - Server api.ServerConfig `mapstructure:"server" json:"server"` - BaseConfigPath string `mapstructure:"base_config_path" json:"base_config_path,omitempty"` - Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` - BlockStorage vault.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` + Server api.ServerConfig `mapstructure:"server" json:"server"` + BaseConfigPath string `mapstructure:"base_config_path" json:"base_config_path,omitempty"` + Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` + BlockStorage vault_config.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` Datadog struct { Host string `mapstructure:"host" json:"host,omitempty"` Port string `mapstructure:"port" json:"port,omitempty"` diff --git a/cmd/dca/worker/config.go b/cmd/dca/worker/config.go index b3634ba..fdc4256 100644 --- a/cmd/dca/worker/config.go +++ b/cmd/dca/worker/config.go @@ -5,15 +5,15 @@ import ( "os" "github.com/spf13/viper" - "github.com/vultisig/verifier/vault" + "github.com/vultisig/verifier/vault_config" "github.com/vultisig/plugin/storage" ) type DCAWorkerConfig struct { - Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` - BlockStorage vault.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` - VaultServiceConfig vault.Config `mapstructure:"vault_service" json:"vault_service,omitempty"` + Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` + BlockStorage vault_config.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` + VaultServiceConfig vault_config.Config `mapstructure:"vault_service" json:"vault_service,omitempty"` Datadog struct { Host string `mapstructure:"host" json:"host,omitempty"` Port string `mapstructure:"port" json:"port,omitempty"` diff --git a/cmd/dca/worker/main.go b/cmd/dca/worker/main.go index c7c0b10..465f9b5 100644 --- a/cmd/dca/worker/main.go +++ b/cmd/dca/worker/main.go @@ -45,7 +45,13 @@ func main() { }, }, ) - vaultService, err := vault.NewManagementService(cfg.VaultServiceConfig, client, sdClient, vaultStorage) + vaultService, err := vault.NewManagementService( + cfg.VaultServiceConfig, + client, + sdClient, + vaultStorage, + nil, // not used in plugin + ) if err != nil { panic(fmt.Errorf("failed to create vault service: %w", err)) } diff --git a/cmd/payroll/server/config.go b/cmd/payroll/server/config.go index eb9aaa6..ba00019 100644 --- a/cmd/payroll/server/config.go +++ b/cmd/payroll/server/config.go @@ -5,17 +5,17 @@ import ( "os" "github.com/spf13/viper" - "github.com/vultisig/verifier/vault" + "github.com/vultisig/verifier/vault_config" "github.com/vultisig/plugin/api" "github.com/vultisig/plugin/storage" ) type PayrollServerConfig struct { - Server api.ServerConfig `mapstructure:"server" json:"server"` - BaseConfigPath string `mapstructure:"base_config_path" json:"base_config_path,omitempty"` - Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` - BlockStorage vault.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` + Server api.ServerConfig `mapstructure:"server" json:"server"` + BaseConfigPath string `mapstructure:"base_config_path" json:"base_config_path,omitempty"` + Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` + BlockStorage vault_config.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` Datadog struct { Host string `mapstructure:"host" json:"host,omitempty"` Port string `mapstructure:"port" json:"port,omitempty"` diff --git a/cmd/payroll/worker/config.go b/cmd/payroll/worker/config.go index ef4ab01..d42346b 100644 --- a/cmd/payroll/worker/config.go +++ b/cmd/payroll/worker/config.go @@ -5,15 +5,15 @@ import ( "os" "github.com/spf13/viper" - "github.com/vultisig/verifier/vault" + "github.com/vultisig/verifier/vault_config" "github.com/vultisig/plugin/storage" ) type PayrollWorkerConfig struct { - Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` - BlockStorage vault.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` - VaultServiceConfig vault.Config `mapstructure:"vault_service" json:"vault_service,omitempty"` + Redis storage.RedisConfig `mapstructure:"redis" json:"redis,omitempty"` + BlockStorage vault_config.BlockStorageConfig `mapstructure:"block_storage" json:"block_storage,omitempty"` + VaultServiceConfig vault_config.Config `mapstructure:"vault_service" json:"vault_service,omitempty"` Datadog struct { Host string `mapstructure:"host" json:"host,omitempty"` Port string `mapstructure:"port" json:"port,omitempty"` diff --git a/cmd/payroll/worker/main.go b/cmd/payroll/worker/main.go index a26533a..e44a066 100644 --- a/cmd/payroll/worker/main.go +++ b/cmd/payroll/worker/main.go @@ -49,7 +49,13 @@ func main() { }, }, ) - vaultService, err := vault.NewManagementService(cfg.VaultServiceConfig, client, sdClient, vaultStorage) + vaultService, err := vault.NewManagementService( + cfg.VaultServiceConfig, + client, + sdClient, + vaultStorage, + nil, // not used in plugin + ) if err != nil { panic(fmt.Errorf("failed to create vault service: %w", err)) } diff --git a/go.mod b/go.mod index d6ccea8..748a9b0 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/spf13/viper v1.20.1 github.com/vultisig/commondata v0.0.0-20250430024109-a2492623ef05 github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74 - github.com/vultisig/recipes v0.0.0-20250604212709-58772375f814 - github.com/vultisig/verifier v0.0.0-20250606071917-2f9ec25b5689 + github.com/vultisig/recipes v0.0.0-20250606100120-0ee16a73412d + github.com/vultisig/verifier v0.0.0-20250606113146-bec42406cb9e github.com/vultisig/vultiserver v0.0.0-20250515110921-82d56d3d9cc9 ) @@ -80,13 +80,16 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect + github.com/golang-jwt/jwt/v5 v5.2.2 // indirect github.com/golang/glog v1.2.4 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/btree v1.1.2 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-metrics v0.5.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/holiman/uint256 v1.3.2 // indirect github.com/iancoleman/strcase v0.3.0 // indirect diff --git a/go.sum b/go.sum index 7089d4a..8535275 100644 --- a/go.sum +++ b/go.sum @@ -309,6 +309,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= +github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc= github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= @@ -380,8 +382,10 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -392,6 +396,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -738,10 +744,10 @@ github.com/vultisig/go-wrappers v0.0.0-20250403041248-86911e8aa33f h1:124Xlloih1 github.com/vultisig/go-wrappers v0.0.0-20250403041248-86911e8aa33f/go.mod h1:UfGCxUQW08kiwxyNBiHwXe+ePPuBmHVVS+BS51aU/Jg= github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74 h1:goqwk4nQ/NEVIb3OPP9SUx7/u9ZfsUIcd5fIN/e4DVU= github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74/go.mod h1:nOykk4nOy1L3yXtLSlYvVsgizBnCQ3tR2N5uwGPdvaM= -github.com/vultisig/recipes v0.0.0-20250604212709-58772375f814 h1:uY4x91tXkpDwuUOLBxUrG0ASvJzlvNKnbGqOMrBs0U8= -github.com/vultisig/recipes v0.0.0-20250604212709-58772375f814/go.mod h1:BXXJ25U75xaexJLoiiaLEZ6TQrcy8+8UGJGd4c+hNSE= -github.com/vultisig/verifier v0.0.0-20250606071917-2f9ec25b5689 h1:hD5rRrAImxdqN7yyI5BqqtZWye9Eoera9bbvimf0dhU= -github.com/vultisig/verifier v0.0.0-20250606071917-2f9ec25b5689/go.mod h1:Llu11hCj/HxVdzWIvnpwAJ9s4QnooaCCxZr42ExZS4g= +github.com/vultisig/recipes v0.0.0-20250606100120-0ee16a73412d h1:BVc4OL0BNY/cCmptU3EeqAoxcX8vS13Pr13gWpd5Xi0= +github.com/vultisig/recipes v0.0.0-20250606100120-0ee16a73412d/go.mod h1:JT1FTsiJ8tY5W065vSsrxvrCSl1amp5o6SsBc1VVcCQ= +github.com/vultisig/verifier v0.0.0-20250606113146-bec42406cb9e h1:mFWLP/v+xuHJyPBtN/QUPlLRJvIvGplVCIXNEoo4Liw= +github.com/vultisig/verifier v0.0.0-20250606113146-bec42406cb9e/go.mod h1:YpvZN2mbn6Z/34FDfnMS/TdE+B5Y8jghu5FvqOfRmB0= github.com/vultisig/vultiserver v0.0.0-20250515110921-82d56d3d9cc9 h1:pZhGN8q8+gPB1JJjVDC1hDg8qn6Tbj0XBJymgTQ8qQg= github.com/vultisig/vultiserver v0.0.0-20250515110921-82d56d3d9cc9/go.mod h1:HwP2IgW6Mcu/gX8paFuKvfibrGE9UmPgkOFTub6dskM= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=