Merge branch 'main' of github.com:lavanet/lava into eth_tests

VICHINHOK · Aug 14, 2022 · 76dd1a8 · 76dd1a8
2 parents f970921 + 439d3e7
commit 76dd1a8
Show file tree

Hide file tree

Showing 12 changed files with 422 additions and 222 deletions.
diff --git a/cmd/lavad/main.go b/cmd/lavad/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -13,6 +14,7 @@ import (
 	"github.com/ignite-hq/cli/ignite/pkg/cosmoscmd"
 	"github.com/lavanet/lava/app"
 	"github.com/lavanet/lava/relayer"
+	"github.com/lavanet/lava/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -33,6 +35,7 @@ func main() {
 		Long:  `server`,
 		Args:  cobra.ExactArgs(5),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			utils.LavaFormatInfo("Provider process started", nil, &map[string]string{"args": strings.Join(args, ",")})
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
@@ -67,6 +70,7 @@ func main() {
 		Long:  `portal server`,
 		Args:  cobra.ExactArgs(4),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			utils.LavaFormatInfo("Gateway Proxy process started", nil, &map[string]string{"args": strings.Join(args, ",")})
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
@@ -94,6 +98,7 @@ func main() {
 		Long:  `test client`,
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
+			utils.LavaFormatInfo("Test consumer process started", nil, &map[string]string{"args": strings.Join(args, ",")})
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err

diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -51832,6 +51832,9 @@ definitions:
           sig:
             type: string
             format: byte
+          epoch:
+            type: string
+            format: uint64
       QoSReport:
         type: object
         properties:
@@ -51866,6 +51869,9 @@ definitions:
       sig:
         type: string
         format: byte
+      epoch:
+        type: string
+        format: uint64
   lavanet.lava.epochstorage.Endpoint:
     type: object
     properties:

diff --git a/relayer/chainproxy/chainproxy.go b/relayer/chainproxy/chainproxy.go
@@ -108,7 +108,8 @@ func SendRelay(
 			return nil, nil, err
 		}
 
-		blockHeight = cp.GetSentry().GetBlockHeight()
+		blockHeight = int64(clientSession.Client.GetPairingEpoch()) // epochs heights only
+
 		relayRequest := &pairingtypes.RelayRequest{
 			Provider:        clientSession.Client.Acc,
 			ConnectionType:  connectionType,
@@ -158,13 +159,13 @@ func SendRelay(
 		}
 
 		expectedBH, numOfProviders := cp.GetSentry().ExpecedBlockHeight()
-		clientSession.CalculateQoS(nodeMsg.GetServiceApi().ComputeUnits, currentLatency, expectedBH-reply.LatestBlock, numOfProviders, cp.GetSentry().GetServicersToPairCount())
+		clientSession.CalculateQoS(nodeMsg.GetServiceApi().ComputeUnits, currentLatency, expectedBH-reply.LatestBlock, numOfProviders, int64(cp.GetSentry().GetProvidersCount()))
 
 		return reply, relayRequest, nil
 	}
 	callback_send_reliability := func(clientSession *sentry.ClientSession, dataReliability *pairingtypes.VRFData) (*pairingtypes.RelayReply, *pairingtypes.RelayRequest, error) {
 		//client session is locked here
-
+		sentry := cp.GetSentry()
 		if blockHeight < 0 {
 			return nil, nil, fmt.Errorf("expected callback_send_relay to be called first and set blockHeight")
 		}
@@ -174,7 +175,7 @@ func SendRelay(
 			ApiUrl:          url,
 			Data:            []byte(req),
 			SessionId:       uint64(0), //sessionID for reliability is 0
-			ChainID:         cp.GetSentry().ChainID,
+			ChainID:         sentry.ChainID,
 			CuSum:           clientSession.CuSum,
 			BlockHeight:     blockHeight,
 			RelayNum:        clientSession.RelayNum,

diff --git a/relayer/chainsentry/chainsentry.go b/relayer/chainsentry/chainsentry.go
@@ -39,7 +39,7 @@ func (cs *ChainSentry) SetLatestBlockNum(value int64) {
 	atomic.StoreInt64(&cs.latestBlockNum, value)
 }
 
-func (cs *ChainSentry) GetLatestBlockData() (int64, map[int64]interface{}, error) {
+func (cs *ChainSentry) GetLatestBlockData() (int64, map[int64]interface{}) {
 	cs.blockQueueMu.Lock()
 	defer cs.blockQueueMu.Unlock()
 
@@ -50,7 +50,7 @@ func (cs *ChainSentry) GetLatestBlockData() (int64, map[int64]interface{}, error
 		blockNum := latestBlockNum - int64(cs.finalizedBlockDistance) - int64(cs.numFinalBlocks) + int64(i+1)
 		hashes[blockNum] = cs.blocksQueue[i]
 	}
-	return latestBlockNum, hashes, nil
+	return latestBlockNum, hashes
 }
 
 func (cs *ChainSentry) fetchLatestBlockNum(ctx context.Context) (int64, error) {

diff --git a/relayer/portal_server.go b/relayer/portal_server.go
@@ -2,7 +2,6 @@ package relayer
 
 import (
 	context "context"
-	"fmt"
 	"log"
 	"time"
 
@@ -49,7 +48,7 @@ func PortalServer(
 
 	//
 	// Set up a connection to the server.
-	log.Println(fmt.Sprintf("PortalServer %s", apiInterface))
+	log.Printf("PortalServer %s\n", apiInterface)
 	keyName, err := sigs.GetKeyName(clientCtx)
 	if err != nil {
 		log.Fatalln("error: getKeyName", err)