chore: fix wrong function name in go docs

.github/workflows/amoy_deb_profiles.yml

@@ -122,19 +122,19 @@ jobs:
         run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: amoy
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: amoy
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/config.toml
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: amoy
       - name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/systemd/heimdalld-amoy-validator.service packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/heimdalld.service

.github/workflows/mainnet_deb_profiles.yml

@@ -128,19 +128,19 @@ jobs:
         run: cp -rp packaging/templates/package_scripts/preinst.${{ env.NETWORK }} packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/preinst
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: mainnet
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/heimdall-config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/heimdall-config.toml
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: mainnet
       - name: Copying config for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/config/${{ env.NETWORK }}/config.toml packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/var/lib/heimdall/config/config.toml
         env:
           ARCH: all
-          NODE: sentry
+          NODE: validator
           NETWORK: mainnet
       - name: Copying the postrm for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
         run: cp -rp packaging/templates/package_scripts/postrm.profile packaging/deb/heimdall-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/DEBIAN/postrm

Makefile

@@ -22,7 +22,7 @@ clean:
 tests:
 	# go test  -v ./...
 
-	go test -v ./app/ ./auth/ ./clerk/ ./sidechannel/ ./bank/ ./chainmanager/ ./topup/ ./checkpoint/ ./staking/ -cover -coverprofile=cover.out -parallel 1
+	go test -v ./app/ ./auth/ ./clerk/ ./sidechannel/ ./bank/ ./chainmanager/ ./topup/ ./checkpoint/ ./staking/ ./gov/ -cover -coverprofile=cover.out -parallel 1
 
 # make build
 build: clean

app/app.go

@@ -192,8 +192,12 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	config := sdk.GetConfig()
 	config.Seal()
 
+	var app *HeimdallApp
+
 	// base app
-	bApp := bam.NewBaseApp(AppName, logger, db, authTypes.DefaultTxDecoder(cdc), baseAppOptions...)
+	bApp := bam.NewBaseApp(AppName, logger, db, authTypes.DefaultMainTxDecoder(cdc, func() int64 {
+		return app.LastBlockHeight()
+	}, helper.GetDanelawHeight, helper.GetJorvikHeight), baseAppOptions...)
 	bApp.SetCommitMultiStoreTracer(nil)
 	bApp.SetAppVersion(version.Version)
 
@@ -217,7 +221,7 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	tkeys := sdk.NewTransientStoreKeys(paramsTypes.TStoreKey)
 
 	// create heimdall app
