Merge pull request #227 from filecoin-project/feature/backend

feat: backend code upgrade

Author: joekingss

backend/.env.example

@@ -9,7 +9,6 @@ MYSQL_PASSWORD= # Password for the MySQL database
 MYSQL_DATABASE= # Database name for the MySQL database
 
 POWERVOTING_CONTRACT=    # Contract address for the PowerVoting contract
-ORACLE_POWERS_CONTRACT=  # Contract address for the Oracle Powers contract
 SYNC_EVENT_START_HEIGHT= # Start height for the sync event
 ORACLE_CONTRACT=         # Contract address for the Oracle contract
 FIP_CONTRACT=            # Contract address for the FIP contract
@@ -18,9 +17,10 @@ FIP_INIT_EDITOR=         # Address of the FIP init editor on deploy the FIP Cont
 POWERVOTING_API_PATH=   # API path for the PowerVoting contract
 ORACLE_API_PATH=        # API path for the Oracle contract
 FIP_ABI_PATH=           # ABI path for the FIP contract
-ORACLE_POWERS_ABI_PATH= # ABI path for the Oracle Powers contract
+
 
 MINER_ID_PREFIX=t0                               # Miner ID prefix for the network
 CHAIN_ID=314159                                  # Chain ID for the network
 CHAIN_NAME=FileCoin-Calibration                  # Chain name for the network
 CHAIN_RPC_NODE=http://192.168.11.139:1235/rpc/v1 # RPC URL for the chain node
+GITHUB_TOKEN=github_pat_XXXXXX,github_pat_XXXXXX # https://github.com/settings/tokens

backend/Dockerfile

@@ -20,13 +20,12 @@ FROM alpine:latest
 WORKDIR /dist
 
 COPY --from=backend-builder /build/app .
-COPY --from=backend-builder /build/configuration.yaml .
+COPY --from=backend-builder /build/configuration-backend.yaml .
+
 COPY --from=backend-builder /build/abi/power-voting.json ./
-COPY --from=backend-builder /build/abi/oracle.json ./
 COPY --from=backend-builder /build/abi/power-voting-fip.json ./
+# Copy oracle abi to instance
 COPY --from=backend-builder /build/abi/oracle-powers.json ./
-
-
-EXPOSE 18007
-
+COPY --from=backend-builder /build/abi/oracle.json ./
+COPY --from=backend-builder /build/.env ./
 CMD ["/dist/app"]

backend/api/power.go

@@ -32,12 +32,19 @@ func GetAddressPower(c *constant.Context) {
 		return
 	}
 
+	ethAddr, err := req.AddressReq.ToEthAddr()
+	if err != nil {
+		zap.L().Error("GetAddressPower invalid address: ", zap.String("address", req.AddressReq.Address), zap.Error(err))
+		Error(c.Context, err)
+		return
+	}
+
 	// Call the client's GetAddressPowerByDay method to retrieve power information.
