Merge branch 'b/testnet' into b/master

bitcat365 · Nov 17, 2024 · 13c2b7d · 13c2b7d
2 parents 6f47a07 + 4a83a96
commit 13c2b7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/job/task/block_task.go b/job/task/block_task.go
@@ -42,6 +42,8 @@ func BlockScanner(ctx context.Context, svcCtx *svc.ServiceContext) {
 		scanHeight++
 	}
 
+	logc.Infof(ctx, "block scan start: scanHeight:[%d], currentHeight:[%d]", scanHeight, currentHeight)
+
 	for scanHeight <= currentHeight {
 		//block
 		block, err := consensusApi.GetBlock(ctx, scanHeight)
@@ -110,7 +112,7 @@ func BlockScanner(ctx context.Context, svcCtx *svc.ServiceContext) {
 					Height:           block.Height,
 					BlockIdFlag:      int64(s.BlockIDFlag),
 					ValidatorAddress: s.ValidatorAddress.String(),
-					Timestamp:        s.Timestamp,
+					Timestamp:        s.Timestamp.UTC(),
 					Signature:        hex.EncodeToString(s.Signature),
 					CreatedAt:        time.Now(),
 					UpdatedAt:        time.Now(),
@@ -131,7 +133,7 @@ func BlockScanner(ctx context.Context, svcCtx *svc.ServiceContext) {
 				Height:          block.Height,
 				Epoch:           int64(epoch),
 				Hash:            block.Hash.Hex(),
-				Timestamp:       block.Time,
+				Timestamp:       block.Time.UTC(),
 				Meta:            string(metaJson),
 				Txs:             int64(len(txs)),
 				ProposerAddress: meta.Header.ProposerAddress.String(),
@@ -157,7 +159,7 @@ func BlockScanner(ctx context.Context, svcCtx *svc.ServiceContext) {
 		}
 		logc.Infof(ctx, "transact duration [%v]", time.Since(startTime))
 
-		logc.Infof(ctx, "block scan height: %d, current height: %d", scanHeight, currentHeight)
+		logc.Infof(ctx, "block scan height: %d, current height: %d, size:[%d]", scanHeight, currentHeight, len(txsModels))
 		scanHeight++
 	}
 }
@@ -181,7 +183,7 @@ func parseMethod(block *consensus.Block, signedTx *transaction.SignedTransaction
 		Status:    result.IsSuccess(),
 		Nonce:     int64(raw.Nonce),
 		Height:    block.Height,
-		Timestamp: block.Time,
+		Timestamp: block.Time.UTC(),
 		SignAddr:  staking.NewAddress(signedTx.Signature.PublicKey).String(),
 		Error:     string(errorJson),
 		Events:    string(eventsJson),

diff --git a/job/task/governance_task.go b/job/task/governance_task.go
@@ -51,7 +51,7 @@ func ProposalSync(ctx context.Context, svcCtx *svc.ServiceContext) {
 				logc.Errorf(ctx, "createdHeight getBlock error, %v", err)
 				return
 			}
-			createdTime = createdBlock.Time
+			createdTime = createdBlock.Time.UTC()
 		}
 
 		epochDuration := int64(proposal.ClosesAt) - int64(proposal.CreatedAt)
@@ -65,7 +65,7 @@ func ProposalSync(ctx context.Context, svcCtx *svc.ServiceContext) {
 					logc.Errorf(ctx, "closedBlock getBlock error, %v", err)
 					return
 				}
-				closedTime = closedBlock.Time
+				closedTime = closedBlock.Time.UTC()
 			}
 		} else {
 			closedTime = common.GetEpochDurationTime(createdTime, epochDuration, true)

diff --git a/job/task/validator_task.go b/job/task/validator_task.go
@@ -616,7 +616,7 @@ func DelegatorRewardSync(ctx context.Context, svcCtx *svc.ServiceContext) {
 					DelegationAmount: delegationAmount.ToBigInt().Int64(),
 					DelegationShares: delegation.Shares.ToBigInt().Int64(),
 					Reward:           reward.Int64(),
-					CreatedAt:        block.Time,
+					CreatedAt:        block.Time.UTC(),
 					UpdatedAt:        time.Now(),
 				}
 				rewardModels = append(rewardModels, rewardModel)