Merge 0087a81 into 790c4f5

action/protocol/execution/testdata-istanbul/iip15-manager.sol

@@ -15,7 +15,7 @@ contract IIP15Manager is Ownable {
 
     event ContractRegistered(address contractAddress, address recipient);
     event ContractApproved(address contractAddress);
-    event ContractUnapproved(address contractAddress);
+    event ContractDisapproved(address contractAddress);
     event ContractRemoved(address contractAddress);
 
     function registerContract(address _contractAddress, address _recipient) public {
@@ -39,7 +39,7 @@ contract IIP15Manager is Ownable {
         require(contractInfo.recipient != address(0), "Contract is not registered");
         require(contractInfo.isApproved, "Contract is not approved");
         contractInfo.isApproved = false;
-        emit ContractUnapproved(_contractAddress);
+        emit ContractDisapproved(_contractAddress);
     }
 
     function removeContract(address _contractAddress) public onlyOwner {

blockchain/config.go

@@ -32,6 +32,7 @@ type (
 		BloomfilterIndexDBPath     string           `yaml:"bloomfilterIndexDBPath"`
 		CandidateIndexDBPath       string           `yaml:"candidateIndexDBPath"`
 		StakingIndexDBPath         string           `yaml:"stakingIndexDBPath"`
+		SGDIndexDBPath             string           `yaml:"sgdIndexDBPath"`
 		ContractStakingIndexDBPath string           `yaml:"contractStakingIndexDBPath"`
 		ID                         uint32           `yaml:"id"`
 		EVMNetworkID               uint32           `yaml:"evmNetworkID"`
@@ -84,6 +85,7 @@ var (
 		BloomfilterIndexDBPath:     "/var/data/bloomfilter.index.db",
 		CandidateIndexDBPath:       "/var/data/candidate.index.db",
 		StakingIndexDBPath:         "/var/data/staking.index.db",
+		SGDIndexDBPath:             "/var/data/sgd.index.db",
 		ContractStakingIndexDBPath: "/var/data/contractstaking.index.db",
 		ID:                         1,
 		EVMNetworkID:               4689,

blockchain/genesis/genesis.go

@@ -288,6 +288,10 @@ type (
 		SystemStakingContractAddress string `yaml:"systemStakingContractAddress"`
 		// SystemStakingContractHeight is the height of system staking contract
 		SystemStakingContractHeight uint64 `yaml:"systemStakingContractHeight"`
+		// SystemSGDContractAddress is the address of system sgd contract
+		SystemSGDContractAddress string `yaml:"systemSGDContractAddress"`
+		// SystemSGDContractHeight is the height of system sgd contract
+		SystemSGDContractHeight uint64 `yaml:"systemSGDContractHeight"`
 	}
 	// Delegate defines a delegate with address and votes
 	Delegate struct {

blockindex/indexpb/index.proto

@@ -4,7 +4,8 @@
 // This source code is governed by Apache License 2.0 that can be found in the LICENSE file.
 
 // To compile the proto, run:
-//      protoc --go_out=plugins=grpc:. *.proto
+//      protoc --go_out=. *.proto
+// option go_package = "../indexpb"; is to specify the package name in the generated go file
 syntax = "proto3";
 package indexpb;
 
@@ -17,3 +18,9 @@ message BlockIndex {
 message ActionIndex {
     uint64 blkHeight = 1;
 }
+
+message SGDIndex {
+    bytes contract = 1;
+    bytes receiver = 2;
+    bool approved = 3;
+}