Enable extra default linters for our code

- enable errcheck
- enable staticcheck
- only scans plugin directory and _ext.go files
- fix lint errors

.golangci.yml

@@ -4,13 +4,16 @@ run:
   timeout: 10m
 
 linters:
-  disable-all: true
   enable:
     - goimports
-    - gosimple
-    - govet
     - ineffassign
     - misspell
     - unconvert
-    - unused
     - whitespace
+
+issues:
+  exclude-rules:
+    - path-except: "(plugin\\/.+\\.go|.+_ext\\.go)"
+      linters:
+        - errcheck
+        - staticcheck

plugin/evm/atomic/export_tx.go

@@ -133,16 +133,16 @@ func (utx *UnsignedExportTx) Verify(
 func (utx *UnsignedExportTx) GasUsed(fixedFee bool) (uint64, error) {
 	byteCost := calcBytesCost(len(utx.Bytes()))
 	numSigs := uint64(len(utx.Ins))
-	sigCost, err := math.Mul64(numSigs, secp256k1fx.CostPerSignature)
+	sigCost, err := math.Mul(numSigs, secp256k1fx.CostPerSignature)
 	if err != nil {
 		return 0, err
 	}
-	cost, err := math.Add64(byteCost, sigCost)
+	cost, err := math.Add(byteCost, sigCost)
 	if err != nil {
 		return 0, err
 	}
 	if fixedFee {
-		cost, err = math.Add64(cost, params.AtomicTxBaseCost)
+		cost, err = math.Add(cost, params.AtomicTxBaseCost)
 		if err != nil {
 			return 0, err
 		}
@@ -160,15 +160,15 @@ func (utx *UnsignedExportTx) Burned(assetID ids.ID) (uint64, error) {
 	)
 	for _, out := range utx.ExportedOutputs {
 		if out.AssetID() == assetID {
-			spent, err = math.Add64(spent, out.Output().Amount())
+			spent, err = math.Add(spent, out.Output().Amount())
 			if err != nil {
 				return 0, err
 			}
 		}
 	}
 	for _, in := range utx.Ins {
 		if in.AssetID == assetID {
-			input, err = math.Add64(input, in.Amount)
+			input, err = math.Add(input, in.Amount)
 			if err != nil {
 				return 0, err
 			}
@@ -346,7 +346,7 @@ func NewExportTx(
 		avaxIns, avaxSigners, err = GetSpendableAVAXWithFee(ctx, state, keys, avaxNeeded, cost, baseFee)
 	default:
 		var newAvaxNeeded uint64
-		newAvaxNeeded, err = math.Add64(avaxNeeded, params.AvalancheAtomicTxFee)
+		newAvaxNeeded, err = math.Add(avaxNeeded, params.AvalancheAtomicTxFee)
 		if err != nil {
 			return nil, errOverflowExport
 		}
@@ -486,7 +486,7 @@ func GetSpendableAVAXWithFee(
 		return nil, nil, err
 	}
 
-	newAmount, err := math.Add64(amount, initialFee)
+	newAmount, err := math.Add(amount, initialFee)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -527,7 +527,7 @@ func GetSpendableAVAXWithFee(
 		// Update the cost for the next iteration
 		cost = newCost
 
-		newAmount, err := math.Add64(amount, additionalFee)
+		newAmount, err := math.Add(amount, additionalFee)
 		if err != nil {
 			return nil, nil, err
 		}

plugin/evm/atomic/import_tx.go

@@ -144,13 +144,13 @@ func (utx *UnsignedImportTx) GasUsed(fixedFee bool) (uint64, error) {
 		if err != nil {
 			return 0, err
 		}
-		cost, err = math.Add64(cost, inCost)
+		cost, err = math.Add(cost, inCost)
 		if err != nil {
 			return 0, err
 		}
 	}
 	if fixedFee {
-		cost, err = math.Add64(cost, params.AtomicTxBaseCost)
+		cost, err = math.Add(cost, params.AtomicTxBaseCost)
 		if err != nil {
 			return 0, err
 		}
@@ -167,15 +167,15 @@ func (utx *UnsignedImportTx) Burned(assetID ids.ID) (uint64, error) {
 	)
 	for _, out := range utx.Outs {
 		if out.AssetID == assetID {
-			spent, err = math.Add64(spent, out.Amount)
+			spent, err = math.Add(spent, out.Amount)
 			if err != nil {
 				return 0, err
 			}
 		}
 	}
 	for _, in := range utx.ImportedInputs {
 		if in.AssetID() == assetID {
-			input, err = math.Add64(input, in.Input().Amount())
+			input, err = math.Add(input, in.Input().Amount())
 			if err != nil {
 				return 0, err
 			}
@@ -311,7 +311,7 @@ func NewImportTx(
 			continue
 		}
 		aid := utxo.AssetID()
-		importedAmount[aid], err = math.Add64(importedAmount[aid], input.Amount())
+		importedAmount[aid], err = math.Add(importedAmount[aid], input.Amount())
 		if err != nil {
 			return nil, err
 		}

plugin/evm/atomic_syncer_test.go

@@ -7,10 +7,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"math/rand"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/memdb"
@@ -80,7 +80,9 @@ func testAtomicSyncer(t *testing.T, serverTrieDB *triedb.Database, targetHeight
 			return leafsResponse, nil
 		}
 
-		syncer.Start(ctx)
+		err = syncer.Start(ctx)
+		require.NoError(t, err)
+
 		if err := <-syncer.Done(); err == nil {
 			t.Fatalf("Expected syncer to fail at checkpoint with numLeaves %d", numLeaves)
 		}
@@ -104,7 +106,9 @@ func testAtomicSyncer(t *testing.T, serverTrieDB *triedb.Database, targetHeight
 		return leafsResponse, nil
 	}
 
-	syncer.Start(ctx)
+	err = syncer.Start(ctx)
+	require.NoError(t, err)
+
 	if err := <-syncer.Done(); err != nil {
 		t.Fatalf("Expected syncer to finish successfully but failed due to %s", err)
 	}
@@ -153,7 +157,6 @@ func testAtomicSyncer(t *testing.T, serverTrieDB *triedb.Database, targetHeight
 }
 
 func TestAtomicSyncer(t *testing.T) {
-	rand.Seed(1)
 	targetHeight := 10 * uint64(commitInterval)
 	serverTrieDB := triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil)
 	root, _, _ := syncutils.GenerateTrie(t, serverTrieDB, int(targetHeight), atomicKeyLength)
@@ -162,7 +165,6 @@ func TestAtomicSyncer(t *testing.T) {
 }
 
 func TestAtomicSyncerResume(t *testing.T) {
-	rand.Seed(1)
 	targetHeight := 10 * uint64(commitInterval)
 	serverTrieDB := triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil)
 	numTrieKeys := int(targetHeight) - 1 // no atomic ops for genesis
@@ -179,7 +181,6 @@ func TestAtomicSyncerResume(t *testing.T) {
 }
 
 func TestAtomicSyncerResumeNewRootCheckpoint(t *testing.T) {
-	rand.Seed(1)
 	targetHeight1 := 10 * uint64(commitInterval)
 	serverTrieDB := triedb.NewDatabase(rawdb.NewMemoryDatabase(), nil)
 	numTrieKeys1 := int(targetHeight1) - 1 // no atomic ops for genesis

plugin/evm/atomic_trie.go

@@ -327,7 +327,11 @@ func (a *atomicTrie) InsertTrie(nodes *trienode.NodeSet, root common.Hash) error
 			return err
 		}
 	}
-	a.trieDB.Reference(root, common.Hash{})
+
+	err := a.trieDB.Reference(root, common.Hash{})
+	if err != nil {
+		return fmt.Errorf("referencing root: %w", err)
+	}
 
 	// The use of [Cap] in [insertTrie] prevents exceeding the configured memory
 	// limit (and OOM) in case there is a large backlog of processing (unaccepted) blocks.
@@ -358,7 +362,10 @@ func (a *atomicTrie) AcceptTrie(height uint64, root common.Hash) (bool, error) {
 	//
 	// Note: It is safe to dereference roots that have been committed to disk
 	// (they are no-ops).
-	a.tipBuffer.Insert(root)
+	err := a.tipBuffer.Insert(root)
+	if err != nil {
+		return hasCommitted, fmt.Errorf("inserting root in tip buffer: %w", err)
+	}
 
 	// Commit this root if we have reached the [commitInterval].
 	if height%a.commitInterval == 0 {
@@ -373,6 +380,9 @@ func (a *atomicTrie) AcceptTrie(height uint64, root common.Hash) (bool, error) {
 }
 
 func (a *atomicTrie) RejectTrie(root common.Hash) error {
-	a.trieDB.Dereference(root)
+	err := a.trieDB.Dereference(root)
+	if err != nil {
+		return fmt.Errorf("dereferencing root from trie database: %w", err)
+	}
 	return nil
 }

plugin/evm/atomic_trie_test.go

@@ -381,8 +381,6 @@ func TestIndexingNilShouldNotImpactTrie(t *testing.T) {
 			if err := indexAtomicTxs(a1, i, ops[i]); err != nil {
 				t.Fatal(err)
 			}
-		} else {
-			// do nothing
 		}
 	}
 
@@ -569,7 +567,7 @@ func TestApplyToSharedMemory(t *testing.T) {
 			assert.NoError(t, err)
 			assert.False(t, hasMarker)
 			// reinitialize the atomic trie
-			backend, err = NewAtomicBackend(
+			_, err = NewAtomicBackend(
 				db, sharedMemories.thisChain, nil, repo, test.lastAcceptedHeight, common.Hash{}, test.commitInterval,
 			)
 			assert.NoError(t, err)

plugin/evm/block_verification.go

@@ -242,7 +242,7 @@ func (v blockValidator) SyntacticVerify(b *Block, rules params.Rules) error {
 			if err != nil {
 				return err
 			}
-			totalGasUsed, err = safemath.Add64(totalGasUsed, gasUsed)
+			totalGasUsed, err = safemath.Add(totalGasUsed, gasUsed)
 			if err != nil {
 				return err
 			}

plugin/evm/export_tx_test.go

@@ -1704,7 +1704,6 @@ func TestNewExportTx(t *testing.T) {
 				}
 			}()
 
-			parent := vm.LastAcceptedBlockInternal().(*Block)
 			importAmount := uint64(50000000)
 			utxoID := avax.UTXOID{TxID: ids.GenerateTestID()}
 
@@ -1764,7 +1763,7 @@ func TestNewExportTx(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			parent = vm.LastAcceptedBlockInternal().(*Block)
+			parent := vm.LastAcceptedBlockInternal().(*Block)
 			exportAmount := uint64(5000000)
 
 			state, err := vm.blockChain.State()
@@ -1877,7 +1876,6 @@ func TestNewExportTxMulticoin(t *testing.T) {
 				}
 			}()
 
-			parent := vm.LastAcceptedBlockInternal().(*Block)
 			importAmount := uint64(50000000)
 			utxoID := avax.UTXOID{TxID: ids.GenerateTestID()}
 
@@ -1967,7 +1965,7 @@ func TestNewExportTxMulticoin(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			parent = vm.LastAcceptedBlockInternal().(*Block)
+			parent := vm.LastAcceptedBlockInternal().(*Block)
 			exportAmount := uint64(5000000)
 
 			testKeys0Addr := testKeys[0].EthAddress()

plugin/evm/gossiper_atomic_gossiping_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/ava-labs/avalanchego/proto/pb/sdk"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 
 	commonEng "github.com/ava-labs/avalanchego/snow/engine/common"
@@ -147,7 +148,9 @@ func TestMempoolAtmTxsAppGossipHandlingDiscardedTx(t *testing.T) {
 	tx, conflictingTx := importTxs[0], importTxs[1]
 	txID := tx.ID()
 
-	mempool.AddRemoteTx(tx)
+	err := mempool.AddRemoteTx(tx)
+	require.NoError(t, err)
+
 	mempool.NextTx()
 	mempool.DiscardCurrentTx(txID)
 
@@ -184,7 +187,9 @@ func TestMempoolAtmTxsAppGossipHandlingDiscardedTx(t *testing.T) {
 	// Conflicting tx must be submitted over the API to be included in push gossip.
 	// (i.e., txs received via p2p are not included in push gossip)
 	// This test adds it directly to the mempool + gossiper to simulate that.
-	vm.mempool.AddRemoteTx(conflictingTx)
+	err = vm.mempool.AddRemoteTx(conflictingTx)
+	require.NoError(t, err)
+
 	vm.atomicTxPushGossiper.Add(&atomic.GossipAtomicTx{Tx: conflictingTx})
 	time.Sleep(500 * time.Millisecond)
 

plugin/evm/message/block_request_test.go

@@ -5,7 +5,6 @@ package message
 
 import (
 	"encoding/base64"
-	"math/rand"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -38,15 +37,39 @@ func TestMarshalBlockRequest(t *testing.T) {
 // TestMarshalBlockResponse asserts that the structure or serialization logic hasn't changed, primarily to
 // ensure compatibility with the network.
 func TestMarshalBlockResponse(t *testing.T) {
-	// create some random bytes
-	// set seed to ensure deterministic random behaviour
-	rand.Seed(1)
-	blocksBytes := make([][]byte, 32)
-	for i := range blocksBytes {
-		blocksBytes[i] = make([]byte, rand.Intn(32)+32) // min 32 length, max 64
-		_, err := rand.Read(blocksBytes[i])
-		assert.NoError(t, err)
-	}
+	blocksBytes := [][]byte{
+		[]byte{0x4f, 0x16, 0x3f, 0x5f, 0xf, 0x9a, 0x62, 0x1d, 0x72, 0x95, 0x66, 0xc7, 0x4d, 0x10, 0x3, 0x7c, 0x4d, 0x7b, 0xbb, 0x4, 0x7, 0xd1, 0xe2, 0xc6, 0x49, 0x81, 0x85, 0x5a, 0xd8, 0x68, 0x1d, 0xd, 0x86},
+		[]byte{0xd1, 0xe9, 0x94, 0xd2, 0xc4, 0x22, 0xac, 0xd2, 0x8, 0xa0, 0x7, 0x29, 0x39, 0x48, 0x7f, 0x69, 0x99, 0xeb, 0x9d, 0x18, 0xa4, 0x47, 0x84, 0x4, 0x5d, 0x87, 0xf3, 0xc6, 0x7c, 0xf2, 0x27, 0x46, 0xe9, 0x95, 0xaf, 0x5a, 0x25, 0x36, 0x79, 0x51, 0xba, 0xa2, 0xff, 0x6c, 0xd4, 0x71, 0xc4, 0x83, 0xf1, 0x5f, 0xb9, 0xb, 0xad, 0xb3, 0x7c, 0x58, 0x21},
+		[]byte{0xb6, 0x68, 0xb, 0x4e, 0x7c, 0x8b, 0x76, 0x3a, 0x1b, 0x1d, 0x49, 0xd4, 0x95, 0x5c, 0x84, 0x86, 0x21, 0x63, 0x25, 0x25, 0x3f, 0xec, 0x73, 0x8d, 0xd7, 0xa9, 0xe2, 0x8b, 0xf9, 0x21, 0x11, 0x9c, 0x16, 0xf, 0x7, 0x2, 0x44, 0x86, 0x15, 0xbb, 0xda, 0x8, 0x31, 0x3f, 0x6a, 0x8e, 0xb6, 0x68, 0xd2, 0xb, 0xf5, 0x5, 0x98, 0x75, 0x92, 0x1e, 0x66, 0x8a},
+		[]byte{0x5b, 0xdf, 0x2c, 0x7f, 0xc4, 0x84, 0x68, 0xd2, 0xd6, 0xc5, 0x2f, 0x50, 0x54, 0xe2, 0xd0, 0x83, 0x6b, 0xf8, 0x4c, 0x71, 0x74, 0xcb, 0x74, 0x76, 0x36, 0x4c, 0xc3, 0xdb, 0xd9, 0x68, 0xb0, 0xf7, 0x17, 0x2e, 0xd8, 0x57, 0x94, 0xbb, 0x35, 0x8b, 0xc, 0x3b, 0x52},
+		[]byte{0x5d, 0xa1, 0x78, 0x6f, 0x9f, 0xeb, 0xd7, 0xa1, 0x9d, 0xf, 0x7b, 0xba, 0xcb, 0xe0, 0x25, 0x5a, 0xa5, 0xb7, 0xd4, 0x4b, 0xec, 0x40, 0xf8, 0x4c, 0x89, 0x2b, 0x9b, 0xff, 0xd4, 0x36, 0x29, 0xb0, 0x22, 0x3b, 0xee, 0xa5, 0xf4, 0xf7, 0x43, 0x91, 0xf4, 0x45, 0xd1, 0x5a, 0xfd, 0x42, 0x94, 0x4, 0x3, 0x74, 0xf6, 0x92, 0x4b, 0x98, 0xcb, 0xf8, 0x71, 0x3f, 0x8d},
+		[]byte{0x96, 0x2d, 0x24, 0xe2, 0xca, 0xfc, 0xca, 0xe3, 0xa6, 0x1f, 0xb5, 0x86, 0xb1, 0x43, 0x23, 0xa6, 0xbc, 0x8f, 0x9e, 0x7d, 0xf1, 0xd9, 0x29, 0x33, 0x3f, 0xf9, 0x93, 0x93, 0x3b, 0xea, 0x6f, 0x5b, 0x3a, 0xf6, 0xde, 0x3, 0x74, 0x36, 0x6c, 0x47, 0x19, 0xe4, 0x3a, 0x1b, 0x6, 0x7d, 0x89, 0xbc, 0x7f, 0x1},
+		[]byte{0xf1, 0xf1, 0x7a, 0x4c, 0x72, 0x15, 0xa3, 0xb5, 0x39, 0xeb, 0x1e, 0x58, 0x49, 0xc6, 0x7, 0x7d, 0xbb, 0x57, 0x22, 0xf5, 0x71, 0x7a, 0x28, 0x9a, 0x26, 0x6f, 0x97, 0x64, 0x79, 0x81, 0x99, 0x8e, 0xbe, 0xa8, 0x9c, 0xb, 0x4b, 0x37, 0x39, 0x70, 0x11, 0x5e, 0x82, 0xed, 0x6f, 0x41, 0x25, 0xc8, 0xfa, 0x73, 0x11, 0xe4, 0xd7, 0xde, 0xfa, 0x92, 0x2d},
+		[]byte{0x36, 0xcd, 0x4f, 0x24, 0xab, 0xf7, 0xdf, 0x86, 0x6b, 0xaa, 0x56, 0x3, 0x83, 0x67, 0xad, 0x61, 0x45, 0xde, 0x1e, 0xe8, 0xf4, 0xa8, 0xb0, 0x99, 0x3e, 0xbd, 0xf8, 0x88, 0x3a, 0xa, 0xd8, 0xbe, 0x9c, 0x39, 0x78, 0xb0, 0x48, 0x83, 0xe5},
+		[]byte{0x6a, 0x15, 0x6a, 0x9d, 0xec, 0x6a, 0x40, 0xe9, 0xa1, 0xd0, 0x7, 0xf0, 0x33, 0xc2, 0x82, 0x30, 0x61, 0xbd, 0xd0, 0xea, 0xa5, 0x9f, 0x8e, 0x4d, 0xa6, 0x43, 0x1, 0x5, 0x22, 0xd, 0xb, 0x29, 0x68, 0x8b, 0x73, 0x4b},
+		[]byte{0x8e, 0xa0, 0x10, 0xd7, 0x7c, 0x96, 0xea, 0x80, 0xa7, 0xa6, 0x65, 0xf6, 0x6, 0xf6, 0xa6, 0x3b, 0x7f, 0x3d, 0xfd, 0x25, 0x67, 0xc1, 0x89, 0x79, 0xe4, 0xd6, 0xf, 0x26, 0x68, 0x6d, 0x9b, 0xf2, 0xfb, 0x26, 0xc9, 0x1, 0xff, 0x35, 0x4c, 0xde},
+		[]byte{0x16, 0x7, 0xee, 0x29, 0xba, 0x64, 0xf8, 0x4a, 0xb4, 0x3c, 0xa0, 0xc6, 0xe6, 0xb9, 0x1c, 0x1f, 0xd3, 0xbe, 0x89, 0x90, 0x43, 0x41, 0x79, 0xd3, 0xaf, 0x44, 0x91, 0xa3, 0x69, 0x1, 0x2d, 0xb9, 0x2d, 0x18, 0x4f, 0xc3, 0x9d, 0x17, 0x34, 0xff, 0x57, 0x16, 0x42, 0x89, 0x53, 0xbb, 0x68, 0x65, 0xfc, 0xf9, 0x2b, 0xc, 0x3a, 0x17, 0xc9, 0x2, 0x8b, 0xe9, 0x91, 0x4e},
+		[]byte{0x9, 0x79, 0xd1, 0x83, 0x3, 0x56, 0xf2, 0xa5, 0x4c, 0x3d, 0xea, 0xb2, 0xa4, 0xb4, 0x47, 0x5d, 0x63, 0xaf, 0xbe, 0x8f, 0xb5, 0x69, 0x87, 0xc7, 0x7f, 0x58, 0x18, 0x52, 0x6f, 0x18, 0x14, 0xbe, 0x82, 0x33, 0x50, 0xea, 0xb1, 0x39, 0x35, 0xf3, 0x1d, 0x84, 0x48, 0x45, 0x17, 0xe9, 0x24, 0xae, 0xf7, 0x8a, 0xe1},
+		[]byte{0x51, 0xc0, 0x7, 0x55, 0x92, 0xc, 0x30, 0xec, 0x29, 0xa3, 0x70, 0x39, 0x34, 0xbf, 0x50, 0xa2, 0x8d, 0xa1, 0x2, 0x97, 0x5d, 0xed, 0xa7, 0x7e, 0x75, 0x85, 0x79, 0xea, 0x3d, 0xfe, 0x41, 0x36, 0xab, 0xf7, 0x52, 0xb3, 0xb8, 0x27, 0x1d, 0x3, 0xe9, 0x44, 0xb3, 0xc9, 0xdb, 0x36, 0x6b, 0x75, 0x4, 0x5f, 0x8e, 0xfd, 0x69, 0xd2, 0x2a, 0xe5},
+		[]byte{0x41, 0x19, 0x47, 0xcb, 0x55, 0xbc, 0xea, 0x40, 0x6b, 0x32, 0xd6, 0x10, 0x8b, 0xd6, 0x85, 0x84, 0xf5, 0x7e, 0x37, 0xca, 0xac, 0x6e, 0x33, 0xfe, 0xaa, 0x32, 0x63, 0xa3, 0x99, 0x43, 0x70, 0x24, 0xba, 0x9c, 0x9b, 0x14, 0x67, 0x8a, 0x27, 0x4f, 0x1, 0xa9, 0x10, 0xae, 0x29, 0x5f, 0x6e, 0xfb, 0xfe, 0x5f, 0x5a, 0xbf, 0x44, 0xcc, 0xde, 0x26, 0x3b, 0x56},
+		[]byte{0x6, 0x63, 0x3e, 0x7d, 0x39, 0x6, 0x9f, 0x1, 0xa2, 0x39, 0xc4, 0x36, 0x58, 0x54, 0xc3, 0xaf, 0x7f, 0x6b, 0x41, 0xd6, 0x31, 0xf9, 0x2b, 0x9a, 0x8d, 0x12, 0xf4, 0x12, 0x57, 0x32, 0x5f, 0xff, 0x33, 0x2f, 0x75, 0x76, 0xb0, 0x62, 0x5, 0x56},
+		[]byte{0x30, 0x4a, 0x3e, 0x3e, 0xae, 0x90, 0x1a, 0x52, 0x72, 0xd, 0xa8, 0x5c, 0xa1, 0xe4, 0xb3, 0x8e, 0xaf, 0x3f, 0x44, 0xc6, 0xc6, 0xef, 0x83, 0x62, 0xf2, 0xf5, 0x4f, 0xc0, 0xe, 0x9, 0xd6, 0xfc, 0x25, 0x64, 0x8, 0x54, 0xc1, 0x5d, 0xfc, 0xac, 0xaa, 0x8a},
+		[]byte{0x2c, 0xec, 0xce, 0x5a, 0x3a, 0x94, 0xb4, 0xd3, 0x38, 0xa5, 0x14, 0x3e, 0x63, 0x40, 0x8d, 0x87, 0x24, 0xb0, 0xcf, 0x3f, 0xae, 0x17, 0xa3, 0xf7, 0x9b, 0xe1, 0x7, 0x2f, 0xb6, 0x3c, 0x35, 0xd6, 0x4, 0x2c, 0x41, 0x60, 0xf3, 0x8e, 0xe9, 0xe2, 0xa9, 0xf3, 0xfb, 0x4f, 0xfb, 0x0, 0x19, 0xb4, 0x54, 0xd5, 0x22, 0xb5, 0xff, 0xa1, 0x76, 0x4, 0x19, 0x3f, 0xb8},
+		[]byte{0x96, 0x67, 0xcf, 0x53, 0xc3, 0xf5, 0x20, 0xc8, 0x89, 0xb7, 0x9b, 0xf5, 0x4, 0xcf, 0xb5, 0x7c, 0x76, 0x1, 0x23, 0x2d, 0x58, 0x9b, 0xac, 0xce, 0xa9, 0xd6, 0xe2, 0x63, 0xe2, 0x5c, 0x27, 0x74, 0x1d, 0x3f, 0x6c, 0x62, 0xcb, 0xbb, 0x15, 0xd9, 0xaf, 0xbc, 0xbf, 0x7f, 0x7d, 0xa4, 0x1a, 0xb0, 0x40, 0x8e},
+		[]byte{0x39, 0x38, 0xbf, 0x17, 0x74, 0xac, 0xe7, 0x70, 0x9a, 0x4f, 0x9, 0x1e, 0x9a, 0x83, 0xfd, 0xea, 0xe0, 0xec, 0x55, 0xeb, 0x23, 0x3a, 0x9b, 0x53, 0x94, 0xcb, 0x3c, 0x78, 0x56, 0xb5, 0x46, 0xd3, 0x13, 0xc8, 0xa3, 0xb4, 0xc1, 0xc0, 0xe0, 0x54, 0x47, 0xf4, 0xba, 0x37, 0xe, 0xb3, 0x6d},
+		[]byte{0xbc, 0xfd, 0xec, 0xf5, 0x22, 0xe2, 0xa6, 0xf1, 0xed, 0xa, 0xfe, 0xc1, 0xf8, 0xe2, 0xf, 0xaa, 0xbe, 0xdf, 0x6b, 0x16, 0x2e, 0x71, 0x7d, 0x3a, 0x74, 0x8a, 0x58, 0x67, 0x7a, 0xc, 0x56, 0x34, 0x8f, 0x89, 0x21, 0xa2, 0x66, 0xb1, 0x1d, 0xf, 0x33, 0x4c, 0x62, 0xfe, 0x52, 0xba, 0x53, 0xaf, 0x19, 0x77, 0x9c, 0xb2, 0x94, 0x8b, 0x65, 0x70, 0xff, 0xa0, 0xb7, 0x73},
+		[]byte{0x96, 0x3c, 0x13, 0xa, 0xd7, 0x97, 0x51, 0x25, 0x21, 0xf, 0xe, 0xf1, 0xc3, 0x14, 0x9, 0xf, 0x7, 0xc7, 0x9a, 0x6f, 0x57, 0x1c, 0x24, 0x6f, 0x3e, 0x9a, 0xc0, 0xb7, 0x41, 0x3e, 0xf1, 0x10, 0xbd, 0x58, 0xb0, 0xc, 0xe7, 0x3b, 0xff, 0x70, 0x6f, 0x7f, 0xf4, 0xb6, 0xf4, 0x40, 0x90, 0xa3, 0x27, 0x11, 0xf3, 0x20, 0x8e, 0x4e, 0x4b, 0x89, 0xcb, 0x51},
+		[]byte{0x65, 0xce, 0x64, 0x0, 0x3d, 0xf2, 0x46, 0x89, 0x28, 0xd5, 0xa2, 0x3b, 0x9c, 0xa7, 0x40, 0xf8, 0xc, 0x93, 0x82, 0xd9, 0xc6, 0x3, 0x4a, 0xd2, 0x96, 0xc, 0x79, 0x65, 0x3, 0xe1, 0xce, 0x22, 0x17, 0x25, 0xf5, 0xc, 0xaf, 0x1f, 0xbf},
+		[]byte{0x5c, 0x47, 0xa5, 0x3d, 0xbf, 0x8e, 0x7d, 0xca, 0xfc, 0x9e, 0x13, 0x86, 0x47, 0xa4, 0xb4, 0x4e, 0xd4, 0xbc, 0xe9, 0x64, 0xed, 0x47, 0xf7, 0x4a, 0xa5, 0x94, 0x46, 0x8c, 0xed, 0x32, 0x3c, 0xb7, 0x6f, 0xd, 0x3f, 0xac, 0x47, 0x6c, 0x9f, 0xb0, 0x3f, 0xc9, 0x22, 0x8f, 0xba, 0xe8, 0x8f, 0xd5, 0x80, 0x66, 0x3a, 0x4, 0x54, 0xb6, 0x83, 0x12, 0x20, 0x7f, 0xa},
+		[]byte{0x3b, 0x58, 0x4c, 0x62, 0xd5, 0x2, 0x7c, 0xe1, 0x5a, 0x4f, 0xa, 0x58, 0x25, 0xd, 0x8f, 0xb5, 0xe, 0x77, 0xf2, 0xbf, 0x4f, 0x1, 0x52, 0xe5, 0xd4, 0x94, 0x35, 0x80, 0x7f, 0x9d, 0x4b, 0x97, 0xbe, 0x6f, 0xb7, 0x79, 0x70, 0x46, 0x6a, 0x56, 0x26, 0xfe, 0x33, 0x40, 0x8c, 0xf9, 0xe8, 0x8e, 0x2c, 0x79, 0x74, 0x8, 0xa3, 0x2d, 0x29},
+		[]byte{0x41, 0x6b, 0xaf, 0x20, 0x6a, 0x98, 0x32, 0x9, 0x82, 0xc8, 0x5a, 0xad, 0x70, 0x38, 0x48, 0x59, 0xc0, 0x5a, 0x4b, 0x13, 0xa1, 0xd5, 0xb2, 0xf5, 0xbf, 0xef, 0x5a, 0x6e, 0xd9, 0x2d, 0xa4, 0x82, 0xca, 0xa9, 0x56, 0x8e, 0x5b, 0x6f, 0xe9, 0xd8, 0xa9, 0xdd},
+		[]byte{0xd9, 0xeb, 0x9, 0x27, 0x7b, 0x50, 0x9, 0x44, 0xcb, 0xe8, 0x0, 0xa0, 0xb1, 0x52, 0x7e, 0xa6, 0x47, 0x29, 0xa8, 0x61, 0xd2, 0xf6, 0x49, 0x7a, 0x32, 0x35, 0xc3, 0x7f, 0x41, 0x92, 0x77, 0x9e, 0xc1, 0xd9, 0x6b, 0x3b, 0x1c, 0x54, 0x24, 0xfc, 0xe0, 0xb7, 0x27, 0xb0, 0x30, 0x72},
+		[]byte{0xe6, 0x40, 0xab, 0xc9, 0x44, 0x8f, 0xdd, 0xeb, 0x21, 0x91, 0xd9, 0x45, 0xc0, 0x47, 0x67, 0xaf, 0x84, 0x7a, 0xfd, 0xe, 0xdb, 0x5d, 0x88, 0x57, 0xb7, 0x99, 0xac, 0xb1, 0x8e, 0x4a, 0xff, 0xab, 0xe3, 0x3, 0x7f},
+		[]byte{0xfe, 0xcc, 0x41, 0x6e, 0x73, 0x4d, 0x37, 0x3c, 0x5e, 0xbe, 0xbc, 0x9c, 0xdc, 0xc5, 0x95, 0xbc, 0xce, 0x3c, 0x7b, 0xd3, 0xd8, 0xdf, 0x93, 0xfa, 0xb7, 0xe1, 0x25, 0xdd, 0xeb, 0xaf, 0xe6, 0x5a, 0x31, 0xbd, 0x5d, 0x41, 0xe2, 0xd2, 0xce, 0x9c, 0x2b, 0x17, 0x89, 0x2f, 0xf, 0xea, 0x19},
+		[]byte{0x31, 0xa2, 0x90, 0xdc, 0xbf, 0xa6, 0x84, 0x6, 0xe8, 0x77, 0x7, 0x3f, 0xf0, 0x88, 0x34, 0xe1, 0x97, 0xa4, 0x3, 0x4a, 0xa4, 0x8a, 0xfa, 0x3f, 0x85, 0xb8, 0xa6, 0x27, 0x8, 0xca, 0xeb, 0xba, 0xc8, 0x80, 0xb5, 0xb8, 0x9b, 0x93, 0xda, 0x53, 0x81, 0x1, 0x64, 0x40, 0x21, 0x4, 0xe6, 0x48, 0xb6},
+		[]byte{0x22, 0x6a, 0x1b, 0xf, 0x31, 0x3a, 0x89, 0xdd, 0xfc, 0x45, 0x4c, 0x5f, 0x8f, 0x72, 0xac, 0x89, 0xb3, 0x8b, 0x19, 0xf5, 0x37, 0x84, 0xc1, 0x9e, 0x9b, 0xea, 0xc0, 0x3c, 0x87, 0x5a, 0x27, 0xdb, 0x2, 0x9d, 0xe3, 0x7a, 0xe3, 0x7a, 0x42, 0x31, 0x88, 0x13, 0x48, 0x76, 0x85, 0x92, 0x93, 0x59, 0xca, 0x8c, 0x5e, 0xb9, 0x4e},
+		[]byte{0x15, 0x2d, 0xc1, 0xaf, 0x42, 0xea, 0xb8, 0xe2, 0x92, 0x5c, 0x6d, 0xae, 0xe4, 0xde, 0x5e, 0xf9, 0xf9, 0xdc, 0xf0, 0x8d, 0xfc, 0xbd, 0x2, 0xb8, 0x8, 0x9, 0x39, 0x85, 0x85, 0x92, 0x8a, 0xf, 0x7d, 0xe5, 0xb, 0xe1, 0xa6, 0xdc, 0x1d, 0x57, 0x68, 0xe8, 0x53, 0x79, 0x88, 0xfd, 0xdc, 0xe5, 0x62, 0xe9, 0xb9, 0x48, 0xc9, 0x18, 0xbb, 0xa3, 0xe9, 0x33, 0xe5, 0xc4, 0x0},
+		[]byte{0xcd, 0xae, 0x77, 0xba, 0x1d, 0x25, 0x9b, 0x18, 0x8a, 0x4b, 0x21, 0xc8, 0x6f, 0xbc, 0x23, 0xd7, 0x28, 0xb4, 0x53, 0x47, 0xea, 0xda, 0x65, 0xa, 0xf2, 0x4c, 0x56, 0xd0, 0x80, 0xa, 0x86, 0x91, 0x33, 0x20, 0x88, 0xa8, 0x5, 0xbd, 0x55, 0xc4, 0x46, 0xe2, 0x5e, 0xb0, 0x75}}
 
 	blockResponse := BlockResponse{
 		Blocks: blocksBytes,