Merge remote-tracking branch 'origin/master' into fix-gas-estimation

.github/workflows/go-mod-check.yaml

@@ -12,16 +12,16 @@ jobs:
     name: ensure go mod is tidy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.22'
           cache: false
 
       - name: go mod tidy
         run: |
           go mod tidy
-          
+
       - name: check go module
         run: |
           if ! git diff --exit-code --quiet; then

.github/workflows/lint-go.yaml

@@ -12,13 +12,13 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.22'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: v1.55.2
           # use the default if on main branch, otherwise use the pull request config

.github/workflows/on-release.yaml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20'
 

.github/workflows/test-e2e.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and export
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           tags: vechain/thor:${{ github.sha }}
@@ -43,8 +43,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: vechain/thor-e2e-tests
-          # https://github.com/vechain/thor-e2e-tests/tree/2cb22d804bb3cdf075917dbece42a182d42d7486
-          ref: 2cb22d804bb3cdf075917dbece42a182d42d7486
+          # https://github.com/vechain/thor-e2e-tests/tree/00bd3f1b949b05da94e82686e0089a11a136c34c
+          ref: 00bd3f1b949b05da94e82686e0089a11a136c34c
 
       - name: Download artifact
         uses: actions/download-artifact@v4

.github/workflows/test.yaml

@@ -23,10 +23,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -41,10 +41,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 1.22.x
 

api/api.go

