Merge pull request dedis#2161 from dedis/personhood_version

Use new darc-rule only in version 3
vixledger · Dec 9, 2019 · fd4161f · fd4161f
2 parents fc19564 + ad681da
commit fd4161f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/byzcoin/bcadmin/main.go b/byzcoin/bcadmin/main.go
@@ -21,6 +21,7 @@ import (
  "github.com/qantik/qrgo"
  "github.com/urfave/cli"
  "go.dedis.ch/cothority/v3"
+ _ "go.dedis.ch/cothority/v3/bevm"
  "go.dedis.ch/cothority/v3/byzcoin"
  "go.dedis.ch/cothority/v3/byzcoin/bcadmin/lib"
  "go.dedis.ch/cothority/v3/byzcoin/contracts"

diff --git a/byzcoin/messages.go b/byzcoin/messages.go
@@ -24,4 +24,4 @@ func init() {
 type Version int
 
 // CurrentVersion is what we're running now
-const CurrentVersion Version = 2
+const CurrentVersion Version = 3
diff --git a/personhood/contract_popparty.go b/personhood/contract_popparty.go
@@ -98,7 +98,7 @@ func (c ContractPopParty) Spawn(rst byzcoin.ReadOnlyStateTrie, inst byzcoin.Inst
  return nil, nil, errors.New("couldn't get darc: " + err.Error())
  }
  var expr expression.Expr
- if rst.GetVersion() < 2 {
+ if rst.GetVersion() < 3 {
  expr = d.Rules.Get("invoke:finalize")
  } else {
  expr = d.Rules.Get("invoke:popParty.finalize")