Apply Dynamic cfg to p2 & p3 cases

Makefile

@@ -263,7 +263,7 @@ docsgen-cli: curio sptool
 .PHONY: docsgen-cli
 
 go-generate:
-	$(GOCC) generate ./...
+	LANG=en-US $(GOCC) generate ./...
 .PHONY: go-generate
 
 gen: gensimple
@@ -317,6 +317,9 @@ update/lotus: $(lotus_src_dir)
 	cd $(lotus_src_dir) && git pull
 .PHONY: update/lotus
 
+docker/testdb:
+	docker run -d --name yugabyte -p7001:7000 -p9000:9000 -p15433:15433 -p5433:5433 -p9042:9042  yugabytedb/yugabyte bin/yugabyted start  --background=false
+
 docker/lotus-all-in-one: info/lotus-all-in-one | $(lotus_src_dir)
 	cd $(lotus_src_dir) && $(curio_docker_build_cmd) -f Dockerfile --target lotus-all-in-one \
 		-t $(lotus_base_image) --build-arg GOFLAGS=-tags=debug .

alertmanager/alerts.go

@@ -107,6 +107,7 @@ func balanceCheck(al *alerts) {
 		return
 	}
 
+	minBalance := abi.TokenAmount(al.cfg.MinimumWalletBalance.Get())
 	for _, addr := range uniqueAddrs {
 		keyAddr, err := al.api.StateAccountKey(al.ctx, addr, types.EmptyTSK)
 		if err != nil {
@@ -129,7 +130,7 @@ func balanceCheck(al *alerts) {
 			al.alertMap[Name].err = err
 		}
 
-		if abi.TokenAmount(al.cfg.MinimumWalletBalance).GreaterThanEqual(balance) {
+		if minBalance.GreaterThanEqual(balance) {
 			ret += fmt.Sprintf("Balance for wallet %s (%s) is below 5 Fil. ", addr, keyAddr)
 		}
 	}

alertmanager/plugin/pager_duty.go

@@ -49,7 +49,7 @@ func (p *PagerDuty) SendAlert(data *AlertPayload) error {
 	}
 
 	payload := &pdData{
-		RoutingKey:  p.cfg.PageDutyIntegrationKey,
+		RoutingKey:  p.cfg.PageDutyIntegrationKey.Get(),
 		EventAction: "trigger",
 		Payload: &pdPayload{
 			Summary:       data.Summary,
@@ -64,7 +64,7 @@ func (p *PagerDuty) SendAlert(data *AlertPayload) error {
 		return fmt.Errorf("error marshaling JSON: %w", err)
 	}
 
-	req, err := http.NewRequest("POST", p.cfg.PagerDutyEventURL, bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest("POST", p.cfg.PagerDutyEventURL.Get(), bytes.NewBuffer(jsonData))
 	if err != nil {
 		return fmt.Errorf("error creating request: %w", err)
 	}

alertmanager/plugin/plugin.go

@@ -24,19 +24,34 @@ type AlertPayload struct {
 
 var TestPlugins []Plugin
 
-func LoadAlertPlugins(cfg config.CurioAlertingConfig) []Plugin {
-	var plugins []Plugin
-	if cfg.PagerDuty.Enable {
-		plugins = append(plugins, NewPagerDuty(cfg.PagerDuty))
+func LoadAlertPlugins(cfg config.CurioAlertingConfig) *config.Dynamic[[]Plugin] {
+	pluginsDynamic := config.NewDynamic([]Plugin{})
+	collectPlugins := func() []Plugin {
+		var plugins []Plugin
+		if cfg.PagerDuty.Enable.Get() {
+			plugins = append(plugins, NewPagerDuty(cfg.PagerDuty))
+		}
+		if cfg.PrometheusAlertManager.Enable.Get() {
+			plugins = append(plugins, NewPrometheusAlertManager(cfg.PrometheusAlertManager))
+		}
+		if cfg.SlackWebhook.Enable.Get() {
+			plugins = append(plugins, NewSlackWebhook(cfg.SlackWebhook))
+		}
+		if len(TestPlugins) > 0 {
+			plugins = append(plugins, TestPlugins...)
+		}
+		return plugins
 	}
-	if cfg.PrometheusAlertManager.Enable {
-		plugins = append(plugins, NewPrometheusAlertManager(cfg.PrometheusAlertManager))
-	}
-	if cfg.SlackWebhook.Enable {
-		plugins = append(plugins, NewSlackWebhook(cfg.SlackWebhook))
-	}
-	if len(TestPlugins) > 0 {
-		plugins = append(plugins, TestPlugins...)
-	}
-	return plugins
+	pluginsDynamic.Set(collectPlugins())
+	cfg.PagerDuty.Enable.OnChange(func() {
+		pluginsDynamic.Set(collectPlugins())
+	})
+	cfg.PrometheusAlertManager.Enable.OnChange(func() {
+		pluginsDynamic.Set(collectPlugins())
+	})
+	cfg.SlackWebhook.Enable.OnChange(func() {
+		pluginsDynamic.Set(collectPlugins())
+	})
+
+	return pluginsDynamic
 }

alertmanager/plugin/prometheus_alertmanager.go

@@ -60,7 +60,7 @@ func (p *PrometheusAlertManager) SendAlert(data *AlertPayload) error {
 	if err != nil {
 		return fmt.Errorf("error marshaling JSON: %w", err)
 	}
-	req, err := http.NewRequest("POST", p.cfg.AlertManagerURL, bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest("POST", p.cfg.AlertManagerURL.Get(), bytes.NewBuffer(jsonData))
 	if err != nil {
 		return fmt.Errorf("error creating request: %w", err)
 	}

alertmanager/plugin/slack_webhook.go

@@ -127,7 +127,7 @@ func (s *SlackWebhook) SendAlert(data *AlertPayload) error {
 		return xerrors.Errorf("Error marshaling JSON: %w", err)
 	}
 
-	req, err := http.NewRequest("POST", s.cfg.WebHookURL, bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest("POST", s.cfg.WebHookURL.Get(), bytes.NewBuffer(jsonData))
 	if err != nil {
 		return fmt.Errorf("error creating request: %w", err)
 	}

alertmanager/task_alert.go

@@ -49,7 +49,7 @@ type AlertTask struct {
 	api     AlertAPI
 	cfg     config.CurioAlertingConfig
 	db      *harmonydb.DB
-	plugins []plugin.Plugin
+	plugins *config.Dynamic[[]plugin.Plugin]
 	al      *curioalerting.AlertingSystem
 }
 
@@ -95,7 +95,7 @@ func NewAlertTask(
 }
 
 func (a *AlertTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done bool, err error) {
-	if len(a.plugins) == 0 {
+	if len(a.plugins.Get()) == 0 {
 		log.Warnf("No alert plugins enabled, not sending an alert")
 		return true, nil
 	}
@@ -148,7 +148,7 @@ func (a *AlertTask) Do(taskID harmonytask.TaskID, stillOwned func() bool) (done
 		}
 
 		var errs []error
-		for _, ap := range a.plugins {
+		for _, ap := range a.plugins.Get() {
 			err = ap.SendAlert(payloadData)
 			if err != nil {
 				log.Errorf("Error sending alert: %s", err)

api/ethclient.go

@@ -0,0 +1,53 @@
+package api
+
+import (
+	"context"
+	mathbig "math/big"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	erpc "github.com/ethereum/go-ethereum/rpc"
+)
+
+type EthClientInterface interface {
+	ChainID(ctx context.Context) (*mathbig.Int, error)
+	BlockByHash(ctx context.Context, hash common.Hash) (*ethtypes.Block, error)
+	BlockByNumber(ctx context.Context, number *mathbig.Int) (*ethtypes.Block, error)
+	BlockNumber(ctx context.Context) (uint64, error)
+	PeerCount(ctx context.Context) (uint64, error)
+	BlockReceipts(ctx context.Context, blockNrOrHash erpc.BlockNumberOrHash) ([]*ethtypes.Receipt, error)
+	HeaderByHash(ctx context.Context, hash common.Hash) (*ethtypes.Header, error)
+	HeaderByNumber(ctx context.Context, number *mathbig.Int) (*ethtypes.Header, error)
+	TransactionByHash(ctx context.Context, hash common.Hash) (tx *ethtypes.Transaction, isPending bool, err error)
+	TransactionSender(ctx context.Context, tx *ethtypes.Transaction, block common.Hash, index uint) (common.Address, error)
+	TransactionCount(ctx context.Context, blockHash common.Hash) (uint, error)
+	TransactionInBlock(ctx context.Context, blockHash common.Hash, index uint) (*ethtypes.Transaction, error)
+	TransactionReceipt(ctx context.Context, txHash common.Hash) (*ethtypes.Receipt, error)
+	SyncProgress(ctx context.Context) (*ethereum.SyncProgress, error)
+	SubscribeNewHead(ctx context.Context, ch chan<- *ethtypes.Header) (ethereum.Subscription, error)
+	NetworkID(ctx context.Context) (*mathbig.Int, error)
+	BalanceAt(ctx context.Context, account common.Address, blockNumber *mathbig.Int) (*mathbig.Int, error)
+	BalanceAtHash(ctx context.Context, account common.Address, blockHash common.Hash) (*mathbig.Int, error)
+	StorageAt(ctx context.Context, account common.Address, key common.Hash, blockNumber *mathbig.Int) ([]byte, error)
+	StorageAtHash(ctx context.Context, account common.Address, key common.Hash, blockHash common.Hash) ([]byte, error)
+	CodeAt(ctx context.Context, account common.Address, blockNumber *mathbig.Int) ([]byte, error)
+	CodeAtHash(ctx context.Context, account common.Address, blockHash common.Hash) ([]byte, error)
+	NonceAt(ctx context.Context, account common.Address, blockNumber *mathbig.Int) (uint64, error)
+	NonceAtHash(ctx context.Context, account common.Address, blockHash common.Hash) (uint64, error)
+	FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]ethtypes.Log, error)
+	SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQuery, ch chan<- ethtypes.Log) (ethereum.Subscription, error)
+	PendingBalanceAt(ctx context.Context, account common.Address) (*mathbig.Int, error)
+	PendingStorageAt(ctx context.Context, account common.Address, key common.Hash) ([]byte, error)
+	PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error)
+	PendingNonceAt(ctx context.Context, account common.Address) (uint64, error)
+	PendingTransactionCount(ctx context.Context) (uint, error)
+	CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *mathbig.Int) ([]byte, error)
+	CallContractAtHash(ctx context.Context, msg ethereum.CallMsg, blockHash common.Hash) ([]byte, error)
+	PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error)
+	SuggestGasPrice(ctx context.Context) (*mathbig.Int, error)
+	SuggestGasTipCap(ctx context.Context) (*mathbig.Int, error)
+	FeeHistory(ctx context.Context, blockCount uint64, lastBlock *mathbig.Int, rewardPercentiles []float64) (*ethereum.FeeHistory, error)
+	EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error)
+	SendTransaction(ctx context.Context, tx *ethtypes.Transaction) error
+}

api/gen/api/proxygen.go

@@ -103,10 +103,13 @@ func typeName(e ast.Expr, pkg string) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		if t.Dir == ast.SEND {
-			subt = "->chan " + subt
-		} else {
+		switch t.Dir {
+		case ast.SEND:
+			subt = "chan<- " + subt
+		case ast.RECV:
 			subt = "<-chan " + subt
+		default:
+			subt = "chan " + subt
 		}
 		return subt, nil
 	default:
@@ -217,20 +220,26 @@ func generate(path, pkg, outpkg, outfile string) error {
 
 					defRes := ""
 					if len(results) > 1 {
-						defRes = results[0]
-						switch {
-						case defRes[0] == '*' || defRes[0] == '<', defRes == "interface{}":
-							defRes = "nil"
-						case defRes == "bool":
-							defRes = "false"
-						case defRes == "string":
-							defRes = `""`
-						case defRes == "int", defRes == "int64", defRes == "uint64", defRes == "uint":
-							defRes = "0"
-						default:
-							defRes = "*new(" + defRes + ")"
+						// Generate default values for all non-error return values
+						var defaults []string
+						for i := 0; i < len(results)-1; i++ {
+							r := results[i]
+							var def string
+							switch {
+							case r[0] == '*' || r[0] == '<', r == "interface{}", strings.HasPrefix(r, "chan"):
+								def = "nil"
+							case r == "bool":
+								def = "false"
+							case r == "string":
+								def = `""`
+							case r == "int", r == "int64", r == "uint64", r == "uint":
+								def = "0"
+							default:
+								def = "*new(" + r + ")"
+							}
+							defaults = append(defaults, def)
 						}
-						defRes += ", "
+						defRes = strings.Join(defaults, ", ") + ", "
 					}
 
 					info.Methods[mname] = &methodInfo{
@@ -275,7 +284,7 @@ func generate(path, pkg, outpkg, outfile string) error {
 		return err
 	}
 
-	err = doTemplate(w, m, `// Code generated by github.com/filecoin-project/curio/gen/api. DO NOT EDIT.
+	err = doTemplate(w, m, `// Code generated by github.com/filecoin-project/curio/api/gen. DO NOT EDIT.
 
 package {{.OutPkg}}