Feat v3.5 implementation

bridges/ethMultiversX/bridgeExecutor.go

@@ -439,6 +439,45 @@ func (executor *bridgeExecutor) ResetRetriesCountOnMultiversX() {
 	executor.quorumRetriesOnMultiversX = 0
 }
 
+//// GetAndStoreBatchFromMultiversX fetches the logs containing sc calls metadata for the current batch from MultiversX side
+//func (executor *bridgeExecutor) GetAndStoreBatchFromMultiversX(ctx context.Context, nonce uint64) error {
+//	batch, err := executor.multiversXClient.GetBatch(ctx, nonce)
+//	if err != nil {
+//		return err
+//	}
+//
+//	isBatchInvalid := batch.ID != nonce || len(batch.Deposits) == 0
+//	if isBatchInvalid {
+//		return fmt.Errorf("%w, requested nonce: %d, fetched nonce: %d, num deposits: %d",
+//			ErrFinalBatchNotFound, nonce, batch.ID, len(batch.Deposits))
+//	}
+//
+//	batch, err = executor.addBatchSCMetadataMvx(ctx, batch)
+//	if err != nil {
+//		return err
+//	}
+//	executor.batch = batch
+//
+//	return nil
+//}
+//
+//func (executor *bridgeExecutor) addBatchSCMetadataMvx(ctx context.Context, transfers *bridgeCore.TransferBatch) (*bridgeCore.TransferBatch, error) {
+//	if transfers == nil {
+//		return nil, ErrNilBatch
+//	}
+//
+//	events, err := executor.multiversXClient.GetBatchSCMetadata(ctx, transfers.ID, transfers.BlockNumber)
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	for i, t := range transfers.Deposits {
+//		transfers.Deposits[i] = executor.addMetadataToTransfer(t, events)
+//	}
+//
+//	return transfers, nil
+//}
+
 // GetAndStoreBatchFromEthereum fetches and stores the batch from the ethereum client
 func (executor *bridgeExecutor) GetAndStoreBatchFromEthereum(ctx context.Context, nonce uint64) error {
 	batch, isFinal, err := executor.ethereumClient.GetBatch(ctx, nonce)

bridges/ethMultiversX/interface.go

@@ -25,6 +25,7 @@ type MultiversXClient interface {
 	GetLastExecutedEthBatchID(ctx context.Context) (uint64, error)
 	GetLastExecutedEthTxID(ctx context.Context) (uint64, error)
 	GetCurrentNonce(ctx context.Context) (uint64, error)
+	GetBatchSCMetadata(ctx context.Context, nonce uint64, blockNumber uint64)
 
 	ProposeSetStatus(ctx context.Context, batch *bridgeCore.TransferBatch) (string, error)
 	ProposeTransfer(ctx context.Context, batch *bridgeCore.TransferBatch) (string, error)

clients/multiversx/client.go

@@ -63,6 +63,8 @@
 	addressPublicKeyConverter    bridgeCore.AddressConverter
 	statusHandler                bridgeCore.StatusHandler
 	clientAvailabilityAllowDelta uint64
+	eventsBlockRangeFrom         uint64
+	eventsBlockRangeTo           uint64
 
 	lastNonce                uint64
 	retriesAvailabilityCheck uint64
@@ -236,6 +238,31 @@
 	return len(response) == 0 || (len(response) == 1 && len(response[0]) == 0)
 }
 
+// GetBatchSCMetadata returns the emitted logs in a batch that hold metadata for SC execution on ETH
+//func (c *client) GetBatchSCMetadata(ctx context.Context, nonce uint64, blockNumber uint64) {
+//	proxy := c.proxy
+//
+//	safeContractAddress, err := c.safeContractAddress.AddressAsBech32String()
+//	if err != nil {
+//		c.log.Error("error getting safe contract address", "error", err)
+//		return
+//	}
+//
+//	query := core.FilterQuery{
+//		Addresses: []string{safeContractAddress},
+//		Topics:    [][]byte{},
+//		FromBlock: core2.OptionalUint64{Value: blockNumber + c.eventsBlockRangeFrom, HasValue: true},
+//		ToBlock:   core2.OptionalUint64{Value: blockNumber + c.eventsBlockRangeTo, HasValue: true},
+//	}
+//
+//	logs, err := proxy.FilterLogs(ctx, &query)
+//	if err != nil {
+//		c.log.Error("error filtering logs", "error", err)
+//		return
+//	}
+//
+//}
+
 func (c *client) createPendingBatchFromResponse(ctx context.Context, responseData [][]byte) (*bridgeCore.TransferBatch, error) {
 	numFieldsForTransaction := 6
 	dataLen := len(responseData)

clients/multiversx/interface.go

@@ -22,6 +22,7 @@ type Proxy interface {
 	GetESDTTokenData(ctx context.Context, address core.AddressHandler, tokenIdentifier string, queryOptions api.AccountQueryOptions) (*data.ESDTFungibleTokenData, error)
 	GetTransactionInfoWithResults(ctx context.Context, hash string) (*data.TransactionInfo, error)
 	ProcessTransactionStatus(ctx context.Context, hexTxHash string) (transaction.TxStatus, error)
+	//FilterLogs(ctx context.Context, filter *core.FilterQuery) ([]*transaction.Events, error)
 	IsInterfaceNil() bool
 }