fix: fix extrinsic failed event not throwing error (#191)

sygmaprotocol · Jun 7, 2023 · c45f3ee · c45f3ee
1 parent 12e06d0
commit c45f3ee
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/chains/evm/executor/executor.go b/chains/evm/executor/executor.go
@@ -144,6 +144,10 @@ func (e *Executor) watchExecution(ctx context.Context, cancelExecution context.C
 		case sigResult := <-sigChn:
 			{
 				cancelExecution()
+				if sigResult == nil {
+					continue
+				}
+
 				signatureData := sigResult.(*common.SignatureData)
 				hash, err := e.executeProposal(proposals, signatureData)
 				if err != nil {

diff --git a/chains/substrate/client/client.go b/chains/substrate/client/client.go
@@ -183,6 +183,9 @@ func (c *SubstrateClient) checkExtrinsicSuccess(extHash types.Hash, blockHash ty
 		if event.Name == events.ExtrinsicFailedEvent {
 			return fmt.Errorf("extrinsic failed")
 		}
+		if event.Name == events.FailedHandlerExecutionEvent {
+			return fmt.Errorf("extrinsic failed with failed handler execution")
+		}
 		if event.Name == events.ExtrinsicSuccessEvent {
 			return nil
 		}

diff --git a/chains/substrate/events/events.go b/chains/substrate/events/events.go
@@ -22,9 +22,10 @@ type Retry struct {
 }
 
 const (
-	CodeUpdatedEvent      = "System.CodeUpdated"
-	ExtrinsicFailedEvent  = "System.ExtrinsicFailed"
-	ExtrinsicSuccessEvent = "System.ExtrinsicSuccess"
-	RetryEvent            = "SygmaBridge.Retry"
-	DepositEvent          = "SygmaBridge.Deposit"
+	CodeUpdatedEvent            = "System.CodeUpdated"
+	ExtrinsicFailedEvent        = "System.ExtrinsicFailed"
+	ExtrinsicSuccessEvent       = "System.ExtrinsicSuccess"
+	RetryEvent                  = "SygmaBridge.Retry"
+	DepositEvent                = "SygmaBridge.Deposit"
+	FailedHandlerExecutionEvent = "SygmaBridge.FailedHandlerExecution"
 )
diff --git a/chains/substrate/executor/executor.go b/chains/substrate/executor/executor.go
@@ -125,6 +125,7 @@ func (e *Executor) Execute(msgs []*message.Message) error {
 	sigChn := make(chan interface{})
 	executionContext, cancelExecution := context.WithCancel(context.Background())
 	watchContext, cancelWatch := context.WithCancel(context.Background())
+
 	pool := pool.New().WithErrors()
 	pool.Go(func() error {
 		err := e.coordinator.Execute(executionContext, signing, sigChn)
@@ -152,6 +153,9 @@ func (e *Executor) watchExecution(ctx context.Context, cancelExecution context.C
 		case sigResult := <-sigChn:
 			{
 				cancelExecution()
+				if sigResult == nil {
+					continue
+				}
 
 				signatureData := sigResult.(*common.SignatureData)
 				hash, sub, err := e.executeProposal(proposals, signatureData)

diff --git a/chains/substrate/pallet/pallet.go b/chains/substrate/pallet/pallet.go
@@ -4,7 +4,6 @@
 package pallet
 
 import (
-	"math/big"
 	"strconv"
 
 	"github.com/ChainSafe/sygma-relayer/chains"
@@ -69,9 +68,10 @@ func (p *Pallet) IsProposalExecuted(prop *chains.Proposal) (bool, error) {
 		Str("resourceID", hexutil.Encode(prop.ResourceID[:])).
 		Msg("Getting is proposal executed")
 	var res bool
-	err := p.Conn.Call(res, "sygma_isProposalExecuted", big.NewInt(int64(prop.DepositNonce)), big.NewInt(int64(prop.OriginDomainID)))
+	err := p.Conn.Call(&res, "sygma_isProposalExecuted", prop.DepositNonce, prop.OriginDomainID)
 	if err != nil {
 		return false, err
 	}
+
 	return res, nil
 }
diff --git a/tss/signing/signing.go b/tss/signing/signing.go
@@ -199,6 +199,8 @@ func (s *Signing) processEndMessage(ctx context.Context, endChn chan tssCommon.S
 
 				if s.coordinator {
 					s.resultChn <- &sig
+				} else {
+					s.resultChn <- nil
 				}
 
 				return nil

diff --git a/tss/signing/signing_test.go b/tss/signing/signing_test.go
@@ -67,8 +67,12 @@ func (s *SigningTestSuite) Test_ValidSigningProcess() {
 		})
 	}
 
-	sig := <-resultChn
-	s.NotNil(sig)
+	sig1 := <-resultChn
+	sig2 := <-resultChn
+	s.NotEqual(sig1, sig2)
+	if sig1 == nil && sig2 == nil {
+		s.Fail("signature is nil")
+	}
 
 	time.Sleep(time.Millisecond * 100)
 	cancel()