-	var app = &HeimdallApp{
+	app = &HeimdallApp{
 		cdc:       cdc,
 		BaseApp:   bApp,
 		keys:      keys,

auth/types/stdtx.go

@@ -203,6 +203,41 @@ func (fee StdFee) GasPrices() sdk.DecCoins {
 // Decoders
 //
 
+// DefaultMainTxDecoder logic for standard transaction decoding
+func DefaultMainTxDecoder(cdc *codec.Codec, lastBlockHeight func() int64, getDanelawHeight func() int64, getJorvikHeight func() int64) sdk.TxDecoder {
+	return func(txBytes []byte) (sdk.Tx, sdk.Error) {
+		var tx = StdTx{}
+
+		if len(txBytes) == 0 {
+			return nil, sdk.ErrTxDecode("txBytes are empty")
+		}
+
+		currentHeight := lastBlockHeight() + 1
+		if currentHeight < getDanelawHeight() && getDanelawHeight() == getJorvikHeight() {
+			var hftx = StdTx{}
+			if err := cdc.UnmarshalBinaryLengthPrefixed(txBytes, &hftx); err != nil {
+				return nil, sdk.ErrTxDecode("error decoding transaction").TraceSDK(err.Error())
+			}
+
+			msgs := hftx.GetMsgs()
+			for _, msg := range msgs {
+				if msg.Route() == "bor" && msg.Type() == "propose-span-v2" {
+					return nil, sdk.ErrTxDecode("error decoding transaction")
+				}
+			}
+		}
+
+		// StdTx.Msg is an interface. The concrete types
+		// are registered by MakeTxCodec
+		err := cdc.UnmarshalBinaryLengthPrefixed(txBytes, &tx)
+		if err != nil {
+			return nil, sdk.ErrTxDecode("error decoding transaction").TraceSDK(err.Error())
+		}
+
+		return tx, nil
+	}
+}
+
 // DefaultTxDecoder logic for standard transaction decoding
 func DefaultTxDecoder(cdc *codec.Codec) sdk.TxDecoder {
 	return func(txBytes []byte) (sdk.Tx, sdk.Error) {

bor/client/cli/query.go

@@ -13,8 +13,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/maticnetwork/heimdall/bor/types"
 	hmClient "github.com/maticnetwork/heimdall/client"
 	"github.com/maticnetwork/heimdall/helper"
@@ -271,7 +269,7 @@ func GetNextSpanSeed(cdc *codec.Codec) *cobra.Command {
 	return cmd
 }
 
-// PostSendProposeSpanTx send propose span transaction
+// GetPreparedProposeSpan generates a propose span transaction
 func GetPreparedProposeSpan(cdc *codec.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "propose-span",
@@ -313,6 +311,11 @@ func GetPreparedProposeSpan(cdc *codec.Codec) *cobra.Command {
 				return err
 			}
 
+			nodeStatus, err := helper.GetNodeStatus(cliCtx)
+			if err != nil {
+				return err
+			}
+
 			//
 			// Query data
 			//
@@ -345,23 +348,42 @@ func GetPreparedProposeSpan(cdc *codec.Codec) *cobra.Command {
 				return errors.New("next span seed not found")
 			}
 
-			var seed common.Hash
-			if err := jsoniter.Unmarshal(res, &seed); err != nil {
+			var seedResponse types.QuerySpanSeedResponse
+			if err := jsoniter.Unmarshal(res, &seedResponse); err != nil {
 				return err
 			}
 
-			msg := types.NewMsgProposeSpan(
-				spanID,
-				proposer,
-				startBlock,
-				startBlock+spanDuration-1,
-				borChainID,
-				seed,
-			)
-
-			result, err := jsoniter.Marshal(&msg)
-			if err != nil {
-				return err
+			var result []byte
+
+			if nodeStatus.SyncInfo.LatestBlockHeight < helper.GetDanelawHeight() {
+				msg := types.NewMsgProposeSpan(
+					spanID,
+					proposer,
+					startBlock,
+					startBlock+spanDuration-1,
+					borChainID,
+					seedResponse.Seed,
+				)
+
+				result, err = jsoniter.Marshal(&msg)
+				if err != nil {
+					return err
+				}
+			} else {
+				msg := types.NewMsgProposeSpanV2(
+					spanID,
+					proposer,
+					startBlock,
+					startBlock+spanDuration-1,
+					borChainID,
+					seedResponse.Seed,
+					seedResponse.SeedAuthor,
+				)
+
+				result, err = jsoniter.Marshal(&msg)
+				if err != nil {
+					return err
+				}
 			}
 
 			fmt.Println(string(result))

bor/client/cli/tx.go

@@ -13,8 +13,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/maticnetwork/heimdall/bor/types"
 	hmClient "github.com/maticnetwork/heimdall/client"
 	"github.com/maticnetwork/heimdall/helper"
@@ -84,6 +82,11 @@ func PostSendProposeSpanTx(cdc *codec.Codec) *cobra.Command {
 				return err
 			}
 
+			nodeStatus, err := helper.GetNodeStatus(cliCtx)
+			if err != nil {
+				return err
+			}
+
 			//
 			// Query data
 			//
@@ -116,19 +119,32 @@ func PostSendProposeSpanTx(cdc *codec.Codec) *cobra.Command {
 				return errors.New("next span seed not found")
 			}
 
-			var seed common.Hash
-			if err := jsoniter.ConfigFastest.Unmarshal(res, &seed); err != nil {
+			var seedResponse types.QuerySpanSeedResponse
+			if err := jsoniter.ConfigFastest.Unmarshal(res, &seedResponse); err != nil {
 				return err
 			}
 
-			msg := types.NewMsgProposeSpan(
-				spanID,
-				proposer,
-				startBlock,
-				startBlock+spanDuration-1,
-				borChainID,
-				seed,
-			)
+			var msg sdk.Msg
+			if nodeStatus.SyncInfo.LatestBlockHeight < helper.GetDanelawHeight() {
+				msg = types.NewMsgProposeSpan(
+					spanID,
+					proposer,
+					startBlock,
+					startBlock+spanDuration-1,
+					borChainID,
+					seedResponse.Seed,
+				)
+			} else {
+				msg = types.NewMsgProposeSpanV2(
+					spanID,
+					proposer,
+					startBlock,
+					startBlock+spanDuration-1,
+					borChainID,
+					seedResponse.Seed,
+					seedResponse.SeedAuthor,
+				)
+			}
 
 			return helper.BroadcastMsgsWithCLI(cliCtx, []sdk.Msg{msg})
 		},

bor/client/rest/tx.go

@@ -11,10 +11,9 @@ import (
 	"github.com/gorilla/mux"
 	jsoniter "github.com/json-iterator/go"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/maticnetwork/heimdall/bor/types"
 	restClient "github.com/maticnetwork/heimdall/client/rest"
+	"github.com/maticnetwork/heimdall/helper"
 	hmTypes "github.com/maticnetwork/heimdall/types"
 	"github.com/maticnetwork/heimdall/types/rest"
 )
@@ -163,20 +162,40 @@ func postProposeSpanHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 			return
 		}
 
-		var seed common.Hash
-		if err = jsoniter.ConfigFastest.Unmarshal(res, &seed); err != nil {
+		var seedResponse types.QuerySpanSeedResponse
+		if err = jsoniter.ConfigFastest.Unmarshal(res, &seedResponse); err != nil {
 			return
 		}
 
-		// draft a propose span message
-		msg := types.NewMsgProposeSpan(
-			req.ID,
-			hmTypes.HexToHeimdallAddress(req.BaseReq.From),
-			req.StartBlock,
-			req.StartBlock+spanDuration-1,
-			req.BorChainID,
-			seed,
-		)
+		nodeStatus, err := helper.GetNodeStatus(cliCtx)
+		if err != nil {
+			rest.WriteErrorResponse(w, http.StatusBadRequest, err.Error())
+			return
+		}
+
+		var msg sdk.Msg
+		if nodeStatus.SyncInfo.LatestBlockHeight < helper.GetDanelawHeight() {
+			// draft a propose span message
+			msg = types.NewMsgProposeSpan(
+				req.ID,
+				hmTypes.HexToHeimdallAddress(req.BaseReq.From),
+				req.StartBlock,
+				req.StartBlock+spanDuration-1,
+				req.BorChainID,
+				seedResponse.Seed,
+			)
+		} else {
+			// draft a propose span v2 message
+			msg = types.NewMsgProposeSpanV2(
+				req.ID,
+				hmTypes.HexToHeimdallAddress(req.BaseReq.From),
+				req.StartBlock,
+				req.StartBlock+spanDuration-1,
+				req.BorChainID,
+				seedResponse.Seed,
+				seedResponse.SeedAuthor,
+			)
+		}
 
 		// send response
 		restClient.WriteGenerateStdTxResponse(w, cliCtx, req.BaseReq, []sdk.Msg{msg})