Skip to content

Commit

Permalink
[iip-15]sgdRegistry implementation (#3845)
Browse files Browse the repository at this point in the history
  • Loading branch information
millken committed May 30, 2023
1 parent 790c4f5 commit 23645ff
Show file tree
Hide file tree
Showing 19 changed files with 865 additions and 37 deletions.
32 changes: 16 additions & 16 deletions action/protocol/execution/testdata-istanbul/iip15-manager.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions action/protocol/execution/testdata-istanbul/iip15-manager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions blockchain/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions blockchain/genesis/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
93 changes: 88 additions & 5 deletions blockindex/indexpb/index.pb.go

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

9 changes: 8 additions & 1 deletion blockindex/indexpb/index.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -17,3 +18,9 @@ message BlockIndex {
message ActionIndex {
uint64 blkHeight = 1;
}

message SGDIndex {
bytes contract = 1;
bytes receiver = 2;
bool approved = 3;
}
Loading

0 comments on commit 23645ff

Please sign in to comment.