status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: migration of ethereum-package to ethpandaops (#2348) 

* fix: migration of ethereum-package to ethpandaops

* add hidden files too
This commit is contained in:
Barnabas Busa 2024-06-13 16:03:19 +02:00 committed by GitHub
parent 689834517b
commit 23027baf30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/kurtosis.yml vendored
View File

@ -65,7 +65,7 @@ jobs:
cat kurtosis-network-params.yml | envsubst > assertoor.yaml cat kurtosis-network-params.yml | envsubst > assertoor.yaml
sed -i "s/el_image: .*/el_image: localtestnet/" assertoor.yaml sed -i "s/el_image: .*/el_image: localtestnet/" assertoor.yaml
kurtosis run github.com/kurtosis-tech/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file assertoor.yaml kurtosis run github.com/ethpandaops/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file assertoor.yaml
enclave_dump=$(kurtosis enclave inspect assertoor-${{ github.run_id }}) enclave_dump=$(kurtosis enclave inspect assertoor-${{ github.run_id }})

2
nimbus/core/tx_pool/tx_tasks/tx_add.nim
View File

@ -77,7 +77,7 @@ proc supersede(xp: TxPoolRef; item: TxItemRef): Result[void,TxInfo]
return err(txInfoErrUnspecified) return err(txInfoErrUnspecified)
current = rc.value.data current = rc.value.data
# TODO: To unblock `kurtosis-tech/ethereum-package` based testing, # TODO: To unblock `ethpandaops/ethereum-package` based testing,
# we have to accept superseding transactions temporarily until `rpc_utils.nim` # we have to accept superseding transactions temporarily until `rpc_utils.nim`
# supports the 'pending' tag by incorporating pending transactions from the # supports the 'pending' tag by incorporating pending transactions from the
# mempool when returning the current account nonce. Until that is fixed, # mempool when returning the current account nonce. Until that is fixed,

4
nimbus/rpc/rpc_utils.nim
View File

@ -48,7 +48,7 @@ proc headerFromTag*(chain: CoreDbRef, blockId: BlockTag): BlockHeader
of "pending": of "pending":
#TODO: Implement get pending block #TODO: Implement get pending block
# We currently fall back to `latest` so that the `tx-spammer` in # We currently fall back to `latest` so that the `tx-spammer` in
# `kurtosis-tech/ethereum-package` can make progress. A real # `ethpandaops/ethereum-package` can make progress. A real
# implementation is still required that takes into account any # implementation is still required that takes into account any
# pending transactions that have not yet been bundled into a block. # pending transactions that have not yet been bundled into a block.
result = chain.getCanonicalHead() result = chain.getCanonicalHead()
@ -84,7 +84,7 @@ proc calculateMedianGasPrice*(chain: CoreDbRef): GasInt
# TODO: This should properly incorporate the base fee in the block data, # TODO: This should properly incorporate the base fee in the block data,
# and recommend a gas fee that likely gets the block to confirm. # and recommend a gas fee that likely gets the block to confirm.
# This also has to work on Genesis where no prior transaction data exists. # This also has to work on Genesis where no prior transaction data exists.
# For compatibility with `kurtosis-tech/ethereum-package`, set this to a # For compatibility with `ethpandaops/ethereum-package`, set this to a
# sane minimum for compatibility to unblock testing. # sane minimum for compatibility to unblock testing.
# Note: When this is fixed, update `tests/graphql/queries.toml` and # Note: When this is fixed, update `tests/graphql/queries.toml` and
# re-enable the "query.gasPrice" test case (remove `skip = true`). # re-enable the "query.gasPrice" test case (remove `skip = true`).

2
run-kurtosis-check.sh
View File

@ -87,7 +87,7 @@ sed -i "s/el_image: .*/el_image: $new_el_image/" assertoor.yaml
sudo kurtosis run \ sudo kurtosis run \
--enclave nimbus-localtestnet \ --enclave nimbus-localtestnet \
github.com/kurtosis-tech/ethereum-package \ github.com/ethpandaops/ethereum-package \
--args-file assertoor.yaml --args-file assertoor.yaml
enclave_dump=$(kurtosis enclave inspect nimbus-localtestnet) enclave_dump=$(kurtosis enclave inspect nimbus-localtestnet)