From 878da2d165d14c7f65650d60f37822eadd821e4c Mon Sep 17 00:00:00 2001 From: frozen <355847+Frozen@users.noreply.github.com> Date: Sat, 22 Jul 2023 11:38:20 -0400 Subject: [PATCH 1/5] Remove dht dir before start. --- scripts/go_executable_build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/go_executable_build.sh b/scripts/go_executable_build.sh index 6331aa522..38d647fe8 100755 --- a/scripts/go_executable_build.sh +++ b/scripts/go_executable_build.sh @@ -26,6 +26,8 @@ fi DEBUG=false STATIC=true +rm -rf .dht-127.0.0.1* + unset -v progdir case "${0}" in */*) progdir="${0%/*}";; From ee8a8884ce7583bfc3c06a9d812e2061161f6180 Mon Sep 17 00:00:00 2001 From: Max <82761650+MaxMustermann2@users.noreply.github.com> Date: Thu, 3 Aug 2023 03:39:27 +0000 Subject: [PATCH 2/5] statedb: return correct validator code size (#4475) The function `state_object.CodeSize` erroneously returns the validator code size to be 0. This functionality is only used by the EVM, where the size is overridden by the `ValidatorCodeFixEpoch` hard fork to be 0 anyway. However, for nodes currently syncing blocks before the hard fork was effective, this causes an error. A transaction which attempts to mint an NFT to a validator address prior to the hard fork would have failed, because `onERC1155Received` is not implemented by a validator's code. With the erroneous line, the transaction goes through - causing a node with the unpatched binary to reject the block. --- core/state/state_object.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/state/state_object.go b/core/state/state_object.go index 20540371a..8e0f3acf2 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -561,7 +561,7 @@ func (s *Object) CodeSize(db Database) int { if s.validatorWrapper || err != nil { vcSize, errVCSize := db.ValidatorCodeSize(s.addrHash, common.BytesToHash(s.CodeHash())) if errVCSize == nil && vcSize > 0 { - return size + return vcSize } if s.validatorWrapper { s.setError(fmt.Errorf("can't load validator code size %x for account address hash %x : %v", s.CodeHash(), s.addrHash, err)) From 324063c2b2b5b527ec4213f5924eadf30a7bbe37 Mon Sep 17 00:00:00 2001 From: Soph <35721420+sophoah@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:29:49 +0700 Subject: [PATCH 3/5] [build] upgrade docker in travis build to latest (#4478) * [build] upgrade docker in travis build to latest * add comment to the before_install job --------- Co-authored-by: Gheis Mohammadi --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd92b53df..39e3904ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,14 @@ env: - TEST="bash ./scripts/travis_go_checker.sh" - TEST="bash ./scripts/travis_rpc_checker.sh" - TEST="bash ./scripts/travis_rosetta_checker.sh" + +before_install: + # upgrade docker to the latest supported by the OS loaded in the travis image + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - sudo apt-get update + - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce + install: # default working directory with source code is automatically set to # /home/travis/gopath/src/github.com/harmony-one/harmony From 497871620a02b0f48411ee25a6cbd0a63d1f3ff5 Mon Sep 17 00:00:00 2001 From: Max <82761650+MaxMustermann2@users.noreply.github.com> Date: Thu, 3 Aug 2023 04:54:27 +0000 Subject: [PATCH 4/5] build: auto accept repository addition (#4480) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39e3904ad..2c32a4918 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ env: before_install: # upgrade docker to the latest supported by the OS loaded in the travis image - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - sudo add-apt-repository --yes "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce From 944b8c73d0a6dd83d90b4faf3f9e2de5ae534c92 Mon Sep 17 00:00:00 2001 From: Soph <35721420+sophoah@users.noreply.github.com> Date: Thu, 3 Aug 2023 16:49:37 +0700 Subject: [PATCH 5/5] [build] upgrade docker in travis using addons (#4481) * [build] upgrade docker in travis using addons * [build] upgrade docker in travis with debug command * [build] retrying addons * [build] debug log * [build] clean debug log --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c32a4918..27e9a96ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,13 @@ env: - TEST="bash ./scripts/travis_rpc_checker.sh" - TEST="bash ./scripts/travis_rosetta_checker.sh" -before_install: - # upgrade docker to the latest supported by the OS loaded in the travis image - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - - sudo add-apt-repository --yes "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - - sudo apt-get update - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce +# upgrade docker to latest stable version +addons: + apt: + sources: + - sourceline: deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable + packages: + - docker.io install: # default working directory with source code is automatically set to