From 5447d806baa167c4969235773816d6a97a7276ae Mon Sep 17 00:00:00 2001 From: Nikolay Eskov Date: Mon, 19 Aug 2024 13:49:22 +0300 Subject: [PATCH] Change activation condition for 'payments fix'. (#1470) * Change activation condition for 'payments fix'. This change relates to #1468. * Change activation height for stagenet. --- pkg/ride/environment.go | 4 +++- pkg/settings/embedded/stagenet.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/ride/environment.go b/pkg/ride/environment.go index 4b993f336..8f78fa6f9 100644 --- a/pkg/ride/environment.go +++ b/pkg/ride/environment.go @@ -1355,7 +1355,9 @@ func (e *EvaluationEnvironment) internalPaymentsValidationHeight() proto.Height } func (e *EvaluationEnvironment) paymentsFixActivated() bool { - return int(e.h) > int(e.paymentsFixAfter) + // according to the logic of the scala node + // see commit https://github.com/wavesplatform/Waves/commit/2f9e61c0fe04beeeb5b94b508b124a7ec1a746ff + return int(e.h) >= int(e.paymentsFixAfter) } func (e *EvaluationEnvironment) paymentsFixAfterHeight() proto.Height { diff --git a/pkg/settings/embedded/stagenet.json b/pkg/settings/embedded/stagenet.json index 026642f2e..a8f2efe44 100644 --- a/pkg/settings/embedded/stagenet.json +++ b/pkg/settings/embedded/stagenet.json @@ -33,7 +33,7 @@ "unissued_asset_until_time": 0, "invalid_reissue_in_same_block_until_time": 0, "minimal_generating_balance_check_after_time": 0, - "payments_fix_after_height": 2195800, + "payments_fix_after_height": 2195900, "internal_invoke_payments_validation_after_height": 966180, "internal_invoke_correct_fail_reject_behaviour_after_height": 390000, "invoke_no_zero_payments_after_height": 1317000,