🚚 Latest type imports, fixed names and policy version

Garry Sharp · Garry Sharp · commit d516d541df69 · 2025-06-12T21:57:00.000+04:00
diff --git 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-20250606100120-0ee16a73412d
-	github.com/vultisig/verifier v0.0.0-20250611063307-6e5e760de529
+	github.com/vultisig/recipes v0.0.0-20250609134859-0655e0445c1b
+	github.com/vultisig/verifier v0.0.0-20250612165949-9db8a6828606
 	github.com/vultisig/vultiserver v0.0.0-20250515110921-82d56d3d9cc9
 )
 
diff --git a/go.sum b/go.sum
@@ -747,8 +747,14 @@ github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74 h1:goqwk4n
 github.com/vultisig/mobile-tss-lib v0.0.0-20250316003201-2e7e570a4a74/go.mod h1:nOykk4nOy1L3yXtLSlYvVsgizBnCQ3tR2N5uwGPdvaM=
 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/recipes v0.0.0-20250609134859-0655e0445c1b h1:rXhRaf40re1FdUYlYbCTEIO6JqIx8FfLlksksu8LiGE=
+github.com/vultisig/recipes v0.0.0-20250609134859-0655e0445c1b/go.mod h1:JT1FTsiJ8tY5W065vSsrxvrCSl1amp5o6SsBc1VVcCQ=
 github.com/vultisig/verifier v0.0.0-20250611063307-6e5e760de529 h1:owEyLmbtlN1yL0xG7EhzXgvXbBZYHSHITh4P8lvPhyQ=
 github.com/vultisig/verifier v0.0.0-20250611063307-6e5e760de529/go.mod h1:YpvZN2mbn6Z/34FDfnMS/TdE+B5Y8jghu5FvqOfRmB0=
+github.com/vultisig/verifier v0.0.0-20250611171202-489e61b0205b h1:cY905EbOnT20AduKeHbQFQyT6D5EA/OpQNhTOzHBsI8=
+github.com/vultisig/verifier v0.0.0-20250611171202-489e61b0205b/go.mod h1:YpvZN2mbn6Z/34FDfnMS/TdE+B5Y8jghu5FvqOfRmB0=
+github.com/vultisig/verifier v0.0.0-20250612165949-9db8a6828606 h1:DGia8ZQM3izAm+Oo/LM+5yWzENc9MIWtEfFCsCZOgO0=
+github.com/vultisig/verifier v0.0.0-20250612165949-9db8a6828606/go.mod h1:35VQIKhChb6/H+3J/XkbGhPkVF6lyLuxsUG/WXHS4+A=
 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=
diff --git a/plugin/dca/dca.go b/plugin/dca/dca.go
@@ -94,7 +94,7 @@ func (p *DCAPlugin) SigningComplete(
 	ctx context.Context,
 	signature tss.KeysignResponse,
 	signRequest vtypes.PluginKeysignRequest,
-	policy vtypes.PluginPolicyCreateUpdate,
+	policy vtypes.PluginPolicy,
 ) error {
 	var dcaPolicy DCAPolicy
 	// TODO: convert recipe to DCAPolicy
@@ -135,7 +135,7 @@ func (p *DCAPlugin) SigningComplete(
 	return nil
 }
 
-func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpdate) error {
+func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicy) error {
 	if policyDoc.PluginID != vtypes.PluginVultisigDCA_0000 {
 		return fmt.Errorf("policy does not match plugin type, expected: %s, got: %s", pluginType, policyDoc.PluginID)
 	}
@@ -144,7 +144,7 @@ func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpda
 		return fmt.Errorf("policy does not match plugin version, expected: %s, got: %s", pluginVersion, policyDoc.PluginVersion)
 	}
 
-	if policyDoc.PolicyVersion != policyVersion {
+	if fmt.Sprintf("%d", policyDoc.PolicyVersion) != policyVersion { //TODO policy version will essentially be a nonce that is incremented by 1, not, like plugin versions that will follow traditional engineering versioning e.g. v2.12.3. For now we can compare string types
 		return fmt.Errorf("policy does not match policy version, expected: %s, got: %s", policyVersion, policyDoc.PolicyVersion)
 	}
 
@@ -270,7 +270,7 @@ func validateInterval(intervalStr string, frequency string) error {
 	return nil
 }
 
-func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate) ([]vtypes.PluginKeysignRequest, error) {
+func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.PluginKeysignRequest, error) {
 	p.logger.Info("DCA: PROPOSE TRANSACTIONS")
 
 	var txs []vtypes.PluginKeysignRequest
@@ -301,7 +301,7 @@ func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate)
 	}
 
 	if completedSwaps >= totalOrders.Int64() {
-		if err := p.completePolicy(context.Background(), policy.ToPluginPolicy()); err != nil {
+		if err := p.completePolicy(context.Background(), policy); err != nil {
 			return txs, fmt.Errorf("fail to complete policy: %w", err)
 		}
 		return txs, ErrCompletedPolicy
@@ -358,7 +358,7 @@ func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate)
 	return txs, nil
 }
 
