From d6646fd1d4b7f6ce374591c7766482da845b6798 Mon Sep 17 00:00:00 2001
From: Daniil Lashin <3121312+danil-lashin@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:15:44 +0300
Subject: [PATCH] Change multisig fields ordering

---
 api/v2/api_pb/api.pb.go       |  6 ++++--
 core/dao/dao.go               | 11 +++++++++--
 core/developers/developers.go | 11 +++++++++--
 core/state/accounts/model.go  |  2 +-
 version/version.go            |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/api/v2/api_pb/api.pb.go b/api/v2/api_pb/api.pb.go
index 04af57c99..4ab28af78 100644
--- a/api/v2/api_pb/api.pb.go
+++ b/api/v2/api_pb/api.pb.go
@@ -970,8 +970,10 @@ type GenesisResponse_ConsensusParams_Validator struct {
 func (m *GenesisResponse_ConsensusParams_Validator) Reset() {
 	*m = GenesisResponse_ConsensusParams_Validator{}
 }
-func (m *GenesisResponse_ConsensusParams_Validator) String() string { return proto.CompactTextString(m) }
-func (*GenesisResponse_ConsensusParams_Validator) ProtoMessage()    {}
+func (m *GenesisResponse_ConsensusParams_Validator) String() string {
+	return proto.CompactTextString(m)
+}
+func (*GenesisResponse_ConsensusParams_Validator) ProtoMessage() {}
 func (*GenesisResponse_ConsensusParams_Validator) Descriptor() ([]byte, []int) {
 	return fileDescriptor_00212fb1f9d3bf1c, []int{3, 0, 2}
 }
diff --git a/core/dao/dao.go b/core/dao/dao.go
index c6774845f..6d722a3ba 100644
--- a/core/dao/dao.go
+++ b/core/dao/dao.go
@@ -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
 )
diff --git a/core/developers/developers.go b/core/developers/developers.go
index 86c2ed180..434d6047c 100644
--- a/core/developers/developers.go
+++ b/core/developers/developers.go
@@ -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
 )
diff --git a/core/state/accounts/model.go b/core/state/accounts/model.go
index ff80c3812..307773997 100644
--- a/core/state/accounts/model.go
+++ b/core/state/accounts/model.go
@@ -27,8 +27,8 @@ type Model struct {
 }
 
 type Multisig struct {
-	Weights   []uint
 	Threshold uint
+	Weights   []uint
 	Addresses []types.Address
 }
 
diff --git a/version/version.go b/version/version.go
index affa013fc..81413809d 100755
--- a/version/version.go
+++ b/version/version.go
@@ -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