feat: backport substrate code from relayer (#9)

sprintertech · Oct 5, 2023 · 299cefd · 299cefd
1 parent 4e1c654
commit 299cefd
Show file tree

Hide file tree

Showing 19 changed files with 943 additions and 734 deletions.
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Fork the repository, make changes and open a PR to the `main` branch of the repo
 A great way to contribute to the project is to send a detailed report when you encounter an issue. We always appreciate a well-written, thorough bug report, and will thank you for it!
 
 When reporting issues, always include:
- - chainbridge-core version
+ - sygma-core version
  - modules used
  - logs (don't forget to remove sensitive data)
  - tx hashes related to issue (if applicable)

diff --git a/chains/evm/chain.go b/chains/evm/chain.go
@@ -5,73 +5,57 @@ package evm
 
 import (
 	"context"
-	"fmt"
 	"math/big"
 
 	"github.com/ChainSafe/sygma-core/store"
 	"github.com/ChainSafe/sygma-core/types"
+	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 )
 
 type EventListener interface {
-	ListenToEvents(ctx context.Context, startBlock *big.Int, errChan chan<- error)
+	ListenToEvents(ctx context.Context, startBlock *big.Int)
 }
 
 type ProposalExecutor interface {
-	Execute(message *types.Message) error
+	Execute(messages []*types.Message) error
 }
 
 // EVMChain is struct that aggregates all data required for
 type EVMChain struct {
 	listener   EventListener
-	writer     ProposalExecutor
+	executor   ProposalExecutor
 	blockstore *store.BlockStore
 
-	domainID    uint8
-	startBlock  *big.Int
-	freshStart  bool
-	latestBlock bool
+	domainID   uint8
+	startBlock *big.Int
+
+	logger zerolog.Logger
 }
 
-func NewEVMChain(listener EventListener, writer ProposalExecutor, blockstore *store.BlockStore, domainID uint8, startBlock *big.Int, latestBlock bool, freshStart bool) *EVMChain {
+func NewEVMChain(listener EventListener, executor ProposalExecutor, blockstore *store.BlockStore, domainID uint8, startBlock *big.Int) *EVMChain {
 	return &EVMChain{
-		listener:    listener,
-		writer:      writer,
-		blockstore:  blockstore,
-		domainID:    domainID,
-		startBlock:  startBlock,
-		latestBlock: latestBlock,
-		freshStart:  freshStart,
+		listener:   listener,
+		executor:   executor,
+		blockstore: blockstore,
+		domainID:   domainID,
+		startBlock: startBlock,
+		logger:     log.With().Uint8("domainID", domainID).Logger(),
 	}
 }
 
 // PollEvents is the goroutine that polls blocks and searches Deposit events in them.
 // Events are then sent to eventsChan.
-func (c *EVMChain) PollEvents(ctx context.Context, sysErr chan<- error) {
-	log.Info().Msg("Polling Blocks...")
-
-	startBlock, err := c.blockstore.GetStartBlock(
-		c.domainID,
-		c.startBlock,
-		c.latestBlock,
-		c.freshStart,
-	)
-	if err != nil {
-		sysErr <- fmt.Errorf("error %w on getting last stored block", err)
-		return
-	}
-
-	go c.listener.ListenToEvents(ctx, startBlock, sysErr)
+func (c *EVMChain) PollEvents(ctx context.Context) {
+	c.logger.Info().Str("startBlock", c.startBlock.String()).Msg("Polling Blocks...")
+	go c.listener.ListenToEvents(ctx, c.startBlock)
 }
 
-func (c *EVMChain) Write(msg []*types.Message) error {
-	for _, msg := range msg {
-		go func(msg *types.Message) {
-			err := c.writer.Execute(msg)
-			if err != nil {
-				log.Err(err).Msgf("Failed writing message %v", msg)
-			}
-		}(msg)
+func (c *EVMChain) Write(msgs []*types.Message) error {
+	err := c.executor.Execute(msgs)
+	if err != nil {
+		c.logger.Err(err).Msgf("error writing messages %+v on network %d", msgs, c.DomainID())
+		return err
 	}
 
 	return nil

diff --git a/chains/evm/listener/listener.go b/chains/evm/listener/listener.go
@@ -67,7 +67,7 @@ func NewEVMListener(
 
 // ListenToEvents goes block by block of a network and executes event handlers that are
 // configured for the listener.
-func (l *EVMListener) ListenToEvents(ctx context.Context, startBlock *big.Int, errChn chan<- error) {
+func (l *EVMListener) ListenToEvents(ctx context.Context, startBlock *big.Int) {
 	endBlock := big.NewInt(0)
 	for {
 		select {

diff --git a/chains/evm/transactor/transaction/transaction_test.go b/chains/evm/transactor/transaction/transaction_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ChainSafe/sygma-core/chains/evm/transactor/gas"
 	"github.com/ChainSafe/sygma-core/chains/evm/transactor/transaction"
-	"github.com/ChainSafe/sygma-core/crypto/keystore"
+	"github.com/ChainSafe/sygma-core/crypto/secp256k1"
 	"github.com/ChainSafe/sygma-core/mock"
 
 	"github.com/ethereum/go-ethereum/core/types"
@@ -17,7 +17,7 @@ import (
 	"go.uber.org/mock/gomock"
 )
 
-var aliceKp = keystore.TestKeyRing.EthereumKeys[keystore.AliceKey]
+var aliceKp, _ = secp256k1.NewKeypairFromString("b1370fac45517e19e27e16a2a31da07b9775d3a3bceb77a78f790f99655aa668")
 
 type EVMTxTestSuite struct {
 	suite.Suite

diff --git a/chains/substrate/chain.go b/chains/substrate/chain.go
@@ -0,0 +1,64 @@
+package substrate
+
+import (
+	"context"
+	"math/big"
+
+	"github.com/ChainSafe/sygma-core/chains/substrate/client"
+	"github.com/ChainSafe/sygma-core/store"
+	"github.com/ChainSafe/sygma-core/types"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+)
+
+type BatchProposalExecutor interface {
+	Execute(msgs []*types.Message) error
+}
+
+type SubstrateChain struct {
+	client *client.SubstrateClient
+
+	listener EventListener
+	executor BatchProposalExecutor
+
+	blockstore *store.BlockStore
+
+	domainID   uint8
+	startBlock *big.Int
+
+	logger zerolog.Logger
+}
+
+type EventListener interface {
+	ListenToEvents(ctx context.Context, startBlock *big.Int)
+}
+
+func NewSubstrateChain(client *client.SubstrateClient, listener EventListener, blockstore *store.BlockStore, executor BatchProposalExecutor, domainID uint8, startBlock *big.Int) *SubstrateChain {
+	return &SubstrateChain{
+		client:     client,
+		listener:   listener,
+		blockstore: blockstore,
+		executor:   executor,
+		logger:     log.With().Uint8("domainID", domainID).Logger()}
+}
+
+// PollEvents is the goroutine that polls blocks and searches Deposit events in them.
+// Events are then sent to eventsChan.
+func (c *SubstrateChain) PollEvents(ctx context.Context) {
+	c.logger.Info().Str("startBlock", c.startBlock.String()).Msg("Polling Blocks...")
+	go c.listener.ListenToEvents(ctx, c.startBlock)
+}
+
+func (c *SubstrateChain) Write(msgs []*types.Message) error {
+	err := c.executor.Execute(msgs)
+	if err != nil {
+		c.logger.Err(err).Msgf("error writing messages %+v on network %d", msgs, c.DomainID())
+		return err
+	}
+
+	return nil
+}
+
+func (c *SubstrateChain) DomainID() uint8 {
+	return c.domainID
+}