eip1559: exchange baseFeePerGas and maxPriorityFeePerGas

integration/tests/basic/erc/test_EIP1559.py

@@ -443,8 +443,8 @@ def test_too_low_fee(
             value=1000000,
             nonce="auto",
             gas="auto",
-            max_priority_fee_per_gas=0,
-            max_fee_per_gas=int(base_fee_per_gas * 0.5),
+            max_priority_fee_per_gas=int(max_priority_fee_per_gas * 0.75),
+            max_fee_per_gas=base_fee_per_gas + max_priority_fee_per_gas,
             data=None,
             access_list=None,
         )
@@ -454,22 +454,21 @@ def test_too_low_fee(
             self.web3_client.send_transaction(account=sender, transaction=tx_params, timeout=TX_TIMEOUT)
 
     @pytest.mark.neon_only
-    @pytest.mark.parametrize("max_priority_fee_per_gas, base_fee_multiplier",
-                             [(1000000000, 1.1), (1000, 1.5)])
+    @pytest.mark.parametrize("base_fee_multiplier",
+                             [1.1, 1.5])
     def test_compute_unit_price(
         self,
             accounts: EthAccounts,
             web3_client: NeonChainWeb3Client,
             json_rpc_client: JsonRPCSession,
             sol_client: SolanaClient,
-            max_priority_fee_per_gas,
             base_fee_multiplier
     ):
         sender = accounts[0]
         recipient = accounts[1]
 
-        latest_block: web3.types.BlockData = web3_client._web3.eth.get_block(block_identifier="latest")  # noqa
-        base_fee_per_gas = latest_block.baseFeePerGas  # noqa
+        max_priority_fee_per_gas = web3_client.max_priority_fee_per_gas()
+        base_fee_per_gas = web3_client.base_fee_per_gas()
         max_fee_per_gas = int((base_fee_multiplier * base_fee_per_gas) + max_priority_fee_per_gas)
 
         value = 1029380121

integration/tests/basic/evm/opcodes/test_base_opcodes.py

@@ -141,7 +141,12 @@ def test_base_fee_trx_type_2(
         tx = web3_client.make_raw_tx(accounts[0], tx_type=TransactionType.EIP_1559)
         instruction_tx = basefee_checker.functions.baseFeeTrx().build_transaction(tx)
         instruction_tx["maxFeePerGas"] = 3000000000
-        instruction_tx["maxPriorityFeePerGas"] = 2000000
+        instruction_tx["maxPriorityFeePerGas"] = 2500000000
         resp = web3_client.send_transaction(accounts[0], instruction_tx)
         base_fee_from_log = basefee_checker.events.Log().process_receipt(resp)[0]['args']['baseFee']
-        assert base_fee_from_log == instruction_tx["maxFeePerGas"] - instruction_tx["maxPriorityFeePerGas"]
+        # Neon specific, it uses maxPriorityFee to pay an Operator
+        #   it is just an adoption to Ethereum clients
+        #   which use eth_maxPriorityFeePerGas() as a constant
+        #   and increase baseFeePerGas to increase chances to include a Tx into a block
+        #   on Solana the situation is another - increased part of the gasPrice should be used for the Prioritization
+        assert base_fee_from_log == instruction_tx["maxPriorityFeePerGas"]

integration/tests/basic/rpc/test_eip_1559_neon_rpc.py

@@ -77,7 +77,7 @@ def test_neon_get_transaction_receipt(
         recipient = accounts[1]
 
         base_fee_per_gas = web3_client.base_fee_per_gas()
-        max_priority_fee_per_gas = web3_client._web3.eth._max_priority_fee()  # noqa
+        max_priority_fee_per_gas = web3_client.max_priority_fee_per_gas()
         max_fee_per_gas = (5 * base_fee_per_gas) + max_priority_fee_per_gas
 
         receipt = web3_client.send_tokens_eip_1559(
@@ -94,5 +94,5 @@ def test_neon_get_transaction_receipt(
         assert "error" not in response, response["error"]
 
         actual_effective_gas_price = int(response["result"].get("effectiveGasPrice"), 16)
-        assert actual_effective_gas_price >= base_fee_per_gas
+        assert actual_effective_gas_price >= max_priority_fee_per_gas
         assert actual_effective_gas_price <= max_fee_per_gas

integration/tests/basic/solana_signature/test_send_scheduled_transactions.py

@@ -42,7 +42,7 @@ def test_multiple_scheduled_trx(
         )
         trxs = []
         max_fee_per_gas = 3000000000
-        max_priority_fee_per_gas = 15
+        max_priority_fee_per_gas = 2500000000
         for i in range(4):
             trxs.append(
                 ScheduledTransaction(
@@ -88,7 +88,7 @@ def test_multiple_scheduled_trx_with_failed_trx(
         call_data = abi.function_signature_to_4byte_selector("doAssert()")
         gas_limit = 30000000
         max_fee_per_gas = 3000000000
-        max_priority_fee_per_gas = 15
+        max_priority_fee_per_gas = 2500000000
 
         tx0 = ScheduledTransaction(
             neon_user.neon_address,
@@ -221,7 +221,7 @@ def test_scheduled_trx_with_timestamp(
 
         gas_limit = 30000000
         max_fee_per_gas = 3000000000
-        max_priority_fee_per_gas = 15
+        max_priority_fee_per_gas = 2500000000
         trxs = []
         for i in range(trx_count):
             trxs.append(
@@ -276,7 +276,7 @@ def test_scheduled_trx_with_small_gas_limit(
         )
         gas_limit = 3000000
         max_fee_per_gas = 3000000000
-        max_priority_fee_per_gas = 15
+        max_priority_fee_per_gas = 2500000000
 
         tx0 = ScheduledTransaction(
             neon_user.neon_address,

utils/scheduled_trx.py

@@ -31,7 +31,7 @@ class ScheduledTransaction:
         "chain_id": 112,
         "gas_limit": 3000000,
         "max_fee_per_gas": 3000000000,
-        "max_priority_fee_per_gas": 15,
+        "max_priority_fee_per_gas": 2500000000,
     }
 
     FIELD_NAMES = [
@@ -82,7 +82,7 @@ def get_serialized_node(self, child_index, success_limit):
 
 
 class CreateTreeAccMultipleData:
-    def __init__(self, nonce, max_fee_per_gas=3000000000, max_priority_fee_per_gas=15):
+    def __init__(self, nonce, max_fee_per_gas=3000000000, max_priority_fee_per_gas=2500000000):
         self.nonce = nonce.to_bytes(8, byteorder="big")
         self.max_fee_per_gas = max_fee_per_gas.to_bytes(32, byteorder="big")
         self.max_priority_fee_per_gas = max_priority_fee_per_gas.to_bytes(32, byteorder="big")