blockhistory config + allow disable bumping

smartcontractkit · May 28, 2024 · cc51a84 · cc51a84
1 parent cbe294d
commit cc51a84
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 8 deletions.
diff --git a/pkg/solana/config/config.go b/pkg/solana/config/config.go
@@ -27,7 +27,8 @@ var defaultConfigSet = configSet{
 	ComputeUnitPriceMax:     1_000,
 	ComputeUnitPriceMin:     0,
 	ComputeUnitPriceDefault: 0,
-	FeeBumpPeriod:           3 * time.Second,
+	FeeBumpPeriod:           3 * time.Second, // set to 0 to disable fee bumping
+	BlockHistoryPollPeriod:  5 * time.Second,
 }
 
 //go:generate mockery --name Config --output ./mocks/ --case=underscore --filename config.go
@@ -49,6 +50,7 @@ type Config interface {
 	ComputeUnitPriceMin() uint64
 	ComputeUnitPriceDefault() uint64
 	FeeBumpPeriod() time.Duration
+	BlockHistoryPollPeriod() time.Duration
 }
 
 // opt: remove
@@ -69,6 +71,7 @@ type configSet struct {
 	ComputeUnitPriceMin     uint64
 	ComputeUnitPriceDefault uint64
 	FeeBumpPeriod           time.Duration
+	BlockHistoryPollPeriod  time.Duration
 }
 
 type Chain struct {
@@ -87,6 +90,7 @@ type Chain struct {
 	ComputeUnitPriceMin     *uint64
 	ComputeUnitPriceDefault *uint64
 	FeeBumpPeriod           *config.Duration
+	BlockHistoryPollPeriod  *config.Duration
 }
 
 func (c *Chain) SetDefaults() {
@@ -136,6 +140,9 @@ func (c *Chain) SetDefaults() {
 	if c.FeeBumpPeriod == nil {
 		c.FeeBumpPeriod = config.MustNewDuration(defaultConfigSet.FeeBumpPeriod)
 	}
+	if c.BlockHistoryPollPeriod == nil {
+		c.BlockHistoryPollPeriod = config.MustNewDuration(defaultConfigSet.BlockHistoryPollPeriod)
+	}
 }
 
 type Node struct {

diff --git a/pkg/solana/config/mocks/config.go b/pkg/solana/config/mocks/config.go
diff --git a/pkg/solana/config/toml.go b/pkg/solana/config/toml.go
@@ -176,6 +176,9 @@ func setFromChain(c, f *Chain) {
 	if f.FeeBumpPeriod != nil {
 		c.FeeBumpPeriod = f.FeeBumpPeriod
 	}
+	if f.BlockHistoryPollPeriod != nil {
+		c.BlockHistoryPollPeriod = f.BlockHistoryPollPeriod
+	}
 }
 
 func (c *TOMLConfig) ValidateConfig() (err error) {
@@ -268,6 +271,10 @@ func (c *TOMLConfig) FeeBumpPeriod() time.Duration {
 	return c.Chain.FeeBumpPeriod.Duration()
 }
 
+func (c *TOMLConfig) BlockHistoryPollPeriod() time.Duration {
+	return c.Chain.BlockHistoryPollPeriod.Duration()
+}
+
 func (c *TOMLConfig) ListNodes() Nodes {
 	return c.Nodes
 }

diff --git a/pkg/solana/fees/block_history.go b/pkg/solana/fees/block_history.go
@@ -15,10 +15,6 @@ import (
 	"github.com/smartcontractkit/chainlink-solana/pkg/solana/config"
 )
 
-var (
-	feePolling = 5 * time.Second // TODO: make configurable
-)
-
 var _ Estimator = &blockHistoryEstimator{}
 
 type blockHistoryEstimator struct {
@@ -70,7 +66,7 @@ func (bhe *blockHistoryEstimator) run() {
 			}
 		}
 
-		tick = time.After(utils.WithJitter(feePolling))
+		tick = time.After(utils.WithJitter(bhe.cfg.BlockHistoryPollPeriod()))
 	}
 }
 

diff --git a/pkg/solana/txm/txm.go b/pkg/solana/txm/txm.go
@@ -237,8 +237,8 @@ func (txm *Txm) sendWithRetry(chanCtx context.Context, baseTx solanaGo.Transacti
 				return
 			case <-tick:
 				var shouldBump bool
-				// TODO: be able to enable / disable bumping
-				if time.Since(bumpTime) > txm.cfg.FeeBumpPeriod() {
+				// bump if period > 0 and past time
+				if txm.cfg.FeeBumpPeriod() != 0 && time.Since(bumpTime) > txm.cfg.FeeBumpPeriod() {
 					bumpCount++
 					bumpTime = time.Now()
 					shouldBump = true