-	power, err := snapshot.GetAddressPowerByDay(req.ChainId, req.Address, req.PowerDay)
+	power, err := snapshot.GetAddressPowerByDay(req.ChainId, ethAddr, req.PowerDay)
 	if err != nil {
 		zap.L().Error(
 			"get snapshot power error ",
-			zap.String("address", req.Address),
+			zap.String("address", ethAddr),
 			zap.String("power day", req.PowerDay),
 			zap.Int64("chain id", req.ChainId),
 			zap.Error(err),

backend/api/rpc/backend.proto

@@ -24,7 +24,7 @@ message GetAllVoterAddressResponse {
 }
 
 message GetVoterInfoResponse {
-  repeated string miner_ids = 1;
-  string actor_id =2;
-  string github_account = 3;
+  string actor_id = 1;
+  string github_account = 2;
+  repeated string miner_ids = 3;
 }

backend/api/rpc/client_test.go

@@ -41,7 +41,7 @@ func (b *BackendRpc) GetVoterInfo(ctx context.Context, req *pb.GetVoterInfoReque
 	return &pb.GetVoterInfoResponse{
 		MinerIds:      voteInfo.MinerIds,
 		ActorId:       voteInfo.OwnerId,
-		GithubAccount: voteInfo.GithubId,
+		GithubAccount: voteInfo.GithubName,
 	}, nil
 
 }

backend/api/rpc/proto/backend.pb.go

@@ -1,17 +1,17 @@
 #!/bin/bash
 set -e
 
-IMAGE_NAME="pv-test-backend"
+IMAGE_NAME="pv-backend-mainnet"
 
-if [ ! -f "configuration.yaml" ]; then
-    echo "Error: configuration.yaml does not exist."
+if [ ! -f ".env" ]; then
+    echo "Error: .env does not exist."
     exit 1
 fi
 
-PORT=$(awk '/^server:/{flag=1;next} /^  port:/{if(flag) print $2; flag=0}' "configuration.yaml" | tr -d ':')
+PORT=$(awk -F'=' '/^PORT=/ {gsub(/[^0-9]/, "", $2); print $2}' .env)
 
 if [ -z "$PORT" ]; then
-  echo "Error: Can not get port from configuration."
+  echo "Error: Can not get port from .env."
   exit 1
 fi
 
@@ -38,4 +38,4 @@ else
     echo "Container $IMAGE_NAME does not exist or is already stopped."
 fi
 
-docker run --name $IMAGE_NAME -v ./configuration.yaml:/dist/configuration.yaml -p $PORT:$PORT -d $IMAGE_NAME
+docker run --name $IMAGE_NAME  -p $PORT:$PORT -d $IMAGE_NAME

backend/api/rpc/server.go

@@ -61,7 +61,7 @@ func InitConfig(path string) {
 		replacedValue = strings.ReplaceAll(replacedValue, "'", "")
 		replacedValue = strings.ReplaceAll(replacedValue, "\"", "")
 
-		if key == "xxl-job.serveraddrs" {
+		if key == "github.token" {
 			viper.Set(key, strings.Split(replacedValue, ","))
 		} else {
 			viper.Set(key, replacedValue)
@@ -82,3 +82,49 @@ func replaceEnvVariables(value string) string {
 		return os.Getenv(key)
 	})
 }
+
+func GetDefaultConfig(client ...*Config) {
+	Client = DefaultConfig
+	if len(client) == 0 {
+		return
+	}
+
+	var config *Config = client[0]
+	if client != nil {
+		if config.Server.Port != "" {
+			Client.Server.Port = config.Server.Port
+		}
+
+		if config.Server.RpcPort != "" {
+			Client.Server.RpcPort = config.Server.RpcPort
+		}
+
+		if config.Network.ChainId != 0 {
+			Client.Network.ChainId = config.Network.ChainId
+		}
+
+		if config.Network.Name != "" {
+			Client.Network.Name = config.Network.Name
+		}
+
+		if config.Network.Rpc != "" {
+			Client.Network.Rpc = config.Network.Rpc
+		}
+
+		if config.Network.MinerIdPrefix != "" {
+			Client.Network.MinerIdPrefix = config.Network.MinerIdPrefix
+		}
+
+	}
+
+}
+
+var DefaultConfig = Config{
+	Server: Server{Port: "8000", RpcPort: "9000"},
+	Network: Network{
+		ChainId:       314159,
+		Name:          "FileCoin-Calibration ",
+		Rpc:           "https://filecoin-calibration.chainup.net/rpc/v1",
+		MinerIdPrefix: "t0",
+	},
+}

backend/build.sh

@@ -22,6 +22,7 @@ type Config struct {
 	Snapshot Snapshot // Snapshot configuration
 	Network  Network  // List of network configurations
 	ABIPath  ABIPath  // Abi path to the contracts
+	Github   Github   // Github configuration
 }
 
 // Server represents the server configuration.
@@ -43,6 +44,10 @@ type Drand struct {
 	ChainHash string   // Chain hash for the Drand network
 }
 
+type Github struct {
+	Token []string
+}
+
 // Network represents the configuration for a specific network.
 type Network struct {
 	ChainId              int64  // Unique identifier for the network
@@ -51,7 +56,6 @@ type Network struct {
 	PowerVotingContract  string // Contract address for PowerVoting
 	SyncEventStartHeight int64  // Deployment height of the PowerVoting contract
 	OracleContract       string // Contract address for Oracle
-	OraclePowersContract string // Contract address for OraclePowers
 	FipContract          string // Contract address for FIP
 	FipInitEditor        string // Initial editor for FIP
 	MinerIdPrefix        string // Prefix for miner IDs
@@ -64,6 +68,5 @@ type Snapshot struct {
 type ABIPath struct {
 	PowerVotingAbi  string // ABI (Application Binary Interface) for PowerVoting contract
 	OracleAbi       string // ABI for Oracle contract
-	OraclePowersAbi string // ABI for OraclePowers contract
 	FipAbi          string // ABI for FIP contract
 }