Merge pull request #42 from Ether1Project/2.1.0_Phoenix

2.1.0 phoenix
Ether1Project · Jul 30, 2022 · 47b326e · 47b326e
2 parents 52aed52 + 73ed19f
commit 47b326e
Show file tree

Hide file tree

Showing 1,659 changed files with 50 additions and 55 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
diff --git a/.github/no-response.yml b/.github/no-response.yml
diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/.mailmap b/.mailmap
diff --git a/.travis.yml b/.travis.yml
diff --git a/AUTHORS b/AUTHORS
diff --git a/COPYING b/COPYING
diff --git a/COPYING.LESSER b/COPYING.LESSER
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
diff --git a/accounts/abi/argument.go b/accounts/abi/argument.go
diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go
diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go
diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go
diff --git a/accounts/abi/doc.go b/accounts/abi/doc.go
diff --git a/accounts/abi/error.go b/accounts/abi/error.go
diff --git a/accounts/abi/event.go b/accounts/abi/event.go
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
diff --git a/accounts/abi/method.go b/accounts/abi/method.go
diff --git a/accounts/abi/method_test.go b/accounts/abi/method_test.go
diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go
diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go
diff --git a/accounts/abi/packing_test.go b/accounts/abi/packing_test.go
diff --git a/accounts/abi/reflect.go b/accounts/abi/reflect.go
diff --git a/accounts/abi/reflect_test.go b/accounts/abi/reflect_test.go
diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go
diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go
diff --git a/accounts/abi/type.go b/accounts/abi/type.go
diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go
diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
diff --git a/accounts/accounts.go b/accounts/accounts.go
diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go
diff --git a/accounts/errors.go b/accounts/errors.go
diff --git a/accounts/external/backend.go b/accounts/external/backend.go
diff --git a/accounts/hd.go b/accounts/hd.go
diff --git a/accounts/hd_test.go b/accounts/hd_test.go
diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go
diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go
diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go
diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go
diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go
diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go
diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go
diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go
diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go
diff --git a/accounts/keystore/testdata/dupes/1 b/accounts/keystore/testdata/dupes/1
diff --git a/accounts/keystore/testdata/dupes/2 b/accounts/keystore/testdata/dupes/2
diff --git a/accounts/keystore/testdata/dupes/foo b/accounts/keystore/testdata/dupes/foo
diff --git a/accounts/keystore/testdata/keystore/.hiddenfile b/accounts/keystore/testdata/keystore/.hiddenfile
diff --git a/accounts/keystore/testdata/keystore/README b/accounts/keystore/testdata/keystore/README
diff --git a/...ta/keystore/UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8 b/...ta/keystore/UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8
diff --git a/accounts/keystore/testdata/keystore/aaa b/accounts/keystore/testdata/keystore/aaa
diff --git a/accounts/keystore/testdata/keystore/empty b/accounts/keystore/testdata/keystore/empty
diff --git a/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e b/accounts/keystore/testdata/keystore/foo/fd9bd350f08ee3c0c19b85a8e16114a11a60aa4e
diff --git a/accounts/keystore/testdata/keystore/garbage b/accounts/keystore/testdata/keystore/garbage
diff --git a/accounts/keystore/testdata/keystore/no-address b/accounts/keystore/testdata/keystore/no-address
diff --git a/accounts/keystore/testdata/keystore/zero b/accounts/keystore/testdata/keystore/zero
diff --git a/accounts/keystore/testdata/keystore/zzz b/accounts/keystore/testdata/keystore/zzz
diff --git a/...data/v1/cb61d5a9c4896fb9658090b597ef0e7be6f7b67e/cb61d5a9c4896fb9658090b597ef0e7be6f7b67e b/...data/v1/cb61d5a9c4896fb9658090b597ef0e7be6f7b67e/cb61d5a9c4896fb9658090b597ef0e7be6f7b67e
diff --git a/accounts/keystore/testdata/v1_test_vector.json b/accounts/keystore/testdata/v1_test_vector.json
diff --git a/accounts/keystore/testdata/v3_test_vector.json b/accounts/keystore/testdata/v3_test_vector.json
diff --git a/accounts/keystore/testdata/very-light-scrypt.json b/accounts/keystore/testdata/very-light-scrypt.json
diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go
diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
diff --git a/accounts/keystore/watch_fallback.go b/accounts/keystore/watch_fallback.go
diff --git a/accounts/manager.go b/accounts/manager.go
diff --git a/accounts/scwallet/README.md b/accounts/scwallet/README.md
diff --git a/accounts/scwallet/apdu.go b/accounts/scwallet/apdu.go
diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go
diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go
diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go
diff --git a/accounts/sort.go b/accounts/sort.go
diff --git a/accounts/url.go b/accounts/url.go
diff --git a/accounts/url_test.go b/accounts/url_test.go
diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go
diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go
diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go
diff --git a/accounts/usbwallet/trezor/messages-common.pb.go b/accounts/usbwallet/trezor/messages-common.pb.go
diff --git a/accounts/usbwallet/trezor/messages-common.proto b/accounts/usbwallet/trezor/messages-common.proto
diff --git a/accounts/usbwallet/trezor/messages-ethereum.pb.go b/accounts/usbwallet/trezor/messages-ethereum.pb.go
diff --git a/accounts/usbwallet/trezor/messages-ethereum.proto b/accounts/usbwallet/trezor/messages-ethereum.proto
diff --git a/accounts/usbwallet/trezor/messages-management.pb.go b/accounts/usbwallet/trezor/messages-management.pb.go
diff --git a/accounts/usbwallet/trezor/messages-management.proto b/accounts/usbwallet/trezor/messages-management.proto
diff --git a/accounts/usbwallet/trezor/messages.pb.go b/accounts/usbwallet/trezor/messages.pb.go
diff --git a/accounts/usbwallet/trezor/messages.proto b/accounts/usbwallet/trezor/messages.proto
diff --git a/accounts/usbwallet/trezor/trezor.go b/accounts/usbwallet/trezor/trezor.go
diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build/checksums.txt b/build/checksums.txt
diff --git a/build/ci-notes.md b/build/ci-notes.md
diff --git a/build/ci.go b/build/ci.go
diff --git a/build/deb/ethereum/deb.changelog b/build/deb/ethereum/deb.changelog
diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control
diff --git a/build/deb/ethereum/deb.copyright b/build/deb/ethereum/deb.copyright
diff --git a/build/deb/ethereum/deb.docs b/build/deb/ethereum/deb.docs
diff --git a/build/deb/ethereum/deb.install b/build/deb/ethereum/deb.install
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
diff --git a/build/mvn.pom b/build/mvn.pom
diff --git a/build/mvn.settings b/build/mvn.settings
diff --git a/build/nsis.envvarupdate.nsh b/build/nsis.envvarupdate.nsh
diff --git a/build/nsis.geth.nsi b/build/nsis.geth.nsi
diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh
diff --git a/build/nsis.pathupdate.nsh b/build/nsis.pathupdate.nsh
diff --git a/build/nsis.simplefc.dll b/build/nsis.simplefc.dll
diff --git a/build/nsis.simplefc.source.zip b/build/nsis.simplefc.source.zip
diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh
diff --git a/build/pod.podspec b/build/pod.podspec
diff --git a/build/update-license.go b/build/update-license.go
diff --git a/circle.yml b/circle.yml
diff --git a/cmd/abidump/main.go b/cmd/abidump/main.go
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go
diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go
diff --git a/cmd/checkpoint-admin/README.md b/cmd/checkpoint-admin/README.md
diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go
diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go
diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go
diff --git a/cmd/checkpoint-admin/status.go b/cmd/checkpoint-admin/status.go
diff --git a/cmd/clef/README.md b/cmd/clef/README.md
diff --git a/cmd/clef/datatypes.md b/cmd/clef/datatypes.md
diff --git a/cmd/clef/docs/clef_architecture_pt1.png b/cmd/clef/docs/clef_architecture_pt1.png
diff --git a/cmd/clef/docs/clef_architecture_pt2.png b/cmd/clef/docs/clef_architecture_pt2.png
diff --git a/cmd/clef/docs/clef_architecture_pt3.png b/cmd/clef/docs/clef_architecture_pt3.png
diff --git a/cmd/clef/docs/clef_architecture_pt4.png b/cmd/clef/docs/clef_architecture_pt4.png
diff --git a/cmd/clef/docs/qubes/clef_qubes_http.png b/cmd/clef/docs/qubes/clef_qubes_http.png
diff --git a/cmd/clef/docs/qubes/clef_qubes_qrexec.png b/cmd/clef/docs/qubes/clef_qubes_qrexec.png
diff --git a/cmd/clef/docs/qubes/qrexec-example.png b/cmd/clef/docs/qubes/qrexec-example.png
diff --git a/cmd/clef/docs/qubes/qubes-client.py b/cmd/clef/docs/qubes/qubes-client.py
diff --git a/cmd/clef/docs/qubes/qubes.Clefsign b/cmd/clef/docs/qubes/qubes.Clefsign
diff --git a/cmd/clef/docs/qubes/qubes_newaccount-1.png b/cmd/clef/docs/qubes/qubes_newaccount-1.png
diff --git a/cmd/clef/docs/qubes/qubes_newaccount-2.png b/cmd/clef/docs/qubes/qubes_newaccount-2.png
diff --git a/cmd/clef/docs/setup.md b/cmd/clef/docs/setup.md
diff --git a/cmd/clef/extapi_changelog.md b/cmd/clef/extapi_changelog.md
diff --git a/cmd/clef/intapi_changelog.md b/cmd/clef/intapi_changelog.md
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
diff --git a/cmd/clef/pythonsigner.py b/cmd/clef/pythonsigner.py
diff --git a/cmd/clef/rules.md b/cmd/clef/rules.md
diff --git a/cmd/clef/sign_flow.png b/cmd/clef/sign_flow.png
diff --git a/cmd/clef/testdata/sign_1559_missing_field_exp_fail.json b/cmd/clef/testdata/sign_1559_missing_field_exp_fail.json
diff --git a/cmd/clef/testdata/sign_1559_missing_maxfeepergas_exp_fail.json b/cmd/clef/testdata/sign_1559_missing_maxfeepergas_exp_fail.json
diff --git a/cmd/clef/testdata/sign_1559_tx.json b/cmd/clef/testdata/sign_1559_tx.json
diff --git a/cmd/clef/testdata/sign_bad_checksum_exp_fail.json b/cmd/clef/testdata/sign_bad_checksum_exp_fail.json
diff --git a/cmd/clef/testdata/sign_normal_exp_ok.json b/cmd/clef/testdata/sign_normal_exp_ok.json
diff --git a/cmd/clef/tests/testsigner.js b/cmd/clef/tests/testsigner.js
diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md
diff --git a/cmd/devp2p/README.md b/cmd/devp2p/README.md
diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go
diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go
diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go
diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go
diff --git a/cmd/devp2p/dns_route53_test.go b/cmd/devp2p/dns_route53_test.go
diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go
diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go
diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
diff --git a/cmd/devp2p/internal/ethtest/chain_test.go b/cmd/devp2p/internal/ethtest/chain_test.go
diff --git a/cmd/devp2p/internal/ethtest/helpers.go b/cmd/devp2p/internal/ethtest/helpers.go
diff --git a/cmd/devp2p/internal/ethtest/large.go b/cmd/devp2p/internal/ethtest/large.go
diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go
diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go
diff --git a/cmd/devp2p/internal/ethtest/testdata/chain.rlp b/cmd/devp2p/internal/ethtest/testdata/chain.rlp
diff --git a/cmd/devp2p/internal/ethtest/testdata/genesis.json b/cmd/devp2p/internal/ethtest/testdata/genesis.json
diff --git a/cmd/devp2p/internal/ethtest/testdata/halfchain.rlp b/cmd/devp2p/internal/ethtest/testdata/halfchain.rlp
diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go
diff --git a/cmd/devp2p/internal/ethtest/types.go b/cmd/devp2p/internal/ethtest/types.go
diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go
diff --git a/cmd/devp2p/internal/v4test/framework.go b/cmd/devp2p/internal/v4test/framework.go
diff --git a/cmd/devp2p/internal/v5test/discv5tests.go b/cmd/devp2p/internal/v5test/discv5tests.go
diff --git a/cmd/devp2p/internal/v5test/framework.go b/cmd/devp2p/internal/v5test/framework.go
diff --git a/cmd/devp2p/keycmd.go b/cmd/devp2p/keycmd.go
diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go
diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go
diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go
diff --git a/cmd/devp2p/rlpxcmd.go b/cmd/devp2p/rlpxcmd.go
diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go
diff --git a/cmd/ethkey/README.md b/cmd/ethkey/README.md
diff --git a/cmd/ethkey/changepassword.go b/cmd/ethkey/changepassword.go
diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go
diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go
diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go
diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go
diff --git a/cmd/ethkey/message_test.go b/cmd/ethkey/message_test.go
diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go
diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go
diff --git a/cmd/evm/README.md b/cmd/evm/README.md
diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go
diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
diff --git a/cmd/evm/testdata/1/alloc.json b/cmd/evm/testdata/1/alloc.json
diff --git a/cmd/evm/testdata/1/env.json b/cmd/evm/testdata/1/env.json
diff --git a/cmd/evm/testdata/1/txs.json b/cmd/evm/testdata/1/txs.json
diff --git a/cmd/evm/testdata/10/alloc.json b/cmd/evm/testdata/10/alloc.json
diff --git a/cmd/evm/testdata/10/env.json b/cmd/evm/testdata/10/env.json
diff --git a/cmd/evm/testdata/10/readme.md b/cmd/evm/testdata/10/readme.md
diff --git a/cmd/evm/testdata/10/txs.json b/cmd/evm/testdata/10/txs.json
diff --git a/cmd/evm/testdata/11/alloc.json b/cmd/evm/testdata/11/alloc.json
diff --git a/cmd/evm/testdata/11/env.json b/cmd/evm/testdata/11/env.json
diff --git a/cmd/evm/testdata/11/readme.md b/cmd/evm/testdata/11/readme.md
diff --git a/cmd/evm/testdata/11/txs.json b/cmd/evm/testdata/11/txs.json
diff --git a/cmd/evm/testdata/12/alloc.json b/cmd/evm/testdata/12/alloc.json
diff --git a/cmd/evm/testdata/12/env.json b/cmd/evm/testdata/12/env.json
diff --git a/cmd/evm/testdata/12/readme.md b/cmd/evm/testdata/12/readme.md
diff --git a/cmd/evm/testdata/12/txs.json b/cmd/evm/testdata/12/txs.json
diff --git a/cmd/evm/testdata/13/alloc.json b/cmd/evm/testdata/13/alloc.json
diff --git a/cmd/evm/testdata/13/env.json b/cmd/evm/testdata/13/env.json
diff --git a/cmd/evm/testdata/13/readme.md b/cmd/evm/testdata/13/readme.md
diff --git a/cmd/evm/testdata/13/txs.json b/cmd/evm/testdata/13/txs.json
diff --git a/cmd/evm/testdata/2/alloc.json b/cmd/evm/testdata/2/alloc.json
diff --git a/cmd/evm/testdata/2/env.json b/cmd/evm/testdata/2/env.json
diff --git a/cmd/evm/testdata/2/readme.md b/cmd/evm/testdata/2/readme.md
diff --git a/cmd/evm/testdata/2/txs.json b/cmd/evm/testdata/2/txs.json
diff --git a/cmd/evm/testdata/3/alloc.json b/cmd/evm/testdata/3/alloc.json
diff --git a/cmd/evm/testdata/3/env.json b/cmd/evm/testdata/3/env.json
diff --git a/cmd/evm/testdata/3/readme.md b/cmd/evm/testdata/3/readme.md
diff --git a/cmd/evm/testdata/3/txs.json b/cmd/evm/testdata/3/txs.json
diff --git a/cmd/evm/testdata/4/alloc.json b/cmd/evm/testdata/4/alloc.json
diff --git a/cmd/evm/testdata/4/env.json b/cmd/evm/testdata/4/env.json
diff --git a/cmd/evm/testdata/4/readme.md b/cmd/evm/testdata/4/readme.md
diff --git a/cmd/evm/testdata/4/txs.json b/cmd/evm/testdata/4/txs.json
diff --git a/cmd/evm/testdata/5/alloc.json b/cmd/evm/testdata/5/alloc.json
diff --git a/cmd/evm/testdata/5/env.json b/cmd/evm/testdata/5/env.json
diff --git a/cmd/evm/testdata/5/readme.md b/cmd/evm/testdata/5/readme.md
diff --git a/cmd/evm/testdata/5/txs.json b/cmd/evm/testdata/5/txs.json
diff --git a/cmd/evm/testdata/7/alloc.json b/cmd/evm/testdata/7/alloc.json
diff --git a/cmd/evm/testdata/7/env.json b/cmd/evm/testdata/7/env.json
diff --git a/cmd/evm/testdata/7/readme.md b/cmd/evm/testdata/7/readme.md
diff --git a/cmd/evm/testdata/7/txs.json b/cmd/evm/testdata/7/txs.json
diff --git a/cmd/evm/testdata/8/alloc.json b/cmd/evm/testdata/8/alloc.json
diff --git a/cmd/evm/testdata/8/env.json b/cmd/evm/testdata/8/env.json
diff --git a/cmd/evm/testdata/8/readme.md b/cmd/evm/testdata/8/readme.md
diff --git a/cmd/evm/testdata/8/txs.json b/cmd/evm/testdata/8/txs.json
diff --git a/cmd/evm/testdata/9/alloc.json b/cmd/evm/testdata/9/alloc.json
diff --git a/cmd/evm/testdata/9/env.json b/cmd/evm/testdata/9/env.json
diff --git a/cmd/evm/testdata/9/readme.md b/cmd/evm/testdata/9/readme.md
diff --git a/cmd/evm/testdata/9/txs.json b/cmd/evm/testdata/9/txs.json
diff --git a/cmd/evm/transition-test.sh b/cmd/evm/transition-test.sh
diff --git a/cmd/faucet/README.md b/cmd/faucet/README.md
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
diff --git a/cmd/faucet/faucet.html b/cmd/faucet/faucet.html
diff --git a/cmd/faucet/faucet_test.go b/cmd/faucet/faucet_test.go
diff --git a/cmd/faucet/website.go b/cmd/faucet/website.go
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
diff --git a/cmd/geth/genesis_test.go b/cmd/geth/genesis_test.go
diff --git a/cmd/geth/les_test.go b/cmd/geth/les_test.go
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -293,7 +293,7 @@ func prepare(ctx *cli.Context) {
 		log.Info("Starting Geth in ephemeral dev mode...")
 
 	case !ctx.GlobalIsSet(utils.NetworkIdFlag.Name):
-		log.Info("Connecting to Ether-1 Network...")
+		log.Info("Connecting to Etho Protocol Network...")
 	}
 	// If we're a full node on mainnet without --cache specified, bump default cache allowance
 	if ctx.GlobalString(utils.SyncModeFlag.Name) != "light" && !ctx.GlobalIsSet(utils.CacheFlag.Name) && !ctx.GlobalIsSet(utils.NetworkIdFlag.Name) {

diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go
diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go
diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go
diff --git a/cmd/geth/testdata/blockchain.blocks b/cmd/geth/testdata/blockchain.blocks
diff --git a/cmd/geth/testdata/clique.json b/cmd/geth/testdata/clique.json
diff --git a/cmd/geth/testdata/empty.js b/cmd/geth/testdata/empty.js
diff --git a/cmd/geth/testdata/guswallet.json b/cmd/geth/testdata/guswallet.json
diff --git a/cmd/geth/testdata/key.prv b/cmd/geth/testdata/key.prv
diff --git a/cmd/geth/testdata/password.txt b/cmd/geth/testdata/password.txt
diff --git a/cmd/geth/testdata/passwords.txt b/cmd/geth/testdata/passwords.txt
diff --git a/cmd/geth/testdata/vcheck/data.json b/cmd/geth/testdata/vcheck/data.json
diff --git a/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.1 b/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.1
diff --git a/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.2 b/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.2
diff --git a/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.3 b/cmd/geth/testdata/vcheck/minisig-sigs/vulnerabilities.json.minisig.3
diff --git a/cmd/geth/testdata/vcheck/minisign.pub b/cmd/geth/testdata/vcheck/minisign.pub