Merge pull request maticnetwork#1060 from maticnetwork/develop

Merge develop to v1.0.0-beta-candidate
llamanodes · Sep 20, 2023 · 84aded5 · 84aded5
2 parents 65b54f9 + dcdf249
commit 84aded5
Show file tree

Hide file tree

Showing 16 changed files with 310 additions and 267 deletions.
diff --git a/.github/workflows/ci.yml b/.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()

diff --git a/.github/workflows/packager.yml b/.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

diff --git a/app/types.go b/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.

diff --git a/bridge/setu/listener/rootchain.go b/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 (

diff --git a/bridge/setu/listener/rootchain_events.go b/bridge/setu/listener/rootchain_events.go