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

View File

@ -45,7 +45,7 @@ jobs:
- name: Build Docker image - name: Build Docker image
shell: bash shell: bash
run: docker build . -t localtestnet run: docker build . -t localtestnet
- name: Set up Kurtosis - name: Set up Kurtosis
shell: bash shell: bash
@ -60,12 +60,12 @@ jobs:
id: services id: services
run: | run: |
export github_sha=${{ github.sha }} export github_sha=${{ github.sha }}
export github_repository=${{ github.repository }} export github_repository=${{ github.repository }}
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 }})
@ -124,7 +124,7 @@ jobs:
elif [ "$task_result" == "failure" ]; then elif [ "$task_result" == "failure" ]; then
task_result="${RED}failure${NC}" task_result="${RED}failure${NC}"
fi fi
printf " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title \n" printf " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title \n"
done <<< $(echo "$tasks") done <<< $(echo "$tasks")
} }
@ -185,7 +185,7 @@ jobs:
echo "$task_lines" echo "$task_lines"
fi fi
if [ $failed_tests -gt 0 ]; then if [ $failed_tests -gt 0 ]; then
final_test_result="failure" final_test_result="failure"
break break
fi fi
@ -229,7 +229,7 @@ jobs:
with: with:
name: "kurtosis-enclave-dump-${{ github.run_id }}" name: "kurtosis-enclave-dump-${{ github.run_id }}"
path: ./temp/dump path: ./temp/dump
- name: Return test result - name: Return test result
shell: bash shell: bash
run: | run: |

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,

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`).

View File

@ -45,7 +45,7 @@ else
fi fi
# Install jq if not installed already # Install jq if not installed already
if [ "$(which jq)" != "" ]; if [ "$(which jq)" != "" ];
then then
echo "jq is already installed" echo "jq is already installed"
else else
@ -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)
@ -156,7 +156,7 @@ else
elif [ "$task_result" == "failure" ]; then elif [ "$task_result" == "failure" ]; then
task_result="${RED}failure${NC}" task_result="${RED}failure${NC}"
fi fi
echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title" echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title"
done <<< $(echo "$tasks") done <<< $(echo "$tasks")
} }
@ -217,7 +217,7 @@ else
echo "$task_lines" echo "$task_lines"
fi fi
if [ "$failed_tests" -gt 0 ]; then if [ "$failed_tests" -gt 0 ]; then
final_test_result="failure" final_test_result="failure"
break break
fi fi