Merge branch 'main' into ron/dencun

parachain/pallets/inbound-queue/src/benchmarking/fixtures.rs

@@ -11,10 +11,10 @@ pub struct InboundQueueTest {
 pub fn make_create_message() -> InboundQueueTest {
 	InboundQueueTest{
         execution_header: CompactExecutionHeader{
-            parent_hash: hex!("8f69b84ec2fe39b299005cf30e855a2bcdd997dd1e5f79777271160015db6ae3").into(),
-            block_number: 188,
-            state_root: hex!("3f744f5e0322312fbcd6ea06e4e3db6cf8ff8a6258ee4f621df57165c3964806").into(),
-            receipts_root: hex!("b4e733e6a4545303220f9954b9e895ecf31e5d6fe1557f27a0254a01132f38a7").into(),
+            parent_hash: hex!("b5608f0af7c3b6fe5c593772fc25436b8d6549eb236adb0855c6ad33e0004e04").into(),
+            block_number: 115,
+            state_root: hex!("47ed174789836c622499d9659a4ac32c3b91a7b15642d39b0a11b82ff23995c1").into(),
+            receipts_root: hex!("42c08b5303fcdf9e49c833fe5f1182cdbc8206bf8aec581125fc34aba11e1f1a").into(),
         },
         message: Message {
             event_log: 	Log {
@@ -24,15 +24,15 @@ pub fn make_create_message() -> InboundQueueTest {
                     hex!("c173fac324158e77fb5840738a1a541f633cbec8884c6a601c567d2b376a0539").into(),
                     hex!("5f7060e971b0dc81e63f0aa41831091847d97c1a4693ac450cc128c7214e65e0").into(),
                 ],
-                data: hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002e000f000000000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7d00e40b54020000000000000000000000000000000000000000000000000000000000").into(),
+                data: hex!("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002e00a736aa00000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7d00e40b54020000000000000000000000000000000000000000000000000000000000").into(),
             },
             proof: Proof {
-                block_hash: hex!("7ce27351fff56e7f0f28774766ad46dcf9c05e5cc5cf2c1914de08b34da3d0c9").into(),
+                block_hash: hex!("add15f439c8a57fe375d0a679870b1359921d70cb0e3e44f0dd3e272849f4097").into(),
                 tx_index: 0,
                 data: (vec![
-                    hex!("b4e733e6a4545303220f9954b9e895ecf31e5d6fe1557f27a0254a01132f38a7").to_vec(),
+                    hex!("42c08b5303fcdf9e49c833fe5f1182cdbc8206bf8aec581125fc34aba11e1f1a").to_vec(),
                 ], vec![
-                    hex!("f9026d822080b9026702f9026301830150dfb9010000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000080000000000000000000000000000004000000000080000000000000000000000000000000000010100000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000040004000000000000002000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000200000000000010f90158f85894eda338e4dc46038493b885327842fd3e301cab39e1a0f78bb28d4b1d7da699e5c0bc2be29c2b04b5aab6aacf6298fe5304f9db9c6d7ea000000000000000000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7df8fc94eda338e4dc46038493b885327842fd3e301cab39f863a07153f9357c8ea496bba60bf82e67143e27b64462b49041f8e689e1b05728f84fa0c173fac324158e77fb5840738a1a541f633cbec8884c6a601c567d2b376a0539a05f7060e971b0dc81e63f0aa41831091847d97c1a4693ac450cc128c7214e65e0b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001e000f000000000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7d0000").to_vec(),
+                    hex!("f9028e822080b9028802f90284018301ed20b9010000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000080000000000000000000000000000004000000000080000000000000000000000000000000000010100000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000040004000000000000002000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000200000000000010f90179f85894eda338e4dc46038493b885327842fd3e301cab39e1a0f78bb28d4b1d7da699e5c0bc2be29c2b04b5aab6aacf6298fe5304f9db9c6d7ea000000000000000000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7df9011c94eda338e4dc46038493b885327842fd3e301cab39f863a07153f9357c8ea496bba60bf82e67143e27b64462b49041f8e689e1b05728f84fa0c173fac324158e77fb5840738a1a541f633cbec8884c6a601c567d2b376a0539a05f7060e971b0dc81e63f0aa41831091847d97c1a4693ac450cc128c7214e65e0b8a000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000002e00a736aa00000000000087d1f7fdfee7f651fabc8bfcb6e086c278b77a7d00e40b54020000000000000000000000000000000000000000000000000000000000").to_vec(),
                 ]),
             },
         },

relayer/cmd/generate_beacon_data.go

@@ -68,6 +68,34 @@ func generateBeaconCheckpointCmd() *cobra.Command {
 	return cmd
 }
 
+func generateExecutionUpdateCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "generate-execution-update",
+		Short: "Generate execution update.",
+		Args:  cobra.ExactArgs(0),
+		RunE:  generateExecutionUpdate,
+	}
+
+	cmd.Flags().String("spec", "", "Valid values are mainnet or minimal")
+	err := cmd.MarkFlagRequired("spec")
+	if err != nil {
+		return nil
+	}
+
+	cmd.Flags().Uint32("slot", 1, "slot number")
+	err = cmd.MarkFlagRequired("slot")
+	if err != nil {
+		return nil
+	}
+
+	cmd.Flags().String("url", "http://127.0.0.1:9596", "Beacon URL")
+	if err != nil {
+		return nil
+	}
+
+	return cmd
+}
+
 type Data struct {
 	CheckpointUpdate      beaconjson.CheckPoint
 	SyncCommitteeUpdate   beaconjson.Update
@@ -351,3 +379,52 @@ func writeBenchmarkDataFile(filename, fileContents string) error {
 
 	return nil
 }
+
+func generateExecutionUpdate(cmd *cobra.Command, _ []string) error {
+	err := func() error {
+		spec, err := cmd.Flags().GetString("spec")
+		if err != nil {
+			return fmt.Errorf("get active spec: %w", err)
+		}
+		activeSpec, err := config.ToSpec(spec)
+		if err != nil {
+			return fmt.Errorf("get spec: %w", err)
+		}
+
+		endpoint, _ := cmd.Flags().GetString("url")
+		beaconSlot, _ := cmd.Flags().GetUint32("slot")
+
+		viper.SetConfigFile("web/packages/test/config/beacon-relay.json")
+		if err := viper.ReadInConfig(); err != nil {
+			return err
+		}
+		var conf config.Config
+		err = viper.Unmarshal(&conf)
+		if err != nil {
+			return err
+		}
+		specSettings := conf.GetSpecSettingsBySpec(activeSpec)
+		log.WithFields(log.Fields{"spec": activeSpec, "endpoint": endpoint}).Info("connecting to beacon API")
+
+		// generate executionUpdate
+		s := syncer.New(endpoint, specSettings, activeSpec)
+		blockRoot, err := s.Client.GetBeaconBlockRoot(uint64(beaconSlot))
+		if err != nil {
+			return fmt.Errorf("fetch block: %w", err)
+		}
+		headerUpdateScale, err := s.GetHeaderUpdate(blockRoot, nil)
+		if err != nil {
+			return fmt.Errorf("get header update: %w", err)
+		}
+		headerUpdate := headerUpdateScale.ToJSON()
+		writeJSONToFile(headerUpdate, fmt.Sprintf("execution-header-update.%s.json", activeSpec.ToString()))
+		log.Info("created execution update file")
+
+		return nil
+	}()
+	if err != nil {
+		log.WithError(err).Error("error generating beacon execution update")
+	}
+
+	return nil
+}

relayer/cmd/root.go

@@ -24,12 +24,14 @@ func init() {
 	rootCmd.AddCommand(getBlockCmd())
 	//rootCmd.AddCommand(fetchMessagesCmd())
 	rootCmd.AddCommand(subBeefyCmd())
+	rootCmd.AddCommand(scanBeefyCmd())
 	rootCmd.AddCommand(leafCmd())
 	rootCmd.AddCommand(basicChannelLeafProofCmd())
 	rootCmd.AddCommand(parachainHeadProofCmd())
 	rootCmd.AddCommand(importExecutionHeaderCmd())
 	rootCmd.AddCommand(generateBeaconDataCmd())
 	rootCmd.AddCommand(generateBeaconCheckpointCmd())
+	rootCmd.AddCommand(generateExecutionUpdateCmd())
 }
 
 func Execute() {

relayer/cmd/scan_beefy.go

@@ -0,0 +1,107 @@
+package cmd
+
+import (
+	"context"
+	"log"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/sirupsen/logrus"
+	"github.com/snowfork/snowbridge/relayer/chain/relaychain"
+	"github.com/snowfork/snowbridge/relayer/relays/beefy"
+	"github.com/spf13/cobra"
+	"golang.org/x/sync/errgroup"
+)
+
+func scanBeefyCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "scan-beefy",
+		Short: "Scan beefy messages like the beefy relayer would.",
+		Args:  cobra.ExactArgs(0),
+		RunE:  ScanBeefyFn,
+	}
+
+	cmd.Flags().StringP("polkadot-url", "p", "ws://127.0.0.1:9944", "Polkadot URL.")
+	cmd.MarkFlagRequired("polkadot-url")
+	cmd.Flags().Uint64P("beefy-block", "b", 0, "Beefy block.")
+	cmd.MarkFlagRequired("beefy-block")
+	cmd.Flags().Uint64P("validator-set-id", "v", 0, "Validator set id.")
+	cmd.MarkFlagRequired("validator-set-id")
+	cmd.Flags().Uint64P("fast-forward-depth", "f", 100, "Fast forward depth.")
+	return cmd
+}
+
+func ScanBeefyFn(cmd *cobra.Command, _ []string) error {
+	ctx := cmd.Context()
+	ctx, cancel := context.WithCancel(context.Background())
+	eg, ctx := errgroup.WithContext(ctx)
+
+	log.SetOutput(logrus.WithFields(logrus.Fields{"logger": "stdlib"}).WriterLevel(logrus.InfoLevel))
+	logrus.SetLevel(logrus.DebugLevel)
+
+	polkadotUrl, _ := cmd.Flags().GetString("polkadot-url")
+	relaychainConn := relaychain.NewConnection(polkadotUrl)
+	relaychainConn.Connect(ctx)
+
+	fastForwardDepth, _ := cmd.Flags().GetUint64("fast-forward-depth")
+	config := beefy.SourceConfig{
+		FastForwardDepth: fastForwardDepth,
+	}
+	polkadotListener := beefy.NewPolkadotListener(
+		&config,
+		relaychainConn,
+	)
+
+	beefyBlock, _ := cmd.Flags().GetUint64("beefy-block")
+	validatorSetID, _ := cmd.Flags().GetUint64("validator-set-id")
+	logrus.WithFields(logrus.Fields{
+		"polkadot-url":       polkadotUrl,
+		"fast-forward-depth": fastForwardDepth,
+		"beefy-block":        beefyBlock,
+		"validator-set-id":   validatorSetID,
+	}).Info("Connected to relaychain.")
+
+	commitments, err := polkadotListener.Start(ctx, eg, beefyBlock, validatorSetID)
+	if err != nil {
+		logrus.WithError(err).Fatalf("could not start")
+	}
+
+	eg.Go(func() error {
+		for {
+			select {
+			case <-ctx.Done():
+				return nil
+			case commitment, ok := <-commitments:
+				if !ok {
+					return nil
+				}
+				logrus.WithField("commitment", commitment).Info("scanned commitment")
+			}
+		}
+	})
+
+	// Ensure clean termination upon SIGINT, SIGTERM
+	eg.Go(func() error {
+		notify := make(chan os.Signal, 1)
+		signal.Notify(notify, syscall.SIGINT, syscall.SIGTERM)
+
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case sig := <-notify:
+			logrus.WithField("signal", sig.String()).Info("Received signal")
+			cancel()
+		}
+
+		return nil
+	})
+
+	err = eg.Wait()
+	if err != nil {
+		logrus.WithError(err).Fatal("Unhandled error")
+		return err
+	}
+
+	return nil
+}

