Merge pull request #1151 from iost-official/v3.3.5

V3.3.5

.travis.yml

@@ -31,14 +31,14 @@ matrix:
     services:
     - docker
     before_install:
-    - docker pull iostio/iost-dev:3.3.4
+    - docker pull iostio/iost-dev:3.3.5
     - git lfs install
     before_script:
     - git lfs pull
     script:
-    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.4 make build
-    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.4 make lint
-    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.4 make test
+    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.5 make build
+    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.5 make lint
+    - docker run -it --rm -v $(pwd):/gopath/src/github.com/iost-official/go-iost iostio/iost-dev:3.3.5 make test
     after_success:
     - bash <(curl -s https://codecov.io/bash)
   - os: linux
@@ -48,7 +48,7 @@ matrix:
     services:
     - docker
     before_install:
-    - docker pull iostio/iost-dev:3.3.4
+    - docker pull iostio/iost-dev:3.3.5
     - git lfs install
     before_script:
     - git lfs pull
@@ -66,7 +66,7 @@ matrix:
     - git clone https://github.com/kubernetes/client-go $GOPATH/src/k8s.io/client-go
     - git clone --branch v0.4.0 https://github.com/googleapis/gnostic $GOPATH/src/k8s.io/client-go/vendor/github.com/googleapis/gnostic
     - go get sigs.k8s.io/aws-iam-authenticator/cmd/[email protected]
-    - docker pull iostio/iost-dev:3.3.4
+    - docker pull iostio/iost-dev:3.3.5
     - git lfs install
     - pyenv global 3.6.7 && pip install awscli
     - sudo apt-get clean && sudo apt-get update && sudo apt-get install -y dpkg 

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v3.3.5
+Wed Jun 10 13:28:27 CST 2020
+- Hotfix for a bug where some corner case tx cannot be confirmed
+
+## v3.3.4
+Thu May 28 14:34:58 CST 2020
+- Upgrade Go to 1.14
+- Mining nodes have better logs for troubleshooting
+- Security fixes
+
 ## v3.3.3 
 Fri Apr 10 08:36:50 UTC 2020
 

Makefile

@@ -2,7 +2,7 @@ GO = go
 GO_BUILD = go build -mod vendor
 GO_TEST = go test -mod vendor -race -coverprofile=coverage.txt -covermode=atomic
 
-VERSION = 3.3.4
+VERSION = 3.3.5
 COMMIT = $(shell git rev-parse --short HEAD)
 PROJECT = github.com/iost-official/go-iost
 DOCKER_IMAGE = iostio/iost-node:$(VERSION)-$(COMMIT)

build/k8s/iserver.yaml

@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: iserver
-          image: "iostio/iost-node:3.3.4-$COMMIT"
+          image: "iostio/iost-node:3.3.5-$COMMIT"
           imagePullPolicy: "IfNotPresent"
           command:
             - /bin/bash

build/k8s/itest.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
   - name: itest
-    image: "iostio/iost-node:3.3.4-$COMMIT"
+    image: "iostio/iost-node:3.3.5-$COMMIT"
     imagePullPolicy: "IfNotPresent"
     command: ['/bin/bash', '-c', 'sleep infinity']
     resources:

verifier/verifier.go

@@ -379,7 +379,7 @@ func verify(isolator vm.Isolator, t *tx.Tx, r *tx.TxReceipt, timeout time.Durati
 			to = timeout / 2
 		}
 	} else {
-		to = timeout * 2
+		to = timeout * 50
 	}
 	err := isolator.PrepareTx(t, to)
 	if err != nil {