From bbd93c6abb3535344249454a3f01d6cfc04b445c Mon Sep 17 00:00:00 2001 From: AvranWong Date: Sat, 16 Aug 2025 16:08:50 +0800 Subject: [PATCH 1/4] update address + common import paths --- api/plugin.go | 2 +- api/server.go | 2 +- common/vault.go | 2 +- go.mod | 5 +++-- go.sum | 8 ++++---- plugin/fees/fees.go | 2 +- plugin/fees/transaction.go | 4 ++-- plugin/payroll/payroll.go | 2 +- plugin/payroll/transaction.go | 4 ++-- scripts/dev/add_balance/main.go | 4 ++-- scripts/dev/create_fee_policy/main.go | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) diff --git a/api/plugin.go b/api/plugin.go index e1eaafcb..b33e59f6 100644 --- a/api/plugin.go +++ b/api/plugin.go @@ -15,8 +15,8 @@ import ( "github.com/sirupsen/logrus" v1 "github.com/vultisig/commondata/go/vultisig/vault/v1" "github.com/vultisig/mobile-tss-lib/tss" - vcommon "github.com/vultisig/verifier/common" vtypes "github.com/vultisig/verifier/types" + vcommon "github.com/vultisig/vultisig-go/common" "github.com/vultisig/plugin/common" "github.com/vultisig/plugin/internal/sigutil" diff --git a/api/server.go b/api/server.go index 0d06de37..3be5f38f 100644 --- a/api/server.go +++ b/api/server.go @@ -14,12 +14,12 @@ import ( "github.com/labstack/echo/v4/middleware" "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" + vcommon "github.com/vultisig/vultisig-go/common" "github.com/vultisig/plugin/internal/scheduler" "github.com/vultisig/plugin/service" diff --git a/common/vault.go b/common/vault.go index cf4c8aa8..7797fe3d 100644 --- a/common/vault.go +++ b/common/vault.go @@ -4,9 +4,9 @@ import ( "fmt" v1 "github.com/vultisig/commondata/go/vultisig/vault/v1" - vcommon "github.com/vultisig/verifier/common" vtypes "github.com/vultisig/verifier/types" vault "github.com/vultisig/verifier/vault" + vcommon "github.com/vultisig/vultisig-go/common" ) func GetVaultFromPolicy(s vault.Storage, policy vtypes.PluginPolicy, encryptionSecret string) (*v1.Vault, error) { diff --git a/go.mod b/go.mod index 479a59f4..8a284f22 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/vultisig/recipes v0.0.0-20250805093243-2060ffd4754e github.com/vultisig/verifier v0.0.0-20250806110950-aaa4877b631a github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b + github.com/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c golang.org/x/sync v0.14.0 google.golang.org/protobuf v1.36.6 ) @@ -142,7 +143,7 @@ require ( github.com/tendermint/go-amino v0.16.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/vultisig/go-wrappers v0.0.0-20250403041248-86911e8aa33f // indirect + github.com/vultisig/go-wrappers v0.0.0-20250716071337-34a5c0f4d6e0 // indirect go.etcd.io/bbolt v1.3.8 // indirect golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect @@ -177,7 +178,7 @@ require ( github.com/otiai10/primes v0.4.0 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/robfig/cron/v3 v3.0.1 github.com/sagikazarmark/locafero v0.7.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.12.0 // indirect diff --git a/go.sum b/go.sum index e3c33e72..6f434527 100644 --- a/go.sum +++ b/go.sum @@ -753,18 +753,18 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vultisig/commondata v0.0.0-20250710214228-61d9ed8f7778 h1:XJ1hoo37JKGLmfxD4wYhXO8TJFBdUBnbxxK+zagJ4c4= github.com/vultisig/commondata v0.0.0-20250710214228-61d9ed8f7778/go.mod h1:UMc5q0Myab+BvzAe67UQrXTXwKGYNxK7bky7DJM+dl8= -github.com/vultisig/go-wrappers v0.0.0-20250403041248-86911e8aa33f h1:124Xlloih1FOOXv/HTdgl4syIRBa/xfKFXAecrZSPQE= -github.com/vultisig/go-wrappers v0.0.0-20250403041248-86911e8aa33f/go.mod h1:UfGCxUQW08kiwxyNBiHwXe+ePPuBmHVVS+BS51aU/Jg= +github.com/vultisig/go-wrappers v0.0.0-20250716071337-34a5c0f4d6e0 h1:EdgQHZjzkY2nAhxr99zgbcs+3/8U1t6XW7ETiBEAr80= +github.com/vultisig/go-wrappers v0.0.0-20250716071337-34a5c0f4d6e0/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-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-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/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c h1:D7f/XQQlR8EwHi4U9oHu2EHpEXOrFnly7PDomWc8qvk= +github.com/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c/go.mod h1:jOf+2n1Eo/XZjiUbHjTfraPMw4HAZZ0Sw9Z6+vpQrU4= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= diff --git a/plugin/fees/fees.go b/plugin/fees/fees.go index ba978f71..839bd38e 100644 --- a/plugin/fees/fees.go +++ b/plugin/fees/fees.go @@ -9,11 +9,11 @@ import ( "github.com/google/uuid" "github.com/hibiken/asynq" "github.com/sirupsen/logrus" - vcommon "github.com/vultisig/verifier/common" "github.com/vultisig/verifier/plugin" "github.com/vultisig/verifier/plugin/keysign" "github.com/vultisig/verifier/tx_indexer" vtypes "github.com/vultisig/verifier/types" + vcommon "github.com/vultisig/vultisig-go/common" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/plugin/fees/transaction.go b/plugin/fees/transaction.go index 39cc1ca1..fe83d29c 100644 --- a/plugin/fees/transaction.go +++ b/plugin/fees/transaction.go @@ -19,9 +19,9 @@ import ( resolver "github.com/vultisig/recipes/resolver" rtypes "github.com/vultisig/recipes/types" - "github.com/vultisig/verifier/address" - vcommon "github.com/vultisig/verifier/common" vtypes "github.com/vultisig/verifier/types" + "github.com/vultisig/vultisig-go/address" + vcommon "github.com/vultisig/vultisig-go/common" gcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/plugin/payroll/payroll.go b/plugin/payroll/payroll.go index 5126560f..5feaf0fb 100644 --- a/plugin/payroll/payroll.go +++ b/plugin/payroll/payroll.go @@ -8,11 +8,11 @@ import ( "github.com/sirupsen/logrus" "github.com/vultisig/plugin/storage" "github.com/vultisig/recipes/sdk/evm" - "github.com/vultisig/verifier/common" "github.com/vultisig/verifier/plugin" "github.com/vultisig/verifier/plugin/keysign" "github.com/vultisig/verifier/tx_indexer" "github.com/vultisig/verifier/vault" + "github.com/vultisig/vultisig-go/common" ) var _ plugin.Plugin = (*Plugin)(nil) diff --git a/plugin/payroll/transaction.go b/plugin/payroll/transaction.go index 8aebd250..629cf0bd 100644 --- a/plugin/payroll/transaction.go +++ b/plugin/payroll/transaction.go @@ -21,12 +21,12 @@ import ( "github.com/vultisig/recipes/sdk/evm" rtypes "github.com/vultisig/recipes/types" "github.com/vultisig/recipes/util" - "github.com/vultisig/verifier/address" - vcommon "github.com/vultisig/verifier/common" "github.com/vultisig/verifier/plugin" "github.com/vultisig/verifier/tx_indexer/pkg/storage" vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/vultiserver/contexthelper" + "github.com/vultisig/vultisig-go/address" + vcommon "github.com/vultisig/vultisig-go/common" "golang.org/x/sync/errgroup" "github.com/vultisig/plugin/common" diff --git a/scripts/dev/add_balance/main.go b/scripts/dev/add_balance/main.go index ecc23529..12703ce7 100644 --- a/scripts/dev/add_balance/main.go +++ b/scripts/dev/add_balance/main.go @@ -16,8 +16,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" - "github.com/vultisig/verifier/address" - vcommon "github.com/vultisig/verifier/common" + "github.com/vultisig/vultisig-go/address" + vcommon "github.com/vultisig/vultisig-go/common" ) const ( diff --git a/scripts/dev/create_fee_policy/main.go b/scripts/dev/create_fee_policy/main.go index fdc82a9c..a0027186 100644 --- a/scripts/dev/create_fee_policy/main.go +++ b/scripts/dev/create_fee_policy/main.go @@ -18,8 +18,8 @@ import ( vaultType "github.com/vultisig/commondata/go/vultisig/vault/v1" "github.com/vultisig/plugin/common" rtypes "github.com/vultisig/recipes/types" - vcommon "github.com/vultisig/verifier/common" vtypes "github.com/vultisig/verifier/types" + vcommon "github.com/vultisig/vultisig-go/common" "google.golang.org/protobuf/proto" ) From ffa7fb26b69815b1c1cd320d7fc830a109390b79 Mon Sep 17 00:00:00 2001 From: AvranWong Date: Sun, 17 Aug 2025 12:56:52 +0800 Subject: [PATCH 2/4] update vault types imports --- api/server.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/server.go b/api/server.go index 3be5f38f..0be839cc 100644 --- a/api/server.go +++ b/api/server.go @@ -20,6 +20,7 @@ import ( vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/verifier/vault" vcommon "github.com/vultisig/vultisig-go/common" + vgtypes "github.com/vultisig/vultisig-go/types" "github.com/vultisig/plugin/internal/scheduler" "github.com/vultisig/plugin/service" @@ -173,7 +174,7 @@ func (s *Server) GetVault(c echo.Context) error { return c.JSON(http.StatusInternalServerError, NewErrorResponse("fail to get vault")) } - return c.JSON(http.StatusOK, vtypes.VaultGetResponse{ + return c.JSON(http.StatusOK, vgtypes.VaultGetResponse{ Name: v.Name, PublicKeyEcdsa: v.PublicKeyEcdsa, PublicKeyEddsa: v.PublicKeyEddsa, From abf473740d258f404d0e0b5ffeed486f1aad9d0f Mon Sep 17 00:00:00 2001 From: AvranWong Date: Mon, 18 Aug 2025 21:11:19 +0800 Subject: [PATCH 3/4] fix imports + standardise naming --- api/plugin.go | 8 ++++---- api/server.go | 14 +++++++------- common/vault.go | 6 +++--- plugin/fees/fees.go | 4 ++-- plugin/fees/transaction.go | 9 ++++----- plugin/payroll/policy.go | 4 ++-- plugin/payroll/transaction.go | 17 ++++++++--------- scripts/dev/add_balance/main.go | 4 ++-- scripts/dev/create_fee_policy/main.go | 4 ++-- 9 files changed, 34 insertions(+), 36 deletions(-) diff --git a/api/plugin.go b/api/plugin.go index b33e59f6..4e01e103 100644 --- a/api/plugin.go +++ b/api/plugin.go @@ -16,7 +16,7 @@ import ( v1 "github.com/vultisig/commondata/go/vultisig/vault/v1" "github.com/vultisig/mobile-tss-lib/tss" vtypes "github.com/vultisig/verifier/types" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" "github.com/vultisig/plugin/common" "github.com/vultisig/plugin/internal/sigutil" @@ -233,7 +233,7 @@ func (s *Server) verifyPolicySignature(policy vtypes.PluginPolicy) bool { s.logger.WithError(err).Error("fail to get vault") return false } - derivedPublicKey, err := tss.GetDerivedPubKey(vault.PublicKeyEcdsa, vault.HexChainCode, vcommon.Ethereum.GetDerivePath(), false) + derivedPublicKey, err := tss.GetDerivedPubKey(vault.PublicKeyEcdsa, vault.HexChainCode, vgcommon.Ethereum.GetDerivePath(), false) if err != nil { s.logger.WithError(err).Error("failed to get derived public key") return false @@ -251,14 +251,14 @@ func (s *Server) getVault(publicKeyECDSA, pluginId string) (*v1.Vault, error) { if len(s.cfg.EncryptionSecret) == 0 { return nil, fmt.Errorf("no encryption secret") } - fileName := vcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) + fileName := vgcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) vaultContent, err := s.vaultStorage.GetVault(fileName) if err != nil { s.logger.WithError(err).Error("fail to get vault") return nil, fmt.Errorf("failed to get vault, err: %w", err) } - v, err := vcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, vaultContent) + v, err := vgcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, vaultContent) if err != nil { return nil, fmt.Errorf("failed to decrypt vault,err: %w", err) } diff --git a/api/server.go b/api/server.go index 0be839cc..5e98b181 100644 --- a/api/server.go +++ b/api/server.go @@ -19,7 +19,7 @@ import ( "github.com/vultisig/verifier/plugin/tasks" vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/verifier/vault" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" vgtypes "github.com/vultisig/vultisig-go/types" "github.com/vultisig/plugin/internal/scheduler" @@ -160,7 +160,7 @@ func (s *Server) GetVault(c echo.Context) error { return c.JSON(http.StatusBadRequest, NewErrorResponse("pluginId is required")) } - filePathName := vcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) + filePathName := vgcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) content, err := s.vaultStorage.GetVault(filePathName) if err != nil { wrappedErr := fmt.Errorf("fail to read file in GetVault, err: %w", err) @@ -168,7 +168,7 @@ func (s *Server) GetVault(c echo.Context) error { return wrappedErr } - v, err := vcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, content) + v, err := vgcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, content) if err != nil { s.logger.WithError(err).Error("fail to decrypt vault") return c.JSON(http.StatusInternalServerError, NewErrorResponse("fail to get vault")) @@ -205,7 +205,7 @@ func (s *Server) SignMessages(c echo.Context) error { s.logger.Errorf("fail to set session, err: %v", err) } - filePathName := vcommon.GetVaultBackupFilename(req.PublicKey, req.PluginID) + filePathName := vgcommon.GetVaultBackupFilename(req.PublicKey, req.PluginID) content, err := s.vaultStorage.GetVault(filePathName) if err != nil { wrappedErr := fmt.Errorf("fail to read file in SignMessages, err: %w", err) @@ -214,7 +214,7 @@ func (s *Server) SignMessages(c echo.Context) error { return wrappedErr } - _, err = vcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, content) + _, err = vgcommon.DecryptVaultFromBackup(s.cfg.EncryptionSecret, content) if err != nil { return fmt.Errorf("fail to decrypt vault from the backup, err: %w", err) } @@ -267,7 +267,7 @@ func (s *Server) DeleteVault(c echo.Context) error { return c.JSON(http.StatusBadRequest, NewErrorResponse("pluginId is required")) } - fileName := vcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) + fileName := vgcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) if err := s.vaultStorage.DeleteFile(fileName); err != nil { return c.JSON(http.StatusInternalServerError, NewErrorResponse(err.Error())) } @@ -295,7 +295,7 @@ func (s *Server) ExistVault(c echo.Context) error { return c.JSON(http.StatusBadRequest, NewErrorResponse("plugin id is required")) } - filePathName := vcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) + filePathName := vgcommon.GetVaultBackupFilename(publicKeyECDSA, pluginId) exist, err := s.vaultStorage.Exist(filePathName) if err != nil || !exist { return c.NoContent(http.StatusBadRequest) diff --git a/common/vault.go b/common/vault.go index 7797fe3d..e37ea69b 100644 --- a/common/vault.go +++ b/common/vault.go @@ -6,11 +6,11 @@ import ( v1 "github.com/vultisig/commondata/go/vultisig/vault/v1" vtypes "github.com/vultisig/verifier/types" vault "github.com/vultisig/verifier/vault" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" ) func GetVaultFromPolicy(s vault.Storage, policy vtypes.PluginPolicy, encryptionSecret string) (*v1.Vault, error) { - vaultFileName := vcommon.GetVaultBackupFilename(policy.PublicKey, policy.PluginID.String()) + vaultFileName := vgcommon.GetVaultBackupFilename(policy.PublicKey, policy.PluginID.String()) vaultContent, err := s.GetVault(vaultFileName) if err != nil { return nil, fmt.Errorf("failed to get vault") @@ -20,5 +20,5 @@ func GetVaultFromPolicy(s vault.Storage, policy vtypes.PluginPolicy, encryptionS return nil, fmt.Errorf("vault not found") } - return vcommon.DecryptVaultFromBackup(encryptionSecret, vaultContent) + return vgcommon.DecryptVaultFromBackup(encryptionSecret, vaultContent) } diff --git a/plugin/fees/fees.go b/plugin/fees/fees.go index 839bd38e..5a1a5b8c 100644 --- a/plugin/fees/fees.go +++ b/plugin/fees/fees.go @@ -13,7 +13,7 @@ import ( "github.com/vultisig/verifier/plugin/keysign" "github.com/vultisig/verifier/tx_indexer" vtypes "github.com/vultisig/verifier/types" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" @@ -317,7 +317,7 @@ func (fp *FeePlugin) executeFeeTransaction(ctx context.Context, run types.FeeRun fp.logger.WithFields(logrus.Fields{ "publicKey": feePolicy.PublicKey, }).Info("Getting vault") - vaultFileName := vcommon.GetVaultBackupFilename(feePolicy.PublicKey, vtypes.PluginVultisigFees_feee.String()) + vaultFileName := vgcommon.GetVaultBackupFilename(feePolicy.PublicKey, vtypes.PluginVultisigFees_feee.String()) vaultContent, err := fp.vaultStorage.GetVault(vaultFileName) if err != nil { return fmt.Errorf("failed to get vault: %w", err) diff --git a/plugin/fees/transaction.go b/plugin/fees/transaction.go index fe83d29c..2603d8cb 100644 --- a/plugin/fees/transaction.go +++ b/plugin/fees/transaction.go @@ -13,7 +13,6 @@ import ( "github.com/sirupsen/logrus" "github.com/vultisig/mobile-tss-lib/tss" "github.com/vultisig/plugin/common" - rcommon "github.com/vultisig/recipes/common" "github.com/vultisig/recipes/engine" reth "github.com/vultisig/recipes/ethereum" resolver "github.com/vultisig/recipes/resolver" @@ -21,7 +20,7 @@ import ( rtypes "github.com/vultisig/recipes/types" vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/vultisig-go/address" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" gcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" @@ -50,7 +49,7 @@ func (fp *FeePlugin) proposeTransactions(ctx context.Context, policy vtypes.Plug } // Get the ethereum derived addresses from the vaults master public key - ethAddress, _, _, err := address.GetAddress(vault.PublicKeyEcdsa, vault.HexChainCode, vcommon.Ethereum) + ethAddress, _, _, err := address.GetAddress(vault.PublicKeyEcdsa, vault.HexChainCode, vgcommon.Ethereum) if err != nil { return nil, fmt.Errorf("failed to get eth address: %v", err) } @@ -129,7 +128,7 @@ func (fp *FeePlugin) proposeTransactions(ctx context.Context, policy vtypes.Plug { Message: base64.StdEncoding.EncodeToString(txHashToSign.Bytes()), RawMessage: txHex, - Chain: vcommon.Ethereum, + Chain: vgcommon.Ethereum, Hash: base64.StdEncoding.EncodeToString(msgHash[:]), HashFunction: vtypes.HashFunction_SHA256, }, @@ -247,7 +246,7 @@ func (fp *FeePlugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, tx } // Evaluate if the transaction is allowed by the policy - _, err = eng.Evaluate(recipe, rcommon.Chain(keysignMessage.Chain), txBytes) + _, err = eng.Evaluate(recipe, vgcommon.Chain(keysignMessage.Chain), txBytes) if err != nil { return fmt.Errorf("failed to evaluate transaction: %w", err) } diff --git a/plugin/payroll/policy.go b/plugin/payroll/policy.go index 9a02163e..d1026e5d 100644 --- a/plugin/payroll/policy.go +++ b/plugin/payroll/policy.go @@ -4,10 +4,10 @@ import ( "encoding/base64" "fmt" - rcommon "github.com/vultisig/recipes/common" "github.com/vultisig/recipes/engine" "github.com/vultisig/verifier/plugin" vtypes "github.com/vultisig/verifier/types" + vgcommon "github.com/vultisig/vultisig-go/common" ) func (p *Plugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs []vtypes.PluginKeysignRequest) error { @@ -30,7 +30,7 @@ func (p *Plugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs [] return fmt.Errorf("failed to decode transaction: %w", err) } - _, err = eng.Evaluate(recipe, rcommon.Chain(keysignMessage.Chain), txBytes) + _, err = eng.Evaluate(recipe, vgcommon.Chain(keysignMessage.Chain), txBytes) if err != nil { return fmt.Errorf("failed to evaluate transaction: %w", err) } diff --git a/plugin/payroll/transaction.go b/plugin/payroll/transaction.go index 629cf0bd..79571fd9 100644 --- a/plugin/payroll/transaction.go +++ b/plugin/payroll/transaction.go @@ -16,7 +16,6 @@ import ( "github.com/sirupsen/logrus" "github.com/vultisig/mobile-tss-lib/tss" "github.com/vultisig/plugin/internal/scheduler" - rcommon "github.com/vultisig/recipes/common" "github.com/vultisig/recipes/ethereum" "github.com/vultisig/recipes/sdk/evm" rtypes "github.com/vultisig/recipes/types" @@ -26,7 +25,7 @@ import ( vtypes "github.com/vultisig/verifier/types" "github.com/vultisig/vultiserver/contexthelper" "github.com/vultisig/vultisig-go/address" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" "golang.org/x/sync/errgroup" "github.com/vultisig/plugin/common" @@ -116,7 +115,7 @@ func (p *Plugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.Plugi return nil, fmt.Errorf("failed to get vault from policy: %w", err) } - ethAddress, _, _, err := address.GetAddress(vault.PublicKeyEcdsa, vault.HexChainCode, vcommon.Ethereum) + ethAddress, _, _, err := address.GetAddress(vault.PublicKeyEcdsa, vault.HexChainCode, vgcommon.Ethereum) if err != nil { return nil, fmt.Errorf("failed to get eth address: %w", err) } @@ -126,7 +125,7 @@ func (p *Plugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.Plugi return nil, fmt.Errorf("failed to get recipe from policy: %w", err) } - chain := rcommon.Ethereum + chain := vgcommon.Ethereum ethEvmID, err := chain.EvmID() if err != nil { return nil, fmt.Errorf("failed to get EVM ID for chain %s: %w", chain, err) @@ -187,7 +186,7 @@ func (p *Plugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.Plugi txToTrack, e := p.txIndexerService.CreateTx(ctx, storage.CreateTxDto{ PluginID: policy.PluginID, PolicyID: policy.ID, - ChainID: vcommon.Chain(chain), + ChainID: vgcommon.Chain(chain), TokenID: tokenID, FromPublicKey: policy.PublicKey, ToPublicKey: recipient, @@ -207,7 +206,7 @@ func (p *Plugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.Plugi { TxIndexerID: txToTrack.ID.String(), Message: base64.StdEncoding.EncodeToString(txHashToSign.Bytes()), - Chain: vcommon.Chain(chain), + Chain: vgcommon.Chain(chain), Hash: base64.StdEncoding.EncodeToString(msgHash[:]), HashFunction: vtypes.HashFunction_SHA256, }, @@ -256,7 +255,7 @@ func (p *Plugin) SigningComplete( "from_public_key": signRequest.PublicKey, "to_address": tx.To().Hex(), "hash": tx.Hash().Hex(), - "chain": vcommon.Ethereum.String(), + "chain": vgcommon.Ethereum.String(), }).Info("tx successfully signed and broadcasted") return nil } @@ -339,11 +338,11 @@ func (p *Plugin) GetRecipeSpecification() (*rtypes.RecipeSchema, error) { func (p *Plugin) genUnsignedTx( ctx context.Context, - chain rcommon.Chain, + chain vgcommon.Chain, senderAddress, tokenID, amount, to string, ) ([]byte, error) { switch chain { - case rcommon.Ethereum: + case vgcommon.Ethereum: amt, ok := new(big.Int).SetString(amount, 10) if !ok { return nil, fmt.Errorf("failed to parse amount: %s", amount) diff --git a/scripts/dev/add_balance/main.go b/scripts/dev/add_balance/main.go index 12703ce7..af54430f 100644 --- a/scripts/dev/add_balance/main.go +++ b/scripts/dev/add_balance/main.go @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/vultisig/vultisig-go/address" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" ) const ( @@ -59,7 +59,7 @@ func main() { } compressedPubKeyHex := string(rawKeyBytes) - derivedAddress, _, _, err := address.GetAddress(compressedPubKeyHex, hexChainCode, vcommon.Ethereum) + derivedAddress, _, _, err := address.GetAddress(compressedPubKeyHex, hexChainCode, vgcommon.Ethereum) if err != nil { panic(err) } diff --git a/scripts/dev/create_fee_policy/main.go b/scripts/dev/create_fee_policy/main.go index a0027186..6f9e6c6c 100644 --- a/scripts/dev/create_fee_policy/main.go +++ b/scripts/dev/create_fee_policy/main.go @@ -19,7 +19,7 @@ import ( "github.com/vultisig/plugin/common" rtypes "github.com/vultisig/recipes/types" vtypes "github.com/vultisig/verifier/types" - vcommon "github.com/vultisig/vultisig-go/common" + vgcommon "github.com/vultisig/vultisig-go/common" "google.golang.org/protobuf/proto" ) @@ -219,7 +219,7 @@ func DecryptVaultFromBackup(password string, vaultBackupRaw []byte) (*vaultType. if err != nil { return nil, nil, err } - vaultRaw, err = vcommon.DecryptVault(password, vaultBytes) + vaultRaw, err = vgcommon.DecryptVault(password, vaultBytes) if err != nil { return nil, nil, err } From 3f3d7801b47219bd3bc98246fc8436d71c755101 Mon Sep 17 00:00:00 2001 From: AvranWong Date: Wed, 20 Aug 2025 21:31:44 +0800 Subject: [PATCH 4/4] bump verifier version + go mod tidy --- go.mod | 6 +++--- go.sum | 12 ++++++------ plugin/payroll/payroll.go | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 27fa06fc..fb20072c 100644 --- a/go.mod +++ b/go.mod @@ -18,10 +18,10 @@ require ( github.com/spf13/viper v1.20.1 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-20250811174115-368ae4bab6f6 - github.com/vultisig/verifier v0.0.0-20250814230939-fd9719226c8f + github.com/vultisig/recipes v0.0.0-20250818151719-db3f03c3254c + github.com/vultisig/verifier v0.0.0-20250820091538-a29a985cae1d github.com/vultisig/vultiserver v0.0.0-20250715212748-4b23f9849e4b - github.com/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c + github.com/vultisig/vultisig-go v0.0.0-20250818095937-af97443fcbbe golang.org/x/sync v0.14.0 google.golang.org/protobuf v1.36.6 ) diff --git a/go.sum b/go.sum index 5be288ac..712592d1 100644 --- a/go.sum +++ b/go.sum @@ -759,14 +759,14 @@ github.com/vultisig/go-wrappers v0.0.0-20250716071337-34a5c0f4d6e0 h1:EdgQHZjzkY github.com/vultisig/go-wrappers v0.0.0-20250716071337-34a5c0f4d6e0/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-20250811174115-368ae4bab6f6 h1:WY/4K26uOvPwp1fjy5zXENdNR+iJRltNGmtsn78zoSk= -github.com/vultisig/recipes v0.0.0-20250811174115-368ae4bab6f6/go.mod h1:Ot3lrUnnSw67Hep+MelclVPgNLDxJP01Ezixw/1RYRE= -github.com/vultisig/verifier v0.0.0-20250814230939-fd9719226c8f h1:hsPcIZJ128zm2SpbON+OYsfecgcpT0l7DUMV4s9WNrY= -github.com/vultisig/verifier v0.0.0-20250814230939-fd9719226c8f/go.mod h1:mPPBi5y9pCE/FUS8ibMTsEx3uR5rvia7bt7GEl6Kvv0= +github.com/vultisig/recipes v0.0.0-20250818151719-db3f03c3254c h1:oebbFeSAG8zGjCfhj5D4rhK0LtjlpTRhwQSYa4oVSCU= +github.com/vultisig/recipes v0.0.0-20250818151719-db3f03c3254c/go.mod h1:f2XBQu8WO5jwTeWCGiuogg6y9y2dBdjLRqHR7z1f5es= +github.com/vultisig/verifier v0.0.0-20250820091538-a29a985cae1d h1:PT7uf9dKpnFVHzZdLGf4/cTbU1LS669OMaybi1T4Ft4= +github.com/vultisig/verifier v0.0.0-20250820091538-a29a985cae1d/go.mod h1:3NVvxDlbaIRSAvUF6Kq0lik7xm7UJ/u7JdHKqkrLcNI= 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/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c h1:D7f/XQQlR8EwHi4U9oHu2EHpEXOrFnly7PDomWc8qvk= -github.com/vultisig/vultisig-go v0.0.0-20250815075627-265cef7c643c/go.mod h1:jOf+2n1Eo/XZjiUbHjTfraPMw4HAZZ0Sw9Z6+vpQrU4= +github.com/vultisig/vultisig-go v0.0.0-20250818095937-af97443fcbbe h1:wPXoiswP3HP68g9TbI7GN8Xd8I3M/IbzOs2dypDpH6Y= +github.com/vultisig/vultisig-go v0.0.0-20250818095937-af97443fcbbe/go.mod h1:jOf+2n1Eo/XZjiUbHjTfraPMw4HAZZ0Sw9Z6+vpQrU4= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= diff --git a/plugin/payroll/payroll.go b/plugin/payroll/payroll.go index a57b9541..9a2b84ae 100644 --- a/plugin/payroll/payroll.go +++ b/plugin/payroll/payroll.go @@ -9,7 +9,6 @@ import ( "github.com/vultisig/plugin/storage" "github.com/vultisig/recipes/sdk/evm" "github.com/vultisig/recipes/types" - "github.com/vultisig/verifier/common" "github.com/vultisig/verifier/plugin" "github.com/vultisig/verifier/plugin/keysign" "github.com/vultisig/verifier/plugin/tx_indexer"