Implemented GetHeaderByNumber and GetHeaderByHash

e2e-polybft/e2e/bridge_test.go

@@ -74,12 +74,13 @@ func TestE2E_Bridge_RootchainTokensTransfers(t *testing.T) {
 		framework.WithBridge(),
 		framework.WithSecretsCallback(func(addrs []types.Address, tcc *framework.TestClusterConfig) {
 			for i := 0; i < len(addrs); i++ {
-				tcc.StakeAmounts = append(tcc.StakeAmounts, ethgo.Ether(10))
 				// premine receivers, so that they are able to do withdrawals
+				tcc.StakeAmounts = append(tcc.StakeAmounts, ethgo.Ether(10))
 			}
 
 			tcc.Premine = append(tcc.Premine, receivers...)
 		}))
+
 	defer cluster.Stop()
 
 	cluster.WaitForReady(t)
@@ -1345,6 +1346,7 @@ func TestE2E_Bridge_NonMintableERC20Token_WithPremine(t *testing.T) {
 		checkBalancesFn(types.Address(rewardWalletKey.Address()), bigZero, command.DefaultPremineBalance, true)
 
 		validatorsExpectedBalance := new(big.Int).Sub(command.DefaultPremineBalance, command.DefaultStake)
+
 		for _, server := range cluster.Servers {
 			validatorAccount, err := validatorHelper.GetAccountFromDir(server.DataDir())
 			require.NoError(t, err)

e2e-polybft/e2e/consensus_test.go

@@ -398,6 +398,7 @@ func TestE2E_Consensus_MintableERC20NativeToken(t *testing.T) {
 				config.Premine = append(config.Premine, fmt.Sprintf("%s:%d", addr, initValidatorsBalance))
 				config.StakeAmounts = append(config.StakeAmounts, new(big.Int).Set(initValidatorsBalance))
 				validatorsAddrs[i] = addr
+
 				initialTotalSupply.Add(initialTotalSupply, initValidatorsBalance)
 			}
 		}))

e2e-polybft/e2e/jsonrpc_test.go

@@ -195,6 +195,7 @@ func TestE2E_JsonRPC(t *testing.T) {
 			Value: newBalance,
 		})
 		require.NoError(t, err)
+
 		txPrice := gasPrice * estimatedGas
 		// subtract gasPrice * estimatedGas from the balance and transfer the rest to the other account
 		// in order to leave no funds on the account
@@ -413,11 +414,60 @@ func TestE2E_JsonRPC(t *testing.T) {
 		require.NotEqual(t, ethTxn.From, ethgo.ZeroAddress)
 	})
 
