Revert "[iip-15]sgdRegistry implementation (#3845)" (#4357)

This reverts commit 23645ff.

.github/CODEOWNERS

@@ -6,19 +6,19 @@
 
 #Specific owners
 /consensus/	    @CoderZhi @dustinxie @Liuhaai @envestcc
-/ioctl/  	    @CoderZhi @dustinxie @Liuhaai @envestcc @millken
-/api/   		    @CoderZhi @dustinxie @Liuhaai @millken @envestcc
-/config/	        @CoderZhi @dustinxie @Liuhaai @envestcc @millken
+/ioctl/  	    @CoderZhi @dustinxie @Liuhaai @envestcc
+/api/   		    @CoderZhi @dustinxie @Liuhaai @envestcc
+/config/	        @CoderZhi @dustinxie @Liuhaai @envestcc
 /p2p/		    @CoderZhi @dustinxie @Liuhaai @envestcc
 /action/		    @CoderZhi @dustinxie @Liuhaai @envestcc
 /blockchain/	    @CoderZhi @dustinxie @Liuhaai @envestcc
 /blockindex/	    @CoderZhi @dustinxie @Liuhaai @envestcc
 /crypto/		    @CoderZhi @dustinxie @Liuhaai @envestcc
 /db/		        @CoderZhi @dustinxie @Liuhaai @envestcc
 /dispatcher/	    @CoderZhi @dustinxie @Liuhaai @envestcc
-/pkg/		    @CoderZhi @dustinxie @Liuhaai
-/server/		    @CoderZhi @dustinxie @Liuhaai
-/state/		    @CoderZhi @dustinxie @Liuhaai
-/actpool/		@CoderZhi @dustinxie @Liuhaai
-/nodeinfo/ 		@CoderZhi @dustinxie @envestcc
-/.github/ 		@CoderZhi @dustinxie @Liuhaai
+/pkg/		    @CoderZhi @dustinxie @Liuhaai @envestcc
+/server/		    @CoderZhi @dustinxie @Liuhaai @envestcc
+/state/		    @CoderZhi @dustinxie @Liuhaai @envestcc
+/actpool/		@CoderZhi @dustinxie @Liuhaai @envestcc
+/nodeinfo/ 		@CoderZhi @dustinxie @Liuhaai @envestcc
+/.github/ 		@CoderZhi @dustinxie @Liuhaai @envestcc

action/protocol/execution/evm/evm.go

@@ -328,7 +328,8 @@ func processSGD(ctx context.Context, sm protocol.StateManager, execution *action
 		return nil, 0, nil
 	}
 
-	receiver, percentage, ok, err := sgd.CheckContract(ctx, execution.Contract())
+	contract, _ := address.FromBytes((*execution.To())[:])
+	receiver, percentage, ok, err := sgd.CheckContract(ctx, contract.String())
 	if err != nil || !ok {
 		return nil, 0, err
 	}

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 ContractDisapproved(address contractAddress);
+    event ContractUnapproved(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 ContractDisapproved(_contractAddress);
+        emit ContractUnapproved(_contractAddress);
     }
 
     function removeContract(address _contractAddress) public onlyOwner {

blockchain/config.go

@@ -32,7 +32,6 @@ 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"`
@@ -87,7 +86,6 @@ 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

@@ -324,10 +324,6 @@ 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"`
 		// SystemStakingContractV2Address is the address of system staking contract
 		SystemStakingContractV2Address string `yaml:"systemStakingContractV2Address"`
 		// SystemStakingContractV2Height is the height of system staking contract

blockindex/indexpb/index.proto

@@ -4,8 +4,7 @@
 // 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=. *.proto
-// option go_package = "../indexpb"; is to specify the package name in the generated go file
+//      protoc --go_out=plugins=grpc:. *.proto
 syntax = "proto3";
 package indexpb;
 
@@ -18,9 +17,3 @@ message BlockIndex {
 message ActionIndex {
     uint64 blkHeight = 1;
 }
-
-message SGDIndex {
-    bytes contract = 1;
-    bytes receiver = 2;
-    bool approved = 3;
-}