Merge branch 'dev'

Author: daniildulin

VERSION

@@ -1 +1 @@
-2.6.27
+2.7.0

database/db.sql

@@ -221,7 +221,7 @@ CREATE INDEX stakes_validator_id_index ON stakes USING btree (validator_id);
 
 CREATE TABLE unbonds
 (
-    block_id     bigint         NOT NULL references blocks (id),
+    block_id     bigint         NOT NULL,
     address_id   bigint         NOT NULL references addresses (id),
     coin_id      integer        NOT NULL references coins (id),
     validator_id integer        NOT NULL references validators (id),

validator/service.go

@@ -17,6 +17,8 @@ import (
 	"time"
 )
 
+const UnbondBlockCount = 518400
+
 type Service struct {
 	env                 *env.ExtenderEnvironment
 	nodeApi             *grpc_client.Client
@@ -80,7 +82,7 @@ func (s *Service) UnbondSaverWorker(data <-chan *models.Transaction) {
 		}
 
 		unbond := &models.Unbond{
-			BlockId:     uint(tx.BlockID),
+			BlockId:     uint(tx.BlockID + UnbondBlockCount),
 			AddressId:   uint(tx.FromAddressID),
 			CoinId:      uint(txData.Coin.Id),
 			ValidatorId: vId,