+	t.Run("eth_getHeaderByNumber", func(t *testing.T) {
+		key1, err := crypto.GenerateECDSAKey()
+		require.NoError(t, err)
+
+		txn := cluster.Transfer(t, senderKey, key1.Address(), one)
+		require.NoError(t, txn.Wait())
+		require.True(t, txn.Succeed())
+		txReceipt := txn.Receipt()
+
+		var header types.Header
+		err = jsonRPC.Call("eth_getHeaderByNumber", &header, ethgo.BlockNumber(txReceipt.BlockNumber))
+		require.NoError(t, err)
+
+		require.Equal(t, txReceipt.BlockNumber, header.Number)
+		require.Equal(t, txReceipt.BlockHash, header.Hash)
+	})
+
+	t.Run("eth_getHeaderByHash", func(t *testing.T) {
+		key1, err := crypto.GenerateECDSAKey()
+		require.NoError(t, err)
+
+		txn := cluster.Transfer(t, senderKey, key1.Address(), one)
+		require.NoError(t, txn.Wait())
+		require.True(t, txn.Succeed())
+		txReceipt := txn.Receipt()
+
+		var header types.Header
+		err = jsonRPC.Call("eth_getHeaderByHash", &header, txReceipt.BlockHash)
+		require.NoError(t, err)
+
+		require.Equal(t, txReceipt.BlockNumber, header.Number)
+		require.Equal(t, txReceipt.BlockHash, header.Hash)
+	})
+
+	t.Run("txpool_contentFrom", func(t *testing.T) {
+		key1, err := crypto.GenerateECDSAKey()
+		require.NoError(t, err)
+
+		txn := cluster.Transfer(t, senderKey, key1.Address(), one)
+		require.NoError(t, txn.Wait())
+		require.True(t, txn.Succeed())
+		txReceipt := txn.Receipt()
+
+		var contentFrom map[uint64]*ethgo.Transaction
+		err = jsonRPC.Call("txpool_contentFrom", &contentFrom, key1.Address())
+		require.NoError(t, err)
+
+		require.Equal(t, txReceipt.TransactionHash, contentFrom[txn.Txn().Nonce()].Hash)
+	})
+
 	t.Run("debug_traceTransaction", func(t *testing.T) {
 		key1, err := crypto.GenerateECDSAKey()
 		require.NoError(t, err)
 
-		// Test. We should be able to query the transaction by its hash
 		txn := cluster.Transfer(t, senderKey, key1.Address(), one)
 		require.NoError(t, txn.Wait())
 		require.True(t, txn.Succeed())

e2e-polybft/e2e/txpool_test.go

@@ -91,7 +91,9 @@ func TestE2E_TxPool_Transfer(t *testing.T) {
 			if err != nil {
 				return true
 			}
+
 			t.Logf("Balance %s %s", receiver, balance)
+
 			if balance.Uint64() != uint64(sendAmount) {
 				return false
 			}
@@ -295,6 +297,7 @@ func TestE2E_TxPool_BroadcastTransactions(t *testing.T) {
 		for _, srv := range cluster.Servers {
 			balance, err := srv.WaitForNonZeroBalance(ethgo.Address(recipient), time.Second*10)
 			assert.NoError(t, err)
+
 			if balance != nil && balance.BitLen() > 0 {
 				assert.Equal(t, sentAmount, balance)
 			} else {

e2e-polybft/property/property_test.go

@@ -109,8 +109,11 @@ func TestProperty_DropValidators(t *testing.T) {
 		// check that block production is stoped
 		currentBlock, err = activeValidator.JSONRPC().Eth().BlockNumber()
 		require.NoError(t, err)
+
 		oldBlockNumber := currentBlock
+
 		time.Sleep(2 * blockTime)
+
 		currentBlock, err = activeValidator.JSONRPC().Eth().BlockNumber()
 		require.NoError(t, err)
 		require.Equal(t, oldBlockNumber, currentBlock)

jsonrpc/codec_test.go

@@ -105,9 +105,11 @@ func TestBlockNumberOrHash_UnmarshalJSON(t *testing.T) {
 				assert.Error(t, err)
 			} else {
 				assert.NoError(t, err)
+
 				if tt.expectedBnh.BlockNumber != nil {
 					assert.Equal(t, *bnh.BlockNumber, *tt.expectedBnh.BlockNumber)
 				}
+
 				if tt.expectedBnh.BlockHash != nil {
 					assert.Equal(t, bnh.BlockHash.String(), tt.expectedBnh.BlockHash.String())
 				}

jsonrpc/dispatcher.go

@@ -212,6 +212,7 @@ func (d *Dispatcher) handleSubscribe(req Request, conn wsConn) (string, Error) {
 		if err != nil {
 			return "", NewInternalError(err.Error())
 		}
+
 		filterID = d.filterManager.NewLogFilter(logQuery, conn)
 	} else if subscribeMethod == "newPendingTransactions" {
 		filterID = d.filterManager.NewPendingTxFilter(conn)

jsonrpc/dispatcher_test.go

@@ -467,20 +467,24 @@ func TestDispatcherBatchRequest(t *testing.T) {
 			assert.Equal(t, c.err, resp.Error)
 		} else {
 			var batchResp []SuccessResponse
+
 			assert.NoError(t, expectBatchJSONResult(res, &batchResp))
 
 			if c.name == "leading-whitespace" {
 				assert.Len(t, batchResp, 4)
+
 				for index, resp := range batchResp {
 					assert.Equal(t, c.batchResponse[index].Error, resp.Error)
 				}
 			} else if c.name == "valid-batch-req" {
 				assert.Len(t, batchResp, 6)
+
 				for index, resp := range batchResp {
 					assert.Equal(t, c.batchResponse[index].Error, resp.Error)
 				}
 			} else if c.name == "no-limits" {
 				assert.Len(t, batchResp, 12)
+
 				for index, resp := range batchResp {
 					assert.Equal(t, c.batchResponse[index].Error, resp.Error)
 				}