More cleanup

Snowfork · Feb 24, 2023 · 6e8069a · 6e8069a
1 parent 01d5dab
commit 6e8069a
Show file tree

Hide file tree

Showing 8 changed files with 211 additions and 12 deletions.
diff --git a/relayer/contracts/basic/inbound.go b/relayer/contracts/basic/inbound.go
diff --git a/relayer/contracts/generate.go b/relayer/contracts/generate.go
@@ -1,6 +1,6 @@
-//go:generate bash -c "jq .abi ../../core/packages/contracts/artifacts/contracts/utils/OpaqueProof.sol/OpaqueProof.json | abigen --abi - --type OpaqueProof --pkg opaqueproof --out opaqueproof/contract.go"
-//go:generate bash -c "jq .abi ../../core/packages/contracts/artifacts/contracts/BeefyClient.sol/BeefyClient.json | abigen --abi - --type BeefyClient --pkg beefyclient --out beefyclient/contract.go"
-//go:generate bash -c "jq .abi ../../core/packages/contracts/artifacts/contracts/BasicInboundChannel.sol/BasicInboundChannel.json | abigen --abi - --type BasicInboundChannel --pkg basic --out basic/inbound.go"
-//go:generate bash -c "jq .abi ../../core/packages/contracts/artifacts/contracts/BasicOutboundChannel.sol/BasicOutboundChannel.json | abigen --abi - --type BasicOutboundChannel --pkg basic --out basic/outbound.go"
+//go:generate bash -c "jq .abi ../../core/packages/contracts/out/OpaqueProof.sol/OpaqueProof.json | abigen --abi - --type OpaqueProof --pkg opaqueproof --out opaqueproof/contract.go"
+//go:generate bash -c "jq .abi ../../core/packages/contracts/out/BeefyClient.sol/BeefyClient.json | abigen --abi - --type BeefyClient --pkg beefyclient --out beefyclient/contract.go"
+//go:generate bash -c "jq .abi ../../core/packages/contracts/out/BasicInboundChannel.sol/BasicInboundChannel.json | abigen --abi - --type BasicInboundChannel --pkg basic --out basic/inbound.go"
+//go:generate bash -c "jq .abi ../../core/packages/contracts/out/BasicOutboundChannel.sol/BasicOutboundChannel.json | abigen --abi - --type BasicOutboundChannel --pkg basic --out basic/outbound.go"
 
 package contracts
diff --git a/relayer/go.mod b/relayer/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/magefile/mage v1.13.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/snowfork/ethashproof v0.0.0-20210729080250-93b61cd82454
-	github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230220165550-540414587385
+	github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230222084249-a54344a28717
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.8.0

diff --git a/relayer/go.sum b/relayer/go.sum
@@ -831,6 +831,8 @@ github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230220044419-4376f3e6a
 github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230220044419-4376f3e6a023/go.mod h1:MVk5+w9icYU7MViYFm7CKYhx1VMj6DpN2tWO6s4OK5g=
 github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230220165550-540414587385 h1:Tl5SWwJLIKASTKsv8F0Tg3iRAD3C4ORyJ4dMExoFZbs=
 github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230220165550-540414587385/go.mod h1:MVk5+w9icYU7MViYFm7CKYhx1VMj6DpN2tWO6s4OK5g=
+github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230222084249-a54344a28717 h1:lU66MVEQbBjLFD6idyESqCr43+nFp5K78RWtyzfeIZg=
+github.com/snowfork/go-substrate-rpc-client/v4 v4.0.1-0.20230222084249-a54344a28717/go.mod h1:MVk5+w9icYU7MViYFm7CKYhx1VMj6DpN2tWO6s4OK5g=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=

diff --git a/relayer/relays/beefy/ethereum-writer.go b/relayer/relays/beefy/ethereum-writer.go
@@ -259,7 +259,7 @@ func (wr *EthereumWriter) doSubmitInitial(ctx context.Context, task *Request) (*
 			msg.Proof,
 		)
 		if err != nil {
-			return nil, nil, fmt.Errorf("initial submit: %w", err)
+			return nil, nil, fmt.Errorf("initial submit with handover: %w", err)
 		}
 	} else {
 		tx, err = wr.contract.SubmitInitial(
@@ -329,7 +329,7 @@ func (wr *EthereumWriter) doSubmitFinal(ctx context.Context, commitmentHash [32]
 
 		log.WithField("txHash", tx.Hash().Hex()).
 			WithFields(logFields).
-			Info("Sent SubmitFinal transaction")
+			Info("Sent SubmitFinalWithHandover transaction")
 
 		return tx, nil
 	} else { // revive:disable-line

diff --git a/relayer/relays/beefy/polkadot-listener.go b/relayer/relays/beefy/polkadot-listener.go
@@ -105,7 +105,7 @@ func (li *PolkadotListener) scanCommitments(
 							"blockNumber":    result.SignedCommitment.Commitment.BlockNumber,
 							"validatorSetID": result.SignedCommitment.Commitment.ValidatorSetID,
 						},
-					}).Info("Discarded commitment")
+					}).Warn("Discarded commitment with depth not fast forward")
 					continue
 				}
 

diff --git a/relayer/relays/parachain/logger.go b/relayer/relays/parachain/logger.go
@@ -23,7 +23,7 @@ func (wr *EthereumWriter) logFieldsForBasicSubmission(
 
 	params := log.Fields{
 		"message": log.Fields{
-			"sourceID": Hex(message.SourceId[:]),
+			"sourceID": Hex(message.SourceID[:]),
 			"nonce":    message.Nonce,
 			"payload":  message.Payload,
 		},

diff --git a/relayer/relays/parachain/types.go b/relayer/relays/parachain/types.go
@@ -85,7 +85,7 @@ type BasicOutboundChannelMessage struct {
 
 func (m BasicOutboundChannelMessage) IntoInboundMessage() basic.BasicInboundChannelMessage {
 	return basic.BasicInboundChannelMessage{
-		SourceId: m.SourceID,
+		SourceID: m.SourceID,
 		Nonce:    (*big.Int)(&m.Nonce).Uint64(),
 		Payload:  m.Payload,
 	}