forked from OffchainLabs/nitro
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v3.3.1' into release/v3.x-fh
# Conflicts: # arbnode/node.go # arbos/arbosState/initialize.go # arbos/block_processor.go # arbos/l1pricing_test.go # arbos/tx_processor.go # arbos/util/transfer.go # cmd/deploy/deploy.go # cmd/nitro/init.go # cmd/replay/main.go # deploy/deploy.go # execution/gethexec/block_recorder.go # execution/gethexec/executionengine.go # execution/gethexec/stylus_tracer.go # go-ethereum # go.mod # go.sum # precompiles/ArbOwner_test.go # system_tests/aliasing_test.go # system_tests/batch_poster_test.go # system_tests/block_hash_test.go # system_tests/blocks_reexecutor_test.go # system_tests/bloom_test.go # system_tests/common_test.go # system_tests/conditionaltx_test.go # system_tests/contract_tx_test.go # system_tests/das_test.go # system_tests/db_conversion_test.go # system_tests/debugapi_test.go # system_tests/delayedinbox_test.go # system_tests/estimation_test.go # system_tests/eth_sync_test.go # system_tests/fast_confirm_test.go # system_tests/fees_test.go # system_tests/forwarder_test.go # system_tests/full_challenge_impl_test.go # system_tests/infra_fee_test.go # system_tests/initialization_test.go # system_tests/log_subscription_test.go # system_tests/meaningless_reorg_test.go # system_tests/nodeinterface_test.go # system_tests/outbox_test.go # system_tests/precompile_fuzz_test.go # system_tests/precompile_test.go # system_tests/program_norace_test.go # system_tests/program_recursive_test.go # system_tests/program_test.go # system_tests/pruning_test.go # system_tests/recreatestate_rpc_test.go # system_tests/retryable_test.go # system_tests/seq_coordinator_test.go # system_tests/seq_nonce_test.go # system_tests/seq_pause_test.go # system_tests/seq_reject_test.go # system_tests/seqcompensation_test.go # system_tests/seqfeed_test.go # system_tests/staker_test.go # system_tests/state_fuzz_test.go # system_tests/staterecovery_test.go # system_tests/stylus_trace_test.go # system_tests/stylus_tracer_test.go # system_tests/test_info.go # system_tests/triedb_race_test.go # system_tests/twonodeslong_test.go # system_tests/unsupported_txtypes_test.go # system_tests/validation_mock_test.go # system_tests/wrap_transaction_test.go
- Loading branch information
Showing
440 changed files
with
30,939 additions
and
3,438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| version: 0.2 | ||
|
|
||
| phases: | ||
| pre_build: | ||
| commands: | ||
| - git submodule update --init | ||
| - echo Logging in to Dockerhub.... | ||
| - docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD | ||
| - aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $REPOSITORY_URI | ||
| - COMMIT_HASH=$(git rev-parse --short=7 HEAD || echo "latest") | ||
| - VERSION_TAG=$(git tag --points-at HEAD | sed '/-/!s/$/_/' | sort -rV | sed 's/_$//' | head -n 1 | grep ^ || git show -s --pretty=%D | sed 's/, /\n/g' | grep -v '^origin/' |grep -v '^grafted\|HEAD\|master\|main$' || echo "dev") | ||
| - NITRO_VERSION=${VERSION_TAG}-${COMMIT_HASH} | ||
| - IMAGE_TAG=${NITRO_VERSION} | ||
| - NITRO_DATETIME=$(git show -s --date=iso-strict --format=%cd) | ||
| - NITRO_MODIFIED="false" | ||
| - echo ${NITRO_VERSION} > ./.nitro-tag.txt | ||
| build: | ||
| commands: | ||
| - echo Build started on `date` | ||
| - echo Building the Docker image ${NITRO_VERSION}... | ||
| - DOCKER_BUILDKIT=1 docker build . -t nitro-node-slim --target nitro-node-slim --build-arg version=$NITRO_VERSION --build-arg datetime=$NITRO_DATETIME --build-arg modified=$NITRO_MODIFIED | ||
| - DOCKER_BUILDKIT=1 docker build . -t nitro-node --target nitro-node --build-arg version=$NITRO_VERSION --build-arg datetime=$NITRO_DATETIME --build-arg modified=$NITRO_MODIFIED | ||
| - DOCKER_BUILDKIT=1 docker build . -t nitro-node-dev --target nitro-node-dev --build-arg version=$NITRO_VERSION --build-arg datetime=$NITRO_DATETIME --build-arg modified=$NITRO_MODIFIED | ||
| - DOCKER_BUILDKIT=1 docker build . -t nitro-node-validator --target nitro-node-validator --build-arg version=$NITRO_VERSION --build-arg datetime=$NITRO_DATETIME --build-arg modified=$NITRO_MODIFIED | ||
| - docker tag nitro-node:latest $REPOSITORY_URI:$IMAGE_TAG-$ARCH_TAG | ||
| - docker tag nitro-node-slim:latest $REPOSITORY_URI:$IMAGE_TAG-slim-$ARCH_TAG | ||
| - docker tag nitro-node-dev:latest $REPOSITORY_URI:$IMAGE_TAG-dev-$ARCH_TAG | ||
| - docker tag nitro-node-validator:latest $REPOSITORY_URI:$IMAGE_TAG-validator-$ARCH_TAG | ||
| post_build: | ||
| commands: | ||
| - echo Build completed on `date` | ||
| - echo pushing to repo | ||
| - docker push $REPOSITORY_URI:$IMAGE_TAG-$ARCH_TAG | ||
| - docker push $REPOSITORY_URI:$IMAGE_TAG-slim-$ARCH_TAG | ||
| - docker push $REPOSITORY_URI:$IMAGE_TAG-dev-$ARCH_TAG | ||
| - docker push $REPOSITORY_URI:$IMAGE_TAG-validator-$ARCH_TAG |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| #!/bin/bash | ||
|
|
||
| check_missing_value() { | ||
| if [[ $1 -eq 0 || $2 == -* ]]; then | ||
| echo "missing $3 argument value" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| timeout="" | ||
| tags="" | ||
| run="" | ||
| race=false | ||
| cover=false | ||
| while [[ $# -gt 0 ]]; do | ||
| case $1 in | ||
| --timeout) | ||
| shift | ||
| check_missing_value $# "$1" "--timeout" | ||
| timeout=$1 | ||
| shift | ||
| ;; | ||
| --tags) | ||
| shift | ||
| check_missing_value $# "$1" "--tags" | ||
| tags=$1 | ||
| shift | ||
| ;; | ||
| --run) | ||
| shift | ||
| check_missing_value $# "$1" "--run" | ||
| run=$1 | ||
| shift | ||
| ;; | ||
| --race) | ||
| race=true | ||
| shift | ||
| ;; | ||
| --cover) | ||
| cover=true | ||
| shift | ||
| ;; | ||
| *) | ||
| echo "Invalid argument: $1" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| packages=$(go list ./...) | ||
| for package in $packages; do | ||
| cmd="stdbuf -oL gotestsum --format short-verbose --packages=\"$package\" --rerun-fails=2 --no-color=false --" | ||
|
|
||
| if [ "$timeout" != "" ]; then | ||
| cmd="$cmd -timeout $timeout" | ||
| fi | ||
|
|
||
| if [ "$tags" != "" ]; then | ||
| cmd="$cmd -tags=$tags" | ||
| fi | ||
|
|
||
| if [ "$run" != "" ]; then | ||
| cmd="$cmd -run=$run" | ||
| fi | ||
|
|
||
| if [ "$race" == true ]; then | ||
| cmd="$cmd -race" | ||
| fi | ||
|
|
||
| if [ "$cover" == true ]; then | ||
| cmd="$cmd -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/..." | ||
| fi | ||
|
|
||
| cmd="$cmd > >(stdbuf -oL tee -a full.log | grep -vE \"INFO|seal\")" | ||
|
|
||
| echo "" | ||
| echo running tests for "$package" | ||
| echo "$cmd" | ||
|
|
||
| if ! eval "$cmd"; then | ||
| exit 1 | ||
| fi | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.