From 584f23c7694fa8509d2a7224e3eddd6c492df800 Mon Sep 17 00:00:00 2001 From: Shevchuk Date: Tue, 5 Aug 2025 21:59:31 +0700 Subject: [PATCH 1/3] Replace vultisig_validator by verifier package --- api/server.go | 2 +- go.mod | 2 +- go.sum | 10 ++-------- internal/vultisig_validator/validator.go | 14 -------------- 4 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 internal/vultisig_validator/validator.go diff --git a/api/server.go b/api/server.go index 09e0ce3f..5f2616a2 100644 --- a/api/server.go +++ b/api/server.go @@ -15,13 +15,13 @@ import ( "github.com/labstack/gommon/log" "github.com/sirupsen/logrus" vcommon "github.com/vultisig/verifier/common" + vv "github.com/vultisig/verifier/common/vultisig_validator" "github.com/vultisig/verifier/plugin" "github.com/vultisig/verifier/plugin/tasks" vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/verifier/vault" "github.com/vultisig/plugin/internal/scheduler" - vv "github.com/vultisig/plugin/internal/vultisig_validator" "github.com/vultisig/plugin/service" "github.com/vultisig/plugin/storage" "github.com/vultisig/plugin/storage/postgres" diff --git a/go.mod b/go.mod index e37d190a..77f73c0a 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/vultisig/commondata v0.0.0-20250710214228-61d9ed8f7778 github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74 github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e - github.com/vultisig/verifier v0.0.0-20250731092019-00d44a4b02b9 + github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008 github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b golang.org/x/sync v0.14.0 google.golang.org/protobuf v1.36.6 diff --git a/go.sum b/go.sum index 04c3e80d..5eb581f0 100644 --- a/go.sum +++ b/go.sum @@ -757,16 +757,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-20250804144750-c21977a17e72 h1:Vypx8sZVTbF7GIaTU9VJt3rY35OdI36ZeWIT6GF09Sk= -github.com/vultisig/recipes v0.0.0-20250804144750-c21977a17e72/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= -github.com/vultisig/recipes v0.0.0-20250804165337-98ae4a2efa18 h1:zEPPC4TE+CJhVPFhTzFFCIHXpa91sMn30tFzYLGP1UE= -github.com/vultisig/recipes v0.0.0-20250804165337-98ae4a2efa18/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= -github.com/vultisig/recipes v0.0.0-20250804215735-744a9a61f45c h1:942aary32eEcYuXcUURUDUsKWLYgoTjxjDC5VtozdM0= -github.com/vultisig/recipes v0.0.0-20250804215735-744a9a61f45c/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e h1:RhIQVc28MzLWsE7Fn0KsltSr+00ESc1eKKNUHcLgFB4= github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= -github.com/vultisig/verifier v0.0.0-20250731092019-00d44a4b02b9 h1:j4duFCHur0x8vtAh3YHcwmRZKqMwcEkl/u7wjOBrMbc= -github.com/vultisig/verifier v0.0.0-20250731092019-00d44a4b02b9/go.mod h1:nFUize5jJAi5P7V0dloNUB+ykJZvgNe4S80h6uAA9SQ= +github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008 h1:yiOifIrCG8/JpF9Iqlw01ylNLbsT5d27366EMXH9I4I= +github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008/go.mod h1:fxehysyf+G7WwZstP3WvtswB+4VK2rt9/b5ccjKhYbY= github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b h1:Ed2DOWo8fA0KG6e36rzUmGpxcOQjmWTbxWyvUbI5by8= github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b/go.mod h1:HwP2IgW6Mcu/gX8paFuKvfibrGE9UmPgkOFTub6dskM= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= diff --git a/internal/vultisig_validator/validator.go b/internal/vultisig_validator/validator.go deleted file mode 100644 index b20927a0..00000000 --- a/internal/vultisig_validator/validator.go +++ /dev/null @@ -1,14 +0,0 @@ -package vultisigValidator - -import "github.com/go-playground/validator/v10" - -type VultisigValidator struct { - Validator *validator.Validate -} - -func (v *VultisigValidator) Validate(i interface{}) error { - if err := v.Validator.Struct(i); err != nil { - return v.Validator.Struct(i) - } - return nil -} From 203ad790df5b816ef15b1a00844e89b0582e2a28 Mon Sep 17 00:00:00 2001 From: Shevchuk Date: Wed, 6 Aug 2025 18:13:19 +0700 Subject: [PATCH 2/3] go mod bump --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 77f73c0a..479a59f4 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/vultisig/commondata v0.0.0-20250710214228-61d9ed8f7778 github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74 github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e - github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008 + github.com/vultisig/verifier v0.0.0-20250806110950-aaa4877b631a github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b golang.org/x/sync v0.14.0 google.golang.org/protobuf v1.36.6 diff --git a/go.sum b/go.sum index 5eb581f0..e3c33e72 100644 --- a/go.sum +++ b/go.sum @@ -761,6 +761,8 @@ github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e h1:RhIQVc28MzLWsE github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008 h1:yiOifIrCG8/JpF9Iqlw01ylNLbsT5d27366EMXH9I4I= github.com/vultisig/verifier v0.0.0-20250805144140-643ec1133008/go.mod h1:fxehysyf+G7WwZstP3WvtswB+4VK2rt9/b5ccjKhYbY= +github.com/vultisig/verifier v0.0.0-20250806110950-aaa4877b631a h1:MXEpOwpEX4M/lVENUIWCBEc5eJtzLfbD0MBdthb0Xkg= +github.com/vultisig/verifier v0.0.0-20250806110950-aaa4877b631a/go.mod h1:fxehysyf+G7WwZstP3WvtswB+4VK2rt9/b5ccjKhYbY= github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b h1:Ed2DOWo8fA0KG6e36rzUmGpxcOQjmWTbxWyvUbI5by8= github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b/go.mod h1:HwP2IgW6Mcu/gX8paFuKvfibrGE9UmPgkOFTub6dskM= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= From b2e2c2ca829f508be4396f899c36da8bf3fec6a6 Mon Sep 17 00:00:00 2001 From: Shevchuk Date: Wed, 6 Aug 2025 18:18:16 +0700 Subject: [PATCH 3/3] schema update --- storage/postgres/schema/schema.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/postgres/schema/schema.sql b/storage/postgres/schema/schema.sql index 1c52ce31..c002e9cb 100644 --- a/storage/postgres/schema/schema.sql +++ b/storage/postgres/schema/schema.sql @@ -2,7 +2,8 @@ CREATE TYPE "plugin_id" AS ENUM ( 'vultisig-dca-0000', 'vultisig-payroll-0000', - 'vultisig-fees-feee' + 'vultisig-fees-feee', + 'vultisig-copytrader-0000' ); CREATE TYPE "tx_indexer_status" AS ENUM (