Resolve invalid block time measurement

Author: zivkovicmilos

internal/collector/collector.go

@@ -33,7 +33,11 @@ func NewCollector(cli Client) *Collector {
 }
 
 // GetRunResult generates the run result for the passed in transaction hashes and start range
-func (c *Collector) GetRunResult(txHashes [][]byte, startBlock int64) (*RunResult, error) {
+func (c *Collector) GetRunResult(
+	txHashes [][]byte,
+	startBlock int64,
+	startTime time.Time,
+) (*RunResult, error) {
 	var (
 		blockResults = make([]*BlockResult, 0)
 		timeout      = time.After(5 * time.Minute)
@@ -113,7 +117,7 @@ func (c *Collector) GetRunResult(txHashes [][]byte, startBlock int64) (*RunResul
 
 	return &RunResult{
 		AverageTPS: calculateTPS(
-			blockResults[0].Time,
+			startTime,
 			blockResults[len(blockResults)-1].Time,
 			len(txHashes),
 		),

internal/collector/collector_test.go

@@ -105,7 +105,7 @@ func TestCollector_GetRunResults(t *testing.T) {
 	c.requestTimeout = time.Second * 0
 
 	// Collect the results
-	result, err := c.GetRunResult(txHashes, 1)
+	result, err := c.GetRunResult(txHashes, 1, startTime)
 	if err != nil {
 		t.Fatalf("unable to get run results, %v", err)
 	}

internal/pipeline.go

@@ -2,6 +2,7 @@ package internal
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/gnolang/gno/pkgs/crypto/keys"
 	"github.com/gnolang/supernova/internal/batcher"
@@ -83,13 +84,19 @@ func (p *Pipeline) Execute() error {
 	}
 
 	// Send the signed transactions in batches
+	batchStart := time.Now()
+
 	batchResult, err := txBatcher.BatchTransactions(txs, int(p.cfg.BatchSize))
 	if err != nil {
 		return fmt.Errorf("unable to batch transactions %w", err)
 	}
 
 	// Collect the transaction results
-	runResult, err := txCollector.GetRunResult(batchResult.TxHashes, batchResult.StartBlock)
+	runResult, err := txCollector.GetRunResult(
+		batchResult.TxHashes,
+		batchResult.StartBlock,
+		batchStart,
+	)
 	if err != nil {
 		return fmt.Errorf("unable to collect transactions, %w", err)
 	}

internal/runtime/realm_call.go

@@ -50,7 +50,7 @@ func (r *realmCall) Initialize(account *gnoland.GnoAccount) ([]*std.Tx, error) {
 
 	tx := &std.Tx{
 		Msgs: []std.Msg{msg},
-		Fee:  std.NewFee(600000, common.DefaultGasFee),
+		Fee:  defaultDeployTxFee,
 	}
 
 	// Sign it

internal/runtime/runtime.go

@@ -15,7 +15,7 @@ const (
 )
 
 var (
-	defaultDeployTxFee = std.NewFee(600000, common.DefaultGasFee)
+	defaultDeployTxFee = std.NewFee(165000, common.DefaultGasFee)
 )
 
 // Runtime is the base interface for all runtime