Merge pull request #1062 from maticnetwork/v1.0.0-beta-candidate

Merge v1.0.0-beta-candidate to master

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
           file: ./cover.out
 
 
-  integration-tests:
+  e2e-tests:
     if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
     strategy:
       matrix:
@@ -129,7 +129,7 @@ jobs:
             cd matic-cli/devnet/code/contracts
             npm run truffle exec scripts/deposit.js -- --network development $(jq -r .root.tokens.MaticToken contractAddresses.json) 100000000000000000000
             cd -
-            timeout 20m bash heimdall/integration-tests/smoke_test.sh
+            timeout 60m bash heimdall/integration-tests/smoke_test.sh
 
         - name: Upload logs
           if: always()

.github/workflows/packager.yml

@@ -8,9 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on:
-      group: ubuntu-runners
-      labels: 18.04RunnerT2Large
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/stale.yml

@@ -29,4 +29,5 @@ jobs:
         days-before-pr-stale: 21
         days-before-issue-close: 14
         days-before-pr-close: 14
+        exempt-draft-pr: true
 

.synk

@@ -0,0 +1,9 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.0
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  'SNYK-GOLANG-GOLANGORGXNETHTTP2-3160322':
+    - '*':
+        reason: 'grpc working on a release to fix the issue'
+        created: 2022-12-12T06:50:00.000Z
+patch: {}

Makefile

@@ -117,3 +117,19 @@ release:
 		-w /go/src/$(PACKAGE_NAME) \
 		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
 		--rm-dist --skip-validate
+
+.PHONY: help
+help:
+	@echo "Available targets:"
+	@echo "  clean               - Removes the build directory."
+	@echo "  tests               - Runs Go tests on specific packages."
+	@echo "  build               - Compiles the Heimdall binaries."
+	@echo "  install             - Installs the Heimdall binaries."
+	@echo "  contracts           - Generates Go bindings for Ethereum contracts."
+	@echo "  build-arm           - Compiles the Heimdall binaries for ARM64 architecture."
+	@echo "  lint                - Runs the GolangCI-Lint tool on the codebase."
+	@echo "  build-docker        - Builds a Docker image for the latest Git tag."
+	@echo "  push-docker         - Pushes the Docker image for the latest Git tag."
+	@echo "  build-docker-develop- Builds a Docker image for the development branch."
+	@echo "  release-dry-run     - Performs a dry run of the release process."
+	@echo "  release             - Executes the actual release process."

app/app.go

@@ -239,6 +239,7 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	app.subspaces[borTypes.ModuleName] = app.ParamsKeeper.Subspace(borTypes.DefaultParamspace)
 	app.subspaces[clerkTypes.ModuleName] = app.ParamsKeeper.Subspace(clerkTypes.DefaultParamspace)
 	app.subspaces[topupTypes.ModuleName] = app.ParamsKeeper.Subspace(topupTypes.DefaultParamspace)
+
 	//
 	// Contract caller
 	//
@@ -597,8 +598,11 @@ func (app *HeimdallApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) ab
 			return abci.ResponseEndBlock{}
 		}
 
-		// increment proposer priority
-		currentValidatorSet.IncrementProposerPriority(1)
+		//Hardfork to remove the rotation of validator list on stake update
+		if ctx.BlockHeight() < helper.GetAalborgHardForkHeight() {
+			// increment proposer priority
+			currentValidatorSet.IncrementProposerPriority(1)
+		}
 
 		// validator set change
 		logger.Debug("[ENDBLOCK] Updated current validator set", "proposer", currentValidatorSet.GetProposer())

app/side_tx_processor.go

@@ -235,7 +235,7 @@ func (app *HeimdallApp) runTx(ctx sdk.Context, txBytes []byte, sideTxResult abci
 	return
 }
 
