feat/V3

.env.example

@@ -1,5 +1,6 @@
 RPC_URI_FOR_1=
 RPC_URI_FOR_10=
+RPC_URI_FOR_137=
 RPC_URI_FOR_250=
 RPC_URI_FOR_8453=
 RPC_URI_FOR_42161=

INSTALL.md

@@ -25,6 +25,7 @@ Run `nano /etc/systemd/system/server.conf` and put the environment variables in
 ```
 RPC_URI_FOR_1=
 RPC_URI_FOR_10=
+RPC_URI_FOR_137=
 RPC_URI_FOR_250=
 RPC_URI_FOR_8453=
 RPC_URI_FOR_42161=

README.md

@@ -10,6 +10,7 @@ First, ensure [Docker](https://docs.docker.com/get-started/overview/) is install
 ```
 RPC_URI_FOR_1=
 RPC_URI_FOR_10=
+RPC_URI_FOR_137=
 RPC_URI_FOR_250=
 RPC_URI_FOR_8453=
 RPC_URI_FOR_42161=
@@ -28,6 +29,7 @@ First, ensure [Go](https://go.dev/) is installed on your system. then, clone the
 ```
 RPC_URI_FOR_1=
 RPC_URI_FOR_10=
+RPC_URI_FOR_137=
 RPC_URI_FOR_250=
 RPC_URI_FOR_8453=
 RPC_URI_FOR_42161=
@@ -54,7 +56,7 @@ curl http://localhost:8080/1/vaults/all
 
 ## Endpoints
 `GET` `[BASE_URL]/[chainID]/vaults/all`  
-> This endpoint returns all the vaults of the specified chainID. Supported chains are `1`, `10`, `250`, `8453` and `42161`.  
+> This endpoint returns all the vaults of the specified chainID. Supported chains are `1`, `10`, `137`, `250`, `8453` and `42161`.  
 >  
 > **Query**  
 `?skip=N` will skip N vault from the graphQL query. Default is `0`  
@@ -66,7 +68,7 @@ curl http://localhost:8080/1/vaults/all
 -------
 
 `GET` `[BASE_URL]/[chainID]/vaults/[address]`  
-> This endpoint returns the vault matching the specified address, for the specified chainID. Supported chains are `1`, `10`, `250`, `8453`, and `42161`.  
+> This endpoint returns the vault matching the specified address, for the specified chainID. Supported chains are `1`, `10`, `137`, `250`, `8453`, and `42161`.  
 >  
 > **Query**  
 > `?strategiesCondition=debtLimit|inQueue|absolute` will select the "active" strategies based on the specified strategy. Default is `debtLimit`  

cmd/daemons.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/yearn/ydaemon/common/env"
-	"github.com/yearn/ydaemon/common/helpers"
 	"github.com/yearn/ydaemon/common/logs"
 	"github.com/yearn/ydaemon/external/partners"
 	"github.com/yearn/ydaemon/external/vaults"
@@ -47,7 +46,7 @@ func runDaemonWithBlocks(chainID uint64, startBlock uint64, endBlock *uint64, wg
 
 // SummonDaemons is a function that summons the daemons for a given chainID.
 func SummonDaemons(chainID uint64) {
-	if !helpers.Contains(env.SUPPORTED_CHAIN_IDS, chainID) {
+	if _, ok := env.CHAINS[chainID]; !ok {
 		return
 	}
 
@@ -70,7 +69,7 @@ func SummonDaemons(chainID uint64) {
 
 // LoadDaemons is a function that loads the previous store state for a given chainID
 func LoadDaemons(chainID uint64) {
-	if !helpers.Contains(env.SUPPORTED_CHAIN_IDS, chainID) {
+	if _, ok := env.CHAINS[chainID]; !ok {
 		return
 	}
 

cmd/flags.chains.go

@@ -9,35 +9,21 @@ import (
 	"github.com/yearn/ydaemon/common/helpers"
 )
 
-type arrayFlags []string
+type arrayFlags string
 
-var chainFlag arrayFlags
-
-func (i *arrayFlags) String() string {
-	defaultSupportedChains := env.SUPPORTED_CHAIN_IDS
-	supportedChainsString := ``
-	for _, chainID := range defaultSupportedChains {
-		supportedChainsString += strconv.FormatUint(chainID, 10) + ` `
-	}
-	supportedChainsString = strings.Trim(supportedChainsString, ` `)
-	return supportedChainsString
-}
-func (i *arrayFlags) Set(value string) error {
-	*i = append(*i, value)
-	return nil
-}
-
-func handleChainsInitialization() []uint64 {
+func handleChainsInitialization(rawChains *string) []uint64 {
 	/**********************************************************************************************
 	** chainFlag is an array of strings, so we need to convert it to an array of uint64, excluding
 	** any invalid chain IDs or duplicates.
 	**********************************************************************************************/
-	for _, chainIDString := range chainFlag {
+	chainStr := strings.Split(*rawChains, `,`)
+
+	for _, chainIDString := range chainStr {
 		chainID, err := strconv.ParseUint(chainIDString, 10, 64)
 		if err != nil {
 			continue
 		}
-		if !helpers.Contains(env.SUPPORTED_CHAIN_IDS, chainID) {
+		if _, ok := env.CHAINS[chainID]; !ok {
 			continue
 		}
 		if helpers.Contains(chains, chainID) {

cmd/flags.go

@@ -14,9 +14,9 @@ func initFlags() {
 	/**********************************************************************************************
 	** Flag group: Chains
 	** Description: List of chain IDs to run yDaemon for
-	** Default: All supported chains (1, 10, 250, 8453, 42161)
+	** Default: All supported chains (1, 10, 137, 250, 8453, 42161)
 	**********************************************************************************************/
-	flag.Var(&chainFlag, "chains", `List of chain IDs to run yDaemon for: --chains 1 10 250 8453 42161`)
+	rawChains := flag.String(`chains`, `1,10,137,250,8453,42161`, `List of chain IDs to run yDaemon for: --chains 1,10,137,250,8453,42161`)
 
 	/**********************************************************************************************
 	** Flag group: Sentry
@@ -44,7 +44,7 @@ func initFlags() {
 		endBlock = nil
 	}
 
-	handleChainsInitialization()
+	handleChainsInitialization(rawChains)
 	handleSentryInitialization()
 	handleProcessInitialization(rawProcess)
 }

cmd/server.go

@@ -63,6 +63,7 @@ func NewRouter() *gin.Engine {
 		router.GET(`:chainID/vaults/apy/:address`, c.GetVaultsVisionAPY)
 		router.GET(`:chainID/earned/:address/:vaults`, c.GetEarnedPerVaultPerUser)
 		router.GET(`:chainID/earned/:address`, c.GetEarnedPerUser)
+		router.GET(`earned/:address`, c.GetEarnedPerUserForAllChains)
 
 		// Retrieve the strategies for a specific chainID
 		router.GET(`:chainID/strategies/all`, c.GetAllStrategies)

cmd/status.go

@@ -5,7 +5,7 @@ import "github.com/yearn/ydaemon/common/env"
 var STATUS_FOR_CHAINID = map[uint64]string{}
 
 func init() {
-	for _, chainID := range env.SUPPORTED_CHAIN_IDS {
+	for chainID := range env.CHAINS {
 		setStatusForChainID(chainID, "Not Started")
 	}
 }