end block

noble-assets · Mar 4, 2024 · c4c9370 · c4c9370
1 parent d469119
commit c4c9370
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/ethereum/chain.go b/ethereum/chain.go
@@ -24,6 +24,7 @@ type Ethereum struct {
 	wsURL                     string
 	messageTransmitterAddress string
 	startBlock                uint64
+	endBlock                  uint64
 	lookbackPeriod            uint64
 	privateKey                *ecdsa.PrivateKey
 	minterAddress             string
@@ -42,6 +43,7 @@ func NewChain(
 	wsURL string,
 	messageTransmitterAddress string,
 	startBlock uint64,
+	endBlock uint64,
 	lookbackPeriod uint64,
 	privateKey string,
 	maxRetries int,
@@ -60,6 +62,7 @@ func NewChain(
 		wsURL:                     wsURL,
 		messageTransmitterAddress: messageTransmitterAddress,
 		startBlock:                startBlock,
+		endBlock:                  endBlock,
 		lookbackPeriod:            lookbackPeriod,
 		privateKey:                privEcdsaKey,
 		minterAddress:             ethereumAddress,

diff --git a/ethereum/config.go b/ethereum/config.go
@@ -14,6 +14,7 @@ type ChainConfig struct {
 	MessageTransmitter string `yaml:"message-transmitter"`
 
 	StartBlock     uint64 `yaml:"start-block"`
+	EndBlock       uint64 `yaml:"end-block"`
 	LookbackPeriod uint64 `yaml:"lookback-period"`
 
 	BroadcastRetries       int `yaml:"broadcast-retries"`
@@ -34,6 +35,7 @@ func (c *ChainConfig) Chain(name string) (types.Chain, error) {
 		c.WS,
 		c.MessageTransmitter,
 		c.StartBlock,
+		c.EndBlock,
 		c.LookbackPeriod,
 		c.MinterPrivateKey,
 		c.BroadcastRetries,

diff --git a/ethereum/listener.go b/ethereum/listener.go
@@ -61,6 +61,14 @@ func (e *Ethereum) StartListener(
 		Addresses: []common.Address{messageTransmitterAddress},
 		Topics:    [][]common.Hash{{messageSent.ID}},
 		FromBlock: big.NewInt(int64(e.startBlock - e.lookbackPeriod)),
+		ToBlock:   big.NewInt(int64(e.endBlock)),
+	}
+	if e.endBlock == 0 {
+		query = ethereum.FilterQuery{
+			Addresses: []common.Address{messageTransmitterAddress},
+			Topics:    [][]common.Hash{{messageSent.ID}},
+			FromBlock: big.NewInt(int64(e.startBlock - e.lookbackPeriod)),
+		}
 	}
 
 	logger.Info(fmt.Sprintf(