-// / runMsgs iterates through all the messages and executes them.
+// runMsgs iterates through all the messages and executes them.
 func (app *HeimdallApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, sideTxResult abci.SideTxResultType) sdk.Result {
 	data := make([]byte, 0, len(msgs))
 

app/types.go

@@ -18,7 +18,7 @@ type App interface {
 	Name() string
 
 	// The application types codec.
-	// NOTE: This shoult be sealed before being returned.
+	// NOTE: This should not be sealed before being returned.
 	Codec() *codec.Codec
 
 	// Application updates every begin block.

auth/ante.go

@@ -12,6 +12,7 @@ import (
 
 	authTypes "github.com/maticnetwork/heimdall/auth/types"
 	"github.com/maticnetwork/heimdall/chainmanager"
+	checkpointTypes "github.com/maticnetwork/heimdall/checkpoint/types"
 	"github.com/maticnetwork/heimdall/helper"
 	"github.com/maticnetwork/heimdall/types"
 )
@@ -83,6 +84,12 @@ func NewAnteHandler(
 			return newCtx, sdk.ErrInternal("tx must be StdTx").Result(), true
 		}
 
+		//Check whether the chain has reached the hard fork length to execute milestone msgs
+		if ctx.BlockHeight() < helper.GetAalborgHardForkHeight() && (stdTx.Msg.Type() == checkpointTypes.EventTypeMilestone || stdTx.Msg.Type() == checkpointTypes.EventTypeMilestoneTimeout) {
+			newCtx = SetGasMeter(simulate, ctx, 0)
+			return newCtx, sdk.ErrTxDecode("error decoding transaction").Result(), true
+		}
+
 		// get account params
 		params := ak.GetParams(ctx)
 

auth/ante_test.go

@@ -402,6 +402,53 @@ func (suite *AnteTestSuite) TestFees() {
 	checkInvalidTx(t, anteHandler, ctx, tx, false, sdk.CodeInsufficientFunds)
 }
 
+func (suite *AnteTestSuite) TestMilestoneHardFork() {
+	t, happ, ctx, anteHandler := suite.T(), suite.app, suite.ctx, suite.anteHandler
+	ctx = ctx.WithBlockHeight(1)
+
+	// keys and addresses
+	priv1, _, addr1 := sdkAuth.KeyTestPubAddr()
+
+	// set the accounts
+	acc1 := happ.AccountKeeper.NewAccountWithAddress(ctx, hmTypes.AccAddressToHeimdallAddress(addr1))
+	amt1, _ := sdk.NewIntFromString(authTypes.DefaultTxFees + "0")
+	err := acc1.SetCoins(sdk.NewCoins(sdk.NewCoin(authTypes.FeeToken, amt1)))
+	require.NoError(t, err)
+	happ.AccountKeeper.SetAccount(ctx, acc1)
+	acc1 = happ.AccountKeeper.GetAccount(ctx, acc1.GetAddress()) // get stored account
+
+	var tx sdk.Tx
+
+	// checkpoint msg
+	msg := TestMilestoneMsg{*sdkAuth.NewTestMsg(addr1)}
+	msgTimeout := TestMilestoneTimeoutMsg{*sdkAuth.NewTestMsg(addr1)}
+
+	//Setting block height to -1 t0 check for the hard fork
+	ctx = ctx.WithBlockHeight(int64(-1))
+	// test good tx from one signer
+	tx = types.NewTestTx(ctx, sdk.Msg(&msgTimeout), priv1, acc1.GetAccountNumber(), uint64(0))
+	checkInvalidTx(t, anteHandler, ctx, tx, false, sdk.CodeTxDecode)
+
+	acc1 = happ.AccountKeeper.GetAccount(ctx, acc1.GetAddress())
+	require.Equal(t, amt1, (acc1.GetCoins()).AmountOf(authTypes.FeeToken))
+
+	ctx = ctx.WithBlockHeight(int64(1))
+
+	tx = types.NewTestTx(ctx, sdk.Msg(&msg), priv1, acc1.GetAccountNumber(), uint64(0))
+	checkValidTx(t, anteHandler, ctx, tx, false)
+
+	acc1 = happ.AccountKeeper.GetAccount(ctx, acc1.GetAddress())
+	require.NotEqual(t, amt1, (acc1.GetCoins()).AmountOf(authTypes.FeeToken))
+
+	amt1 = (acc1.GetCoins()).AmountOf(authTypes.FeeToken)
+
+	tx = types.NewTestTx(ctx, sdk.Msg(&msgTimeout), priv1, acc1.GetAccountNumber(), uint64(1))
+	checkValidTx(t, anteHandler, ctx, tx, false)
+
+	acc1 = happ.AccountKeeper.GetAccount(ctx, acc1.GetAddress())
+	require.NotEqual(t, amt1, (acc1.GetCoins()).AmountOf(authTypes.FeeToken))
+}
+
 //
 // utils
 //
@@ -458,3 +505,31 @@ type TestCheckpointMsg struct {
 
 func (msg *TestCheckpointMsg) Route() string { return testCheckpointMsgVal }
 func (msg *TestCheckpointMsg) Type() string  { return testCheckpointMsgVal }
+
+//
+// Test checkpoint
+//
+
+const testMilestoneMsgVal = "milestone"
+
+var _ sdk.Msg = (*TestMilestoneMsg)(nil)
+
+// msg type for testing
+type TestMilestoneMsg struct {
+	sdk.TestMsg
+}
+
+func (msg *TestMilestoneMsg) Route() string { return testMilestoneMsgVal }
+func (msg *TestMilestoneMsg) Type() string  { return testMilestoneMsgVal }
+
+const testMilestoneTimeoutMsgVal = "milestone-timeout"
+
+var _ sdk.Msg = (*TestMilestoneTimeoutMsg)(nil)
+
+// msg type for testing
+type TestMilestoneTimeoutMsg struct {
+	sdk.TestMsg
+}
+
+func (msg *TestMilestoneTimeoutMsg) Route() string { return testMilestoneTimeoutMsgVal }
+func (msg *TestMilestoneTimeoutMsg) Type() string  { return testMilestoneTimeoutMsgVal }

bor/beginblocker.go

@@ -11,6 +11,13 @@ import (
 	hmTypes "github.com/maticnetwork/heimdall/types"
 )
 
+// ResponseWithHeight defines a response object type that wraps an original
+// response with a height.
+type ResponseWithHeight struct {
+	Height string              `json:"height"`
+	Result jsoniter.RawMessage `json:"result"`
+}
+
 func BeginBlocker(ctx sdk.Context, _ abci.RequestBeginBlock, k Keeper) {
 	if ctx.BlockHeight() == helper.GetSpanOverrideHeight() {
 		k.Logger(ctx).Info("overriding span BeginBlocker", "height", ctx.BlockHeight())

bor/client/rest/query.go

@@ -524,6 +524,14 @@ func paramsHandlerFn(cliCtx context.CLIContext) http.HandlerFunc {
 	}
 }
 
+// ResponseWithHeight defines a response object type that wraps an original
+// response with a height.
+// TODO:Link it with bor
+type ResponseWithHeight struct {
+	Height string              `json:"height"`
+	Result jsoniter.RawMessage `json:"result"`
+}
+
 func loadSpanOverrides() {
 	spanOverrides = map[uint64]*HeimdallSpanResultWithHeight{}
 

bridge/setu/listener/rootchain.go

@@ -30,6 +30,9 @@ type RootChainListener struct {
 
 	stakingInfoAbi *abi.ABI
 	stateSenderAbi *abi.ABI
+
+	// For self-heal, Will be only initialised if sub_graph_url is provided
+	subGraphClient *subGraphClient
 }
 
 const (