Merge branch 'dev'

Author: daniildulin

VERSION

@@ -1 +1 @@
-2.7.0
+2.7.2

broadcast/service.go

@@ -3,8 +3,8 @@ package broadcast
 import (
 	"context"
 	"encoding/json"
-	"github.com/MinterTeam/minter-explorer-api/balance"
-	"github.com/MinterTeam/minter-explorer-api/blocks"
+	"github.com/MinterTeam/minter-explorer-api/v2/balance"
+	"github.com/MinterTeam/minter-explorer-api/v2/blocks"
 	"github.com/MinterTeam/minter-explorer-extender/v2/address"
 	"github.com/MinterTeam/minter-explorer-extender/v2/coin"
 	"github.com/MinterTeam/minter-explorer-extender/v2/env"

broadcast/transaction.go

@@ -3,9 +3,9 @@ package broadcast
 import (
 	"encoding/base64"
 	"encoding/hex"
-	"github.com/MinterTeam/minter-explorer-api/helpers"
-	"github.com/MinterTeam/minter-explorer-api/resource"
-	"github.com/MinterTeam/minter-explorer-api/transaction/data_resources"
+	"github.com/MinterTeam/minter-explorer-api/v2/helpers"
+	"github.com/MinterTeam/minter-explorer-api/v2/resource"
+	"github.com/MinterTeam/minter-explorer-api/v2/transaction/data_resources"
 	"github.com/MinterTeam/minter-explorer-extender/v2/models"
 	"github.com/MinterTeam/minter-go-sdk/v2/transaction"
 	"github.com/MinterTeam/node-grpc-gateway/api_pb"

core/main.go

@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 	genesisUploader "github.com/MinterTeam/explorer-genesis-uploader/core"
-	"github.com/MinterTeam/minter-explorer-api/coins"
+	"github.com/MinterTeam/minter-explorer-api/v2/coins"
 	"github.com/MinterTeam/minter-explorer-extender/v2/address"
 	"github.com/MinterTeam/minter-explorer-extender/v2/balance"
 	"github.com/MinterTeam/minter-explorer-extender/v2/block"
@@ -156,15 +156,22 @@ func (ext *Extender) Run() {
 	for {
 		start := time.Now()
 		ext.findOutChasingMode(height)
+
 		//Pulling block data
+		startGettingBlock := time.Now()
 		blockResponse, err := ext.nodeApi.Block(height)
+		elapsedGettingBlock := time.Since(startGettingBlock)
+		ext.logger.Info(fmt.Sprintf("Block: %d Block's data getting time: %s", height, elapsedGettingBlock))
 		if err != nil {
 			time.Sleep(2 * time.Second)
 			continue
 		}
 
 		//Pulling events
+		startGettingEvents := time.Now()
 		eventsResponse, err := ext.nodeApi.Events(height)
+		elapsedGettingEvents := time.Since(startGettingEvents)
+		ext.logger.Info(fmt.Sprintf("Block: %d Events's data getting time: %s", height, elapsedGettingEvents))
 		if err != nil {
 			ext.logger.Panic(err)
 		}
@@ -178,10 +185,9 @@ func (ext *Extender) Run() {
 		}
 		go ext.handleEventResponse(height, eventsResponse)
 
-		ext.logger.Info("Block: ", height)
-		height++
 		elapsed := time.Since(start)
-		ext.logger.Info("Processing time: ", elapsed)
+		ext.logger.Info(fmt.Sprintf("Block: %d Processing time: %s", height, elapsed))
+		height++
 	}
 }
 

go.mod

@@ -1,12 +1,12 @@
 module github.com/MinterTeam/minter-explorer-extender/v2
 
-go 1.13
+go 1.14
 
 require (
-	github.com/MinterTeam/explorer-genesis-uploader v1.1.1-0.20201016205738-a7947738d217
-	github.com/MinterTeam/minter-explorer-api v1.4.1-0.20201014173133-ab97d5ea1f3a
+	github.com/MinterTeam/explorer-genesis-uploader v1.2.4
+	github.com/MinterTeam/minter-explorer-api/v2 v2.0.1
 	github.com/MinterTeam/minter-explorer-tools/v4 v4.2.3
-	github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20201016141625-fb50c352ef65
+	github.com/MinterTeam/minter-go-sdk/v2 v2.0.0
 	github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20201016140502-48720810e1d0
 	github.com/centrifugal/gocent v2.1.0+incompatible
 	github.com/go-pg/pg/v9 v9.2.0

go.sum

@@ -31,10 +31,8 @@ github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e h1:ahyvB3q25Yn
 github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUqhHd//musdITWjFvNTHn90WG9bMLBEPQZ17Cmlpw=
 github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec h1:1Qb69mGp/UtRPn422BH4/Y4Q3SLUrD9KHuDkm8iodFc=
 github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec/go.mod h1:CD8UlnlLDiqb36L110uqiP2iSflVjx9g/3U9hCI4q2U=
-github.com/MinterTeam/explorer-genesis-uploader v1.1.1-0.20201016142212-e088c4acbbce h1:S12VyFUBzYa/kkwD0Y+kXyNt9xvRcVNgjNdyqFGrtKQ=
-github.com/MinterTeam/explorer-genesis-uploader v1.1.1-0.20201016142212-e088c4acbbce/go.mod h1:3eSjpI5uzUomm8vzrL/xX35q1E5w5jjUR8y4YgD12wc=
-github.com/MinterTeam/explorer-genesis-uploader v1.1.1-0.20201016205738-a7947738d217 h1:W4T+proToOp34+6sxxXFSFyz3edhUGFWZ5fVSKDOLT4=
-github.com/MinterTeam/explorer-genesis-uploader v1.1.1-0.20201016205738-a7947738d217/go.mod h1:3eSjpI5uzUomm8vzrL/xX35q1E5w5jjUR8y4YgD12wc=
+github.com/MinterTeam/explorer-genesis-uploader v1.2.4 h1:NR5fL4EoFTwr2Ft5sbBJA5Cljm594sSeNq7w0mgANzE=
+github.com/MinterTeam/explorer-genesis-uploader v1.2.4/go.mod h1:3eSjpI5uzUomm8vzrL/xX35q1E5w5jjUR8y4YgD12wc=
 github.com/MinterTeam/go-amino v0.14.1 h1:RJZh+Rn2MpSnCroAL/HA8CdnibeYPSsiLvQWacFCVKc=
 github.com/MinterTeam/go-amino v0.14.1/go.mod h1:2sqs1fcf3DcQpvIJarkzVCjALWc11WDwc5oFHCrG5R4=
 github.com/MinterTeam/minter-explorer-api v1.4.1-0.20200824121237-4e1fff866521 h1:fESN8yqH2SsNa+z+zCghWF2p5bPNwFVUkvMcbkFYcVY=
@@ -43,8 +41,8 @@ github.com/MinterTeam/minter-explorer-api v1.4.1-0.20200902081834-fab3955b454e h
 github.com/MinterTeam/minter-explorer-api v1.4.1-0.20200902081834-fab3955b454e/go.mod h1:7n42VVVi6usjnw3IrbNX7ULdMxvcqGKfJmF9+FngzFE=
 github.com/MinterTeam/minter-explorer-api v1.4.1-0.20200918104534-e02c006e0c51 h1:wDIMm+0xsoRZFptuQqS6NJmLJb1pM4P8BHA98pxfJNo=
 github.com/MinterTeam/minter-explorer-api v1.4.1-0.20200918104534-e02c006e0c51/go.mod h1:776D9BGdIbLxmCxtd3pYK4raKKpUWYGXALDYVjNCUpo=
-github.com/MinterTeam/minter-explorer-api v1.4.1-0.20201014173133-ab97d5ea1f3a h1:DjVMiNr+dc5N/+t7Ch5/9x92WdBjDTGMizjuTB1UQ1Q=
-github.com/MinterTeam/minter-explorer-api v1.4.1-0.20201014173133-ab97d5ea1f3a/go.mod h1:2E19ty4KZRWQ1IipCspnXnjZhoaKr5SeSKc3+X01JMI=
+github.com/MinterTeam/minter-explorer-api/v2 v2.0.1 h1:4s/wUdbaJzHcUG1+7GfH/YCTw0H5fZ7MvcuULn6vTJA=
+github.com/MinterTeam/minter-explorer-api/v2 v2.0.1/go.mod h1:vnxGDrzFV/IIFh1ofAiUNGTDkY3+s0LKu+mnvUDr/yY=
 github.com/MinterTeam/minter-explorer-extender/v2 v2.1.1-0.20200824120016-277608980ac6/go.mod h1:7jy+TEO9dEdfEwgGdXesETCxcWl3DYGlZCbMvD3KxHM=
 github.com/MinterTeam/minter-explorer-extender/v2 v2.1.1-0.20200902081316-6bc5dd6d2a52/go.mod h1:VuIxpRWmf9Bq0N08Kyv++QeD+kSbflmb5ojIM7KaDzI=
 github.com/MinterTeam/minter-explorer-extender/v2 v2.1.1-0.20200907131547-0fa52278f740/go.mod h1:DUqKme+2AYIO8zdy4kaaB+hIAkQ3bPQ5m/ppUa5lA58=
@@ -69,10 +67,10 @@ github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20200917014844-f43d50b6e469/go.mod
 github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20200920180942-a75383c270a2/go.mod h1:1HgEEeuAt7XlX7a7JxMbgJZALr3NaoTrRUMlb/sBXEY=
 github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20200925010749-81e29232e7e3 h1:UtFzWb8QYvkH/qfcrg6L/iddf97MeLQCeiuavytr4GE=
 github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20200925010749-81e29232e7e3/go.mod h1:H60KTb5mvAx4wsQumjbuTdED1NcyEiniJpO8K3/5pcA=
-github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20201002003308-9463dc858495/go.mod h1:S86XA2gZ10lgXZ7caosjiLX+GHQ0JrwuBb7VVSAvA54=
-github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20201007101936-bb6346f4dde4/go.mod h1:qiu6xfO3nrq7TV5/rpruwqa+cskH1oFhWwycKksXre0=
 github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20201016141625-fb50c352ef65 h1:4ik5WLiy47as/Dj7dDEr0ybfS45yyW2AjuF3jZxHCDU=
 github.com/MinterTeam/minter-go-sdk/v2 v2.0.0-20201016141625-fb50c352ef65/go.mod h1:jZqlfoPbQxWyNGfjhdfiPZ7BjCnThaYdB/4Yoh/b82o=
+github.com/MinterTeam/minter-go-sdk/v2 v2.0.0 h1:k7bKXmUE/hN04X7jGMMayDZNgHQ5eKuQaE4LIcCYSFI=
+github.com/MinterTeam/minter-go-sdk/v2 v2.0.0/go.mod h1:jZqlfoPbQxWyNGfjhdfiPZ7BjCnThaYdB/4Yoh/b82o=
 github.com/MinterTeam/minter-node-go-api v1.3.5/go.mod h1:y0z0cScz5N5mxlDcK+S1pRpSbSq4yVgOxq6pLR6YSvw=
 github.com/MinterTeam/node-grpc-gateway v1.1.1/go.mod h1:WWdGy/bxMgnaTlDWaemx4Z7tc2/4IjPOKdlmC8QRH2M=
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20200818113440-fe9f21434b29 h1:MnKjbs8Lii+I4TSEWiXxRgQuOZ99WGf52KUWr0M53u0=
@@ -85,7 +83,6 @@ github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20200917013747-c25ba3234571/go.
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20200920180544-2bc88646bf02/go.mod h1:LZ+Y8IYfSBx0IQZY+a9pHLjztMwmlaCQX2ncTejoE2o=
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20200925002945-15b5cde8e354 h1:HpjApkir3UtOL4WzGzkgQcdT9SyqwiZ/wbGrahzIlLQ=
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20200925002945-15b5cde8e354/go.mod h1:LZ+Y8IYfSBx0IQZY+a9pHLjztMwmlaCQX2ncTejoE2o=
-github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20201002002423-9c7eba45b3e4/go.mod h1:49888tivqufwv7KMC0QVZLGJP3wW2cQQazccvOYWCiE=
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20201016140502-48720810e1d0 h1:S48WwE3uOGfBMZzyDSgUeZ+zTvUbrxrT57FV4XQH8zo=
 github.com/MinterTeam/node-grpc-gateway v1.1.3-0.20201016140502-48720810e1d0/go.mod h1:49888tivqufwv7KMC0QVZLGJP3wW2cQQazccvOYWCiE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=