relayer/relays/beacon/header/syncer/api/api_response.go

@@ -2,10 +2,11 @@ package api
 
 import (
 	"fmt"
-	"github.com/snowfork/snowbridge/relayer/relays/beacon/config"
 	"math/big"
 	"strconv"
 
+	"github.com/snowfork/snowbridge/relayer/relays/beacon/config"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/snowfork/go-substrate-rpc-client/v4/types"
 	beaconjson "github.com/snowfork/snowbridge/relayer/relays/beacon/header/syncer/json"
@@ -97,7 +98,7 @@ type FinalizedCheckpointResponse struct {
 
 type SignedHeaderResponse struct {
 	Message   HeaderResponse `json:"message"`
-	Signature []byte         `json:"signature"`
+	Signature string         `json:"signature"`
 }
 
 type CheckpointResponse struct {
@@ -993,10 +994,14 @@ func (s SignedHeaderResponse) ToFastSSZ() (*state.SignedBeaconBlockHeader, error
 	if err != nil {
 		return nil, err
 	}
+	signature, err := util.HexStringToByteArray(s.Signature)
+	if err != nil {
+		return nil, err
+	}
 
 	return &state.SignedBeaconBlockHeader{
 		Header:    message,
-		Signature: s.Signature,
+		Signature: signature,
 	}, nil
 }
 

relayer/relays/beacon/header/syncer/api/api_response_test.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"encoding/json"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"testing"
+)
+
+func TestUnmarshalBlockResponse(t *testing.T) {
+	blockResponse := BeaconBlockResponse{}
+	data, _ := os.ReadFile("web/packages/test/testdata/beacon_block_6815804.json")
+	if data != nil {
+		err := json.Unmarshal(data, &blockResponse)
+		assert.Nil(t, err)
+	}
+}

web/packages/test/scripts/build-binary.sh

@@ -27,7 +27,7 @@ build_binaries() {
     cp target/release/polkadot-prepare-worker $output_bin_dir/polkadot-prepare-worker
 
     echo "Building polkadot-parachain binary"
-    cargo build --release --locked -p polkadot-parachain-bin --bin polkadot-parachain $features
+    cargo build --release --locked -p polkadot-parachain-bin --bin polkadot-parachain $features --no-default-features
     cp target/release/polkadot-parachain $output_bin_dir/polkadot-parachain
 
     popd