Skip to content

Commit

Permalink
Change multisig fields ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
danil-lashin committed Mar 2, 2020
1 parent 0dd7967 commit d6646fd
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
6 changes: 4 additions & 2 deletions api/v2/api_pb/api.pb.go

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

11 changes: 9 additions & 2 deletions core/dao/dao.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
package dao

import "github.com/MinterTeam/minter-go-node/core/types"
import (
"github.com/MinterTeam/minter-go-node/core/state/accounts"
"github.com/MinterTeam/minter-go-node/core/types"
)

var (
Address = types.HexToAddress("Mx3339b3287a21b7d58895876d6409418cf1fdb666")
Address = (&accounts.Multisig{
Threshold: 2,
Weights: []uint{1, 1, 1},
Addresses: []types.Address{types.HexToAddress("Mxed2f3dbe7a25f928df95ae8f207ed8079578daf3"), types.HexToAddress("Mx91980bf6391eb6946f43df559fd1e56952f9cde7"), types.HexToAddress("Mx375bc810e0fd19dcf0da43556b50ba6825ba11b8")},
}).Address()
Commission = 10
)
11 changes: 9 additions & 2 deletions core/developers/developers.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
package developers

import "github.com/MinterTeam/minter-go-node/core/types"
import (
"github.com/MinterTeam/minter-go-node/core/state/accounts"
"github.com/MinterTeam/minter-go-node/core/types"
)

var (
Address = types.HexToAddress("Mx07706fac38854036d2ba077ac3769064bab7082f")
Address = (&accounts.Multisig{
Threshold: 2,
Weights: []uint{1, 1, 1},
Addresses: []types.Address{types.HexToAddress("Mx22df0f98c1b421974fb0c64440258aaffd4e96d8"), types.HexToAddress("Mxf8821646818a873e3efac40cc2c13f96e3515aa1"), types.HexToAddress("Mx90a82ed6fd69cdd125474ce9349a8e34fb4f5ffe")},
}).Address()
Commission = 10
)
2 changes: 1 addition & 1 deletion core/state/accounts/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ type Model struct {
}

type Multisig struct {
Weights []uint
Threshold uint
Weights []uint
Addresses []types.Address
}

Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const (

var (
// Must be a string because scripts like dist.sh read this file.
Version = "1.1.0-rc3"
Version = "1.1.0-rc4"

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

0 comments on commit d6646fd

Please sign in to comment.