-func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreateUpdate, txs []vtypes.PluginKeysignRequest) error {
+func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs []vtypes.PluginKeysignRequest) error {
 	p.logger.Info("DCA: VALIDATE TRANSACTION PROPOSAL")
 
 	if len(txs) == 0 {
@@ -407,7 +407,7 @@ func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreat
 	}
 	// TODO: Change this to make the policy to status COMPLETED if: completed swaps == total orders.
 	if completedSwaps >= totalOrders.Int64() {
-		if err := p.completePolicy(context.Background(), policy.ToPluginPolicy()); err != nil {
+		if err := p.completePolicy(context.Background(), policy); err != nil {
 			return fmt.Errorf("fail to complete policy: %w", err)
 		}
 		p.logger.Info("DCA: COMPLETED SWAPS: ", totalOrders.Int64())
diff --git a/plugin/payroll/policy.go b/plugin/payroll/policy.go
@@ -37,7 +37,7 @@ type Schedule struct {
 	EndTime   string `json:"end_time,omitempty"`
 }
 
-func (p *PayrollPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreateUpdate, txs []vtypes.PluginKeysignRequest) error {
+func (p *PayrollPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs []vtypes.PluginKeysignRequest) error {
 	err := p.ValidatePluginPolicy(policy)
 	if err != nil {
 		return fmt.Errorf("failed to validate plugin policy: %v", err)
@@ -196,7 +196,7 @@ func (p *PayrollPlugin) checkRule(rule *rtypes.Rule) error {
 	}
 	return nil
 }
-func (p *PayrollPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpdate) error {
+func (p *PayrollPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicy) error {
 	if policyDoc.PluginID != vtypes.PluginVultisigPayroll_0000 {
 		return fmt.Errorf("policy does not match plugin type, expected: %s, got: %s", vtypes.PluginVultisigPayroll_0000, policyDoc.PluginID)
 	}
diff --git a/plugin/payroll/transaction.go b/plugin/payroll/transaction.go
@@ -52,7 +52,7 @@ func (p *PayrollPlugin) HandleSchedulerTrigger(ctx context.Context, t *asynq.Tas
 	_ = pluginPolicy
 	return nil
 }
-func (p *PayrollPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate) ([]vtypes.PluginKeysignRequest, error) {
+func (p *PayrollPlugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.PluginKeysignRequest, error) {
 	var txs []vtypes.PluginKeysignRequest
 	err := p.ValidatePluginPolicy(policy)
 	if err != nil {
@@ -232,8 +232,8 @@ func (p *PayrollPlugin) generatePayrollTransaction(amountString, recipientString
 	return txHash, rawTx, nil
 }
 
-func (p *PayrollPlugin) SigningComplete(ctx context.Context, signature tss.KeysignResponse, signRequest vtypes.PluginKeysignRequest, policy vtypes.PluginPolicyCreateUpdate) error {
-	R, S, V, originalTx, chainID, _, err := p.convertData(signature, signRequest, policy.ToPluginPolicy())
+func (p *PayrollPlugin) SigningComplete(ctx context.Context, signature tss.KeysignResponse, signRequest vtypes.PluginKeysignRequest, policy vtypes.PluginPolicy) error {
+	R, S, V, originalTx, chainID, _, err := p.convertData(signature, signRequest, policy)
 	if err != nil {
 		return fmt.Errorf("failed to convert R and S: %v", err)
 	}
diff --git a/scripts/dev/create_dca_policy/main.go b/scripts/dev/create_dca_policy/main.go
@@ -75,7 +75,7 @@ func main() {
 		PublicKey:     key,
 		PluginID:      vtypes.PluginVultisigDCA_0000,
 		PluginVersion: "1.0.0",
-		PolicyVersion: "1.0.0",
+		PolicyVersion: 1,
 		Active:        true,
 		Signature:     "0x0000000000000000000000000000000000000000000000000000000000000000",
 	}
diff --git a/scripts/dev/create_payroll_policy/main.go b/scripts/dev/create_payroll_policy/main.go
@@ -99,7 +99,7 @@ func main() {
 		PublicKey:     key,
 		PluginID:      vtypes.PluginVultisigPayroll_0000,
 		PluginVersion: "1.0.0",
-		PolicyVersion: "1.0.0",
+		PolicyVersion: 1,
 		Active:        true,
 		Signature:     "0x0000000000000000000000000000000000000000000000000000000000000000",
 	}
diff --git a/storage/postgres/time_trigger_test.go b/storage/postgres/time_trigger_test.go
@@ -43,7 +43,7 @@ func TestTimeTrigger(t *testing.T) {
 		PublicKey:     "4a7b9c2f8e1d3a5b6c4f9e2d7a1b3c5f8d4e6a2b9c1f7e3d5a6b4c2f8e1d3a5b",
 		PluginID:      "vultisig-payroll-0000",
 		PluginVersion: "1",
-		PolicyVersion: "1",
+		PolicyVersion: 1,
 		Signature:     "whatever",
 		Recipe:        "k3uaL47TpWtsT54tfhO7K6Gbyxf4H71jWma0zC2e3kQ=",
 		Active:        true,

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (p *DCAPlugin) SigningComplete(`
`94`	`94`	`ctx context.Context,`
`95`	`95`	`signature tss.KeysignResponse,`
`96`	`96`	`signRequest vtypes.PluginKeysignRequest,`
`97`		`- policy vtypes.PluginPolicyCreateUpdate,`
	`97`	`+ policy vtypes.PluginPolicy,`
`98`	`98`	`) error {`
`99`	`99`	`var dcaPolicy DCAPolicy`
`100`	`100`	`// TODO: convert recipe to DCAPolicy`
`@@ -135,7 +135,7 @@ func (p *DCAPlugin) SigningComplete(`
`135`	`135`	`return nil`
`136`	`136`	`}`
`137`	`137`
`138`		`-func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpdate) error {`
	`138`	`+func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicy) error {`
`139`	`139`	`if policyDoc.PluginID != vtypes.PluginVultisigDCA_0000 {`
`140`	`140`	`return fmt.Errorf("policy does not match plugin type, expected: %s, got: %s", pluginType, policyDoc.PluginID)`
`141`	`141`	`}`
`@@ -144,7 +144,7 @@ func (p *DCAPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpda`
`144`	`144`	`return fmt.Errorf("policy does not match plugin version, expected: %s, got: %s", pluginVersion, policyDoc.PluginVersion)`
`145`	`145`	`}`
`146`	`146`
`147`		`- if policyDoc.PolicyVersion != policyVersion {`
	`147`	`+ if fmt.Sprintf("%d", policyDoc.PolicyVersion) != policyVersion { //TODO policy version will essentially be a nonce that is incremented by 1, not, like plugin versions that will follow traditional engineering versioning e.g. v2.12.3. For now we can compare string types`
`148`	`148`	`return fmt.Errorf("policy does not match policy version, expected: %s, got: %s", policyVersion, policyDoc.PolicyVersion)`
`149`	`149`	`}`
`150`	`150`
`@@ -270,7 +270,7 @@ func validateInterval(intervalStr string, frequency string) error {`
`270`	`270`	`return nil`
`271`	`271`	`}`
`272`	`272`
`273`		`-func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate) ([]vtypes.PluginKeysignRequest, error) {`
	`273`	`+func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.PluginKeysignRequest, error) {`
`274`	`274`	`p.logger.Info("DCA: PROPOSE TRANSACTIONS")`
`275`	`275`
`276`	`276`	`var txs []vtypes.PluginKeysignRequest`
`@@ -301,7 +301,7 @@ func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate)`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`if completedSwaps >= totalOrders.Int64() {`
`304`		`- if err := p.completePolicy(context.Background(), policy.ToPluginPolicy()); err != nil {`
	`304`	`+ if err := p.completePolicy(context.Background(), policy); err != nil {`
`305`	`305`	`return txs, fmt.Errorf("fail to complete policy: %w", err)`
`306`	`306`	`}`
`307`	`307`	`return txs, ErrCompletedPolicy`
`@@ -358,7 +358,7 @@ func (p *DCAPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate)`
`358`	`358`	`return txs, nil`
`359`	`359`	`}`
`360`	`360`
`361`		`-func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreateUpdate, txs []vtypes.PluginKeysignRequest) error {`
	`361`	`+func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs []vtypes.PluginKeysignRequest) error {`
`362`	`362`	`p.logger.Info("DCA: VALIDATE TRANSACTION PROPOSAL")`
`363`	`363`
`364`	`364`	`if len(txs) == 0 {`
`@@ -407,7 +407,7 @@ func (p *DCAPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreat`
`407`	`407`	`}`
`408`	`408`	`// TODO: Change this to make the policy to status COMPLETED if: completed swaps == total orders.`
`409`	`409`	`if completedSwaps >= totalOrders.Int64() {`
`410`		`- if err := p.completePolicy(context.Background(), policy.ToPluginPolicy()); err != nil {`
	`410`	`+ if err := p.completePolicy(context.Background(), policy); err != nil {`
`411`	`411`	`return fmt.Errorf("fail to complete policy: %w", err)`
`412`	`412`	`}`
`413`	`413`	`p.logger.Info("DCA: COMPLETED SWAPS: ", totalOrders.Int64())`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ type Schedule struct {`
`37`	`37`	EndTime string `json:"end_time,omitempty"`
`38`	`38`	`}`
`39`	`39`
`40`		`-func (p *PayrollPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicyCreateUpdate, txs []vtypes.PluginKeysignRequest) error {`
	`40`	`+func (p *PayrollPlugin) ValidateProposedTransactions(policy vtypes.PluginPolicy, txs []vtypes.PluginKeysignRequest) error {`
`41`	`41`	`err := p.ValidatePluginPolicy(policy)`
`42`	`42`	`if err != nil {`
`43`	`43`	`return fmt.Errorf("failed to validate plugin policy: %v", err)`
`@@ -196,7 +196,7 @@ func (p PayrollPlugin) checkRule(rule rtypes.Rule) error {`
`196`	`196`	`}`
`197`	`197`	`return nil`
`198`	`198`	`}`
`199`		`-func (p *PayrollPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicyCreateUpdate) error {`
	`199`	`+func (p *PayrollPlugin) ValidatePluginPolicy(policyDoc vtypes.PluginPolicy) error {`
`200`	`200`	`if policyDoc.PluginID != vtypes.PluginVultisigPayroll_0000 {`
`201`	`201`	`return fmt.Errorf("policy does not match plugin type, expected: %s, got: %s", vtypes.PluginVultisigPayroll_0000, policyDoc.PluginID)`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (p PayrollPlugin) HandleSchedulerTrigger(ctx context.Context, t asynq.Tas`
`52`	`52`	`_ = pluginPolicy`
`53`	`53`	`return nil`
`54`	`54`	`}`
`55`		`-func (p *PayrollPlugin) ProposeTransactions(policy vtypes.PluginPolicyCreateUpdate) ([]vtypes.PluginKeysignRequest, error) {`
	`55`	`+func (p *PayrollPlugin) ProposeTransactions(policy vtypes.PluginPolicy) ([]vtypes.PluginKeysignRequest, error) {`
`56`	`56`	`var txs []vtypes.PluginKeysignRequest`
`57`	`57`	`err := p.ValidatePluginPolicy(policy)`
`58`	`58`	`if err != nil {`
`@@ -232,8 +232,8 @@ func (p *PayrollPlugin) generatePayrollTransaction(amountString, recipientString`
`232`	`232`	`return txHash, rawTx, nil`
`233`	`233`	`}`
`234`	`234`
`235`		`-func (p *PayrollPlugin) SigningComplete(ctx context.Context, signature tss.KeysignResponse, signRequest vtypes.PluginKeysignRequest, policy vtypes.PluginPolicyCreateUpdate) error {`
`236`		`- R, S, V, originalTx, chainID, _, err := p.convertData(signature, signRequest, policy.ToPluginPolicy())`
	`235`	`+func (p *PayrollPlugin) SigningComplete(ctx context.Context, signature tss.KeysignResponse, signRequest vtypes.PluginKeysignRequest, policy vtypes.PluginPolicy) error {`
	`236`	`+ R, S, V, originalTx, chainID, _, err := p.convertData(signature, signRequest, policy)`
`237`	`237`	`if err != nil {`
`238`	`238`	`return fmt.Errorf("failed to convert R and S: %v", err)`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func main() {`
`75`	`75`	`PublicKey: key,`
`76`	`76`	`PluginID: vtypes.PluginVultisigDCA_0000,`
`77`	`77`	`PluginVersion: "1.0.0",`
`78`		`- PolicyVersion: "1.0.0",`
	`78`	`+ PolicyVersion: 1,`
`79`	`79`	`Active: true,`
`80`	`80`	`Signature: "0x0000000000000000000000000000000000000000000000000000000000000000",`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func main() {`
`99`	`99`	`PublicKey: key,`
`100`	`100`	`PluginID: vtypes.PluginVultisigPayroll_0000,`
`101`	`101`	`PluginVersion: "1.0.0",`
`102`		`- PolicyVersion: "1.0.0",`
	`102`	`+ PolicyVersion: 1,`
`103`	`103`	`Active: true,`
`104`	`104`	`Signature: "0x0000000000000000000000000000000000000000000000000000000000000000",`
`105`	`105`	`}`