Skip to content

Commit

Permalink
Merge pull request irisnet#849 from MrXJC/jiacheng/refactor
Browse files Browse the repository at this point in the history
R4R: Fix the software of protocolVersion0
  • Loading branch information
wukongcheng committed Dec 18, 2018
2 parents 23cb420 + f4d3bbc commit 3aee4c2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/v0/protocol_v0.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func NewProtocolVersion0(cdc *codec.Codec) *ProtocolVersion0 {
base := protocol.ProtocolBase{
Definition: common.ProtocolDefinition{
uint64(0),
"https://github.com/irisnet/irishub/releases/tag/v0.7.0",
"",
uint64(1),
},
// engine: engine,
Expand Down
6 changes: 3 additions & 3 deletions modules/upgrade/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"github.com/irisnet/irishub/app/protocol/keeper"
sdk "github.com/irisnet/irishub/types"
"github.com/irisnet/irishub/types/common"
"github.com/irisnet/irishub/version"
)

// GenesisState - all upgrade state that must be provided at genesis
Expand All @@ -21,7 +22,6 @@ func InitGenesis(ctx sdk.Context, k Keeper, data GenesisState) {

// WriteGenesis - output genesis parameters
func ExportGenesis(ctx sdk.Context) GenesisState {

return GenesisState{
GenesisVersion: NewVersion(
keeper.UpgradeConfig{0,
Expand All @@ -39,7 +39,7 @@ func DefaultGenesisState() GenesisState {
keeper.UpgradeConfig{0,
common.ProtocolDefinition{
uint64(0),
"https://github.com/irisnet/irishub/releases/tag/v0.7.0",
"https://github.com/irisnet/irishub/releases/tag/v" + version.Version,
uint64(1),
}}, true)}
}
Expand All @@ -51,7 +51,7 @@ func DefaultGenesisStateForTest() GenesisState {
keeper.UpgradeConfig{0,
common.ProtocolDefinition{
uint64(0),
"https://github.com/irisnet/irishub/releases/tag/v0.7.0",
"https://github.com/irisnet/irishub/releases/tag/v" + version.Version,
uint64(1),
}}, true)}
}
1 change: 0 additions & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
// Version - Iris Version
const ProtocolVersion = 0
const Version = "0.9.0-Beta"

// GitCommit set by build flags
var GitCommit = ""

Expand Down

0 comments on commit 3aee4c2

Please sign in to comment.