@@ -49,6 +49,7 @@ func New(
 	allowCustomTracer bool,
 	enableReqLogger bool,
 	enableMetrics bool,
+	logsLimit uint64,
 ) (http.HandlerFunc, func()) {
 	origins := strings.Split(strings.TrimSpace(allowedOrigins), ",")
 	for i, o := range origins {
@@ -72,9 +73,9 @@ func New(
 		Mount(router, "/accounts")
 
 	if !skipLogs {
-		events.New(repo, logDB).
+		events.New(repo, logDB, logsLimit).
 			Mount(router, "/logs/event")
-		transfers.New(repo, logDB).
+		transfers.New(repo, logDB, logsLimit).
 			Mount(router, "/logs/transfer")
 	}
 	blocks.New(repo, bft).

api/events/events.go

@@ -17,14 +17,16 @@ import (
 )
 
 type Events struct {
-	repo *chain.Repository
-	db   *logdb.LogDB
+	repo  *chain.Repository
+	db    *logdb.LogDB
+	limit uint64
 }
 
-func New(repo *chain.Repository, db *logdb.LogDB) *Events {
+func New(repo *chain.Repository, db *logdb.LogDB, logsLimit uint64) *Events {
 	return &Events{
 		repo,
 		db,
+		logsLimit,
 	}
 }
 
@@ -51,6 +53,16 @@ func (e *Events) handleFilter(w http.ResponseWriter, req *http.Request) error {
 	if err := utils.ParseJSON(req.Body, &filter); err != nil {
 		return utils.BadRequest(errors.WithMessage(err, "body"))
 	}
+	if filter.Options != nil && filter.Options.Limit > e.limit {
+		return utils.Forbidden(errors.New("options.limit exceeds the maximum allowed value"))
+	}
+	if filter.Options == nil {
+		filter.Options = &logdb.Options{
+			Offset: 0,
+			Limit:  e.limit,
+		}
+	}
+
 	fes, err := e.filter(req.Context(), &filter)
 	if err != nil {
 		return err

api/events/events_test.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/gorilla/mux"
@@ -26,6 +27,8 @@ import (
 	"github.com/vechain/thor/v2/tx"
 )
 
+const defaultLogLimit uint64 = 1000
+
 var ts *httptest.Server
 
 var (
@@ -35,7 +38,7 @@ var (
 
 func TestEmptyEvents(t *testing.T) {
 	db := createDb(t)
-	initEventServer(t, db)
+	initEventServer(t, db, defaultLogLimit)
 	defer ts.Close()
 
 	testEventsBadRequest(t)
@@ -44,7 +47,7 @@ func TestEmptyEvents(t *testing.T) {
 
 func TestEvents(t *testing.T) {
 	db := createDb(t)
-	initEventServer(t, db)
+	initEventServer(t, db, defaultLogLimit)
 	defer ts.Close()
 
 	blocksToInsert := 5
@@ -53,6 +56,38 @@ func TestEvents(t *testing.T) {
 	testEventWithBlocks(t, blocksToInsert)
 }
 
+func TestOption(t *testing.T) {
+	db := createDb(t)
+	initEventServer(t, db, 5)
+	defer ts.Close()
+	insertBlocks(t, db, 10)
+
+	filter := events.EventFilter{
+		CriteriaSet: make([]*events.EventCriteria, 0),
+		Range:       nil,
+		Options:     &logdb.Options{Limit: 6},
+		Order:       logdb.DESC,
+	}
+
+	res, statusCode := httpPost(t, ts.URL+"/events", filter)
+	assert.Equal(t, "options.limit exceeds the maximum allowed value", strings.Trim(string(res), "\n"))
+	assert.Equal(t, http.StatusForbidden, statusCode)
+
+	filter.Options.Limit = 5
+	_, statusCode = httpPost(t, ts.URL+"/events", filter)
+	assert.Equal(t, http.StatusOK, statusCode)
+
+	// with nil options, should use default limit
+	filter.Options = nil
+	res, statusCode = httpPost(t, ts.URL+"/events", filter)
+	var tLogs []*events.FilteredEvent
+	if err := json.Unmarshal(res, &tLogs); err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, http.StatusOK, statusCode)
+	assert.Equal(t, 5, len(tLogs))
+}
+
 // Test functions
 func testEventsBadRequest(t *testing.T) {
 	badBody := []byte{0x00, 0x01, 0x02}
@@ -128,7 +163,7 @@ func testEventWithBlocks(t *testing.T, expectedBlocks int) {
 }
 
 // Init functions
-func initEventServer(t *testing.T, logDb *logdb.LogDB) {
+func initEventServer(t *testing.T, logDb *logdb.LogDB, limit uint64) {
 	router := mux.NewRouter()
 
 	muxDb := muxdb.NewMem()
@@ -142,7 +177,7 @@ func initEventServer(t *testing.T, logDb *logdb.LogDB) {
 
 	repo, _ := chain.NewRepository(muxDb, b)
 
-	events.New(repo, logDb).Mount(router, "/events")
+	events.New(repo, logDb, limit).Mount(router, "/events")
 	ts = httptest.NewServer(router)
 }
 

api/transfers/transfers.go

@@ -18,14 +18,16 @@ import (
 )
 
 type Transfers struct {
-	repo *chain.Repository
-	db   *logdb.LogDB
+	repo  *chain.Repository
+	db    *logdb.LogDB
+	limit uint64
 }
 
-func New(repo *chain.Repository, db *logdb.LogDB) *Transfers {
+func New(repo *chain.Repository, db *logdb.LogDB, logsLimit uint64) *Transfers {
 	return &Transfers{
 		repo,
 		db,
+		logsLimit,
 	}
 }
 
@@ -57,6 +59,16 @@ func (t *Transfers) handleFilterTransferLogs(w http.ResponseWriter, req *http.Re
 	if err := utils.ParseJSON(req.Body, &filter); err != nil {
 		return utils.BadRequest(errors.WithMessage(err, "body"))
 	}
+	if filter.Options != nil && filter.Options.Limit > t.limit {
+		return utils.Forbidden(errors.New("options.limit exceeds the maximum allowed value"))
+	}
+	if filter.Options == nil {
+		filter.Options = &logdb.Options{
+			Offset: 0,
+			Limit:  t.limit,
+		}
+	}
+
 	tLogs, err := t.filter(req.Context(), &filter)
 	if err != nil {
 		return err

api/transfers/transfers_test.go

@@ -13,10 +13,12 @@ import (
 	"math/big"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
+	"github.com/vechain/thor/v2/api/events"
 	"github.com/vechain/thor/v2/api/transfers"
 	"github.com/vechain/thor/v2/block"
 	"github.com/vechain/thor/v2/chain"
@@ -28,11 +30,13 @@ import (
 	"github.com/vechain/thor/v2/tx"
 )
 
+const defaultLogLimit uint64 = 1000
+
 var ts *httptest.Server
 
 func TestEmptyTransfers(t *testing.T) {
 	db := createDb(t)
-	initTransferServer(t, db)
+	initTransferServer(t, db, defaultLogLimit)
 	defer ts.Close()
 
 	testTransferBadRequest(t)
@@ -41,7 +45,7 @@ func TestEmptyTransfers(t *testing.T) {
 
 func TestTransfers(t *testing.T) {
 	db := createDb(t)
-	initTransferServer(t, db)
+	initTransferServer(t, db, defaultLogLimit)
 	defer ts.Close()
 
 	blocksToInsert := 5
@@ -50,6 +54,38 @@ func TestTransfers(t *testing.T) {
 	testTransferWithBlocks(t, blocksToInsert)
 }
 
+func TestOption(t *testing.T) {
+	db := createDb(t)
+	initTransferServer(t, db, 5)
+	defer ts.Close()
+	insertBlocks(t, db, 10)
+
+	filter := transfers.TransferFilter{
+		CriteriaSet: make([]*logdb.TransferCriteria, 0),
+		Range:       nil,
+		Options:     &logdb.Options{Limit: 6},
+		Order:       logdb.DESC,
+	}
+
+	res, statusCode := httpPost(t, ts.URL+"/transfers", filter)
+	assert.Equal(t, "options.limit exceeds the maximum allowed value", strings.Trim(string(res), "\n"))
+	assert.Equal(t, http.StatusForbidden, statusCode)
+
+	filter.Options.Limit = 5
+	_, statusCode = httpPost(t, ts.URL+"/transfers", filter)
+	assert.Equal(t, http.StatusOK, statusCode)
+
+	// with nil options, should use default limit
+	filter.Options = nil
+	res, statusCode = httpPost(t, ts.URL+"/transfers", filter)
+	var tLogs []*events.FilteredEvent
+	if err := json.Unmarshal(res, &tLogs); err != nil {
+		t.Fatal(err)
+	}
+	assert.Equal(t, http.StatusOK, statusCode)
+	assert.Equal(t, 5, len(tLogs))
+}
+
 // Test functions
 func testTransferBadRequest(t *testing.T) {
 	badBody := []byte{0x00, 0x01, 0x02}
@@ -119,7 +155,7 @@ func insertBlocks(t *testing.T, db *logdb.LogDB, n int) {
 	}
 }
 
-func initTransferServer(t *testing.T, logDb *logdb.LogDB) {
+func initTransferServer(t *testing.T, logDb *logdb.LogDB, limit uint64) {
 	router := mux.NewRouter()
 
 	muxDb := muxdb.NewMem()
@@ -133,7 +169,7 @@ func initTransferServer(t *testing.T, logDb *logdb.LogDB) {
 
 	repo, _ := chain.NewRepository(muxDb, b)
 
-	transfers.New(repo, logDb).Mount(router, "/transfers")
+	transfers.New(repo, logDb, limit).Mount(router, "/transfers")
 	ts = httptest.NewServer(router)
 }