Merge pull request #1660 from nspcc-dev/initialize-role-management-before-oracles

native: swap oracle and role management init

pkg/core/native/contract.go

@@ -73,18 +73,18 @@ func NewContracts(p2pSigExtensionsEnabled bool) *Contracts {
 	cs.Policy = policy
 	cs.Contracts = append(cs.Contracts, policy)
 
-	oracle := newOracle()
-	oracle.GAS = gas
-	oracle.NEO = neo
-	cs.Oracle = oracle
-	cs.Contracts = append(cs.Contracts, oracle)
-
 	desig := newDesignate(p2pSigExtensionsEnabled)
 	desig.NEO = neo
 	cs.Designate = desig
-	cs.Oracle.Desig = desig
 	cs.Contracts = append(cs.Contracts, desig)
 
+	oracle := newOracle()
+	oracle.GAS = gas
+	oracle.NEO = neo
+	oracle.Desig = desig
+	cs.Oracle = oracle
+	cs.Contracts = append(cs.Contracts, oracle)
+
 	if p2pSigExtensionsEnabled {
 		notary := newNotary()
 		notary.GAS = gas

pkg/core/native/designate.go

@@ -40,7 +40,7 @@ type oraclesData struct {
 }
 
 const (
-	designateContractID = -5
+	designateContractID = -4
 
 	// maxNodeCount is the maximum number of nodes to set the role for.
 	maxNodeCount = 32

pkg/core/native/oracle.go

@@ -38,7 +38,7 @@ type Oracle struct {
 }
 
 const (
-	oracleContractID  = -4
+	oracleContractID  = -5
 	maxURLLength      = 256
 	maxFilterLength   = 128
 	maxCallbackLength = 32