Skip to content

Commit

Permalink
Merge pull request #169 from MinterTeam/dev
Browse files Browse the repository at this point in the history
v0.7.6
  • Loading branch information
danil-lashin authored Nov 27, 2018
2 parents 14afd9f + 51f325f commit cdd60c8
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 10 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 0.7.6
*Nov 27th, 2018*

IMPROVEMENT

- [tendermint] Update to [v0.26.4](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0264)

BUG FIXES

- [node] Fix issue #168 with unexpected database corruption

## 0.7.5
*Nov 22th, 2018*

Expand Down
10 changes: 5 additions & 5 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@

[[constraint]]
name = "github.com/danil-lashin/iavl"
revision = "0f508ab5fe04b726c976a26459d141108e4a28ca"
revision = "ff321d758752b411f0fb01f86370395c314bc13a"

[[constraint]]
name = "github.com/tendermint/tendermint"
version = "=0.26.3"
version = "=0.26.4"

[[constraint]]
branch = "v1"
Expand Down
7 changes: 7 additions & 0 deletions core/minter/minter.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Blockchain struct {
validatorsStatuses map[[20]byte]int8

lock sync.RWMutex
wg sync.WaitGroup
}

const (
Expand Down Expand Up @@ -102,6 +103,8 @@ func (app *Blockchain) InitChain(req abciTypes.RequestInitChain) abciTypes.Respo
}

func (app *Blockchain) BeginBlock(req abciTypes.RequestBeginBlock) abciTypes.ResponseBeginBlock {
app.wg.Add(1)

atomic.StoreInt64(&app.height, req.Header.Height)
app.rewards = big.NewInt(0)

Expand Down Expand Up @@ -311,6 +314,8 @@ func (app *Blockchain) Commit() abciTypes.ResponseCommit {

atomic.StoreInt64(&app.lastCommittedHeight, app.Height())

app.wg.Done()

return abciTypes.ResponseCommit{
Data: hash,
}
Expand All @@ -321,6 +326,8 @@ func (app *Blockchain) Query(reqQuery abciTypes.RequestQuery) abciTypes.Response
}

func (app *Blockchain) Stop() {
app.wg.Wait()

app.appDB.Close()
app.stateDB.Close()
}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.4"
services:
minter:
image: minterteam/minter:0.7.5
image: minterteam/minter:0.7.6
volumes:
- ~/.minter:/minter
ports:
Expand Down
4 changes: 2 additions & 2 deletions version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ package version
const (
Maj = "0"
Min = "7"
Fix = "5"
Fix = "6"
)

var (
// Must be a string because scripts like dist.sh read this file.
Version = "0.7.5"
Version = "0.7.6"

// GitCommit is the current HEAD set using ldflags.
GitCommit string
Expand Down

0 comments on commit cdd60c8

Please sign in to comment.