Merge branch 'develop' into share-deduct-fee

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 on:
  pull_request:
  branches:
- - main
+ - develop
 
 jobs:
  cleanup-runs:
@@ -11,7 +11,7 @@ jobs:
  - uses: rokroskar/workflow-run-cleanup-action@master
  env:
  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
+ if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/develop'"
 
  build:
  runs-on: ubuntu-latest

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
  push:
- branches: [main]
+ branches: [develop]
  pull_request:
  # The branches below must be a subset of the branches above
- branches: [main]
+ branches: [develop]
  schedule:
  - cron: '37 21 * * 4'
 

.github/workflows/deploy-contract.yml

@@ -2,7 +2,7 @@ name: Deploy Contract
 on:
  pull_request:
  branches:
- - main
+ - develop
 
 jobs:
  cleanup-runs:
@@ -11,7 +11,7 @@ jobs:
  - uses: rokroskar/workflow-run-cleanup-action@master
  env:
  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
+ if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/develop'"
 
  deploy:
  runs-on: ubuntu-latest

.github/workflows/labeler.yml

@@ -3,7 +3,7 @@ on:
  pull_request:
  push:
  branches:
- - main
+ - develop
 
 jobs:
  triage:

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
  pull_request:
  push:
  branches:
- - main
+ - develop
 jobs:
  golangci:
  name: Run golangci-lint
@@ -58,9 +58,9 @@ jobs:
  steps:
  - uses: actions/checkout@v3
  - uses: cachix/install-nix-action@v20
- - uses: cachix/cachix-action@v12
+ - uses: cachix/cachix-action@v14
  with:
- name: ethermint
+ name: crypto-ethermint
  - uses: technote-space/get-diff-action@v6.1.2
  with:
  PATTERNS: |
@@ -74,9 +74,9 @@ jobs:
  steps:
  - uses: actions/checkout@v3
  - uses: cachix/install-nix-action@v20
- - uses: cachix/cachix-action@v12
+ - uses: cachix/cachix-action@v14
  with:
- name: ethermint
+ name: crypto-ethermint
  - uses: technote-space/get-diff-action@v6.1.2
  with:
  PATTERNS: |

.github/workflows/markdown-links.yml

@@ -5,7 +5,7 @@ on:
  - '**.md'
  push:
  branches:
- - main
+ - develop
  paths:
  - '**.md'
 
@@ -24,6 +24,6 @@ jobs:
  folder-path: "docs"
  check-modified-files-only: "yes"
  use-quiet-mode: "yes"
- base-branch: "main"
+ base-branch: "develop"
  config-file: "mlc_config.json"
  if: env.GIT_DIFF

.github/workflows/security.yml

@@ -3,7 +3,7 @@ on:
  pull_request:
  push:
  branches:
- - main
+ - develop
 
 jobs:
  Gosec:

.github/workflows/semgrep.yml

@@ -4,7 +4,7 @@ on:
  pull_request: {}
  push:
  branches:
- - main
+ - develop
  paths:
  - .github/workflows/semgrep.yml
  schedule:

.github/workflows/test.yml

@@ -3,7 +3,7 @@ on:
  pull_request:
  push:
  branches:
- - main
+ - develop
  - release/**
 
 jobs:
@@ -86,16 +86,21 @@ jobs:
  integration_tests:
  runs-on: ubuntu-latest
  timeout-minutes: 60
+ strategy:
+ matrix:
+ tests: [unmarked, upgrade, filter]
+ env:
+ TESTS_TO_RUN: ${{ matrix.tests }}
  steps:
  - uses: actions/checkout@v3
  - uses: cachix/install-nix-action@v23
  with:
  nix_path: nixpkgs=channel:nixos-22.11
  extra_nix_config: |
  access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- - uses: cachix/cachix-action@v12
+ - uses: cachix/cachix-action@v14
  with:
- name: ethermint
+ name: crypto-ethermint
  signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
  - uses: technote-space/get-diff-action@v6.1.2
  with:
@@ -128,9 +133,9 @@ jobs:
  steps:
  - uses: actions/checkout@v3
  - uses: cachix/install-nix-action@v20
- - uses: cachix/cachix-action@v12
+ - uses: cachix/cachix-action@v14
  with:
- name: ethermint
+ name: crypto-ethermint
  signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
  - name: 'instantiate integration test env'
  run: nix-store -r $(nix-instantiate tests/integration_tests/shell.nix)

.mergify.yml

@@ -22,7 +22,7 @@ pull_request_rules:
  actions:
  backport:
  branches:
- - main
+ - develop
  - name: backport patches to v0.20.x branch
  conditions:
  - base=main

Makefile

@@ -343,6 +343,12 @@ test-import:
 test-rpc:
  ./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 5 -m "rpc" -r "true"
 
+# possible values:
+# - all: run all integration tests
+# - unmarked: run integration tests that are not marked
+# - marker1,marker2: markers separated by comma, run integration tests that are marked with any of the markers
+TESTS_TO_RUN ?= all
+
 run-integration-tests:
  @nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
 

scripts/run-integration-tests.sh

@@ -10,4 +10,13 @@ cd ../tests/integration_tests/hardhat
 HUSKY_SKIP_INSTALL=1 npm install
 npm run typechain
 cd ..
-pytest -vv -s
+
+TESTS_TO_RUN="${TESTS_TO_RUN:-all}"
+
+if [[ "$TESTS_TO_RUN" == "all" ]]; then
+ echo "run all tests"
+ pytest -vv -s
+else
+ echo "run tests matching $TESTS_TO_RUN"
+ pytest -vv -s -m "$TESTS_TO_RUN"
+fi

tests/integration_tests/conftest.py

@@ -3,6 +3,18 @@
 from .network import setup_ethermint, setup_geth
 
 
+def pytest_configure(config):
+ config.addinivalue_line("markers", "unmarked: fallback mark for unmarked tests")
+ config.addinivalue_line("markers", "upgrade: upgrade tests")
+ config.addinivalue_line("markers", "filter: filter tests")
+
+
+def pytest_collection_modifyitems(items, config):
+ for item in items:
+ if not any(item.iter_markers()):
+ item.add_marker("unmarked")
+
+
 @pytest.fixture(scope="session")
 def ethermint(tmp_path_factory):
  path = tmp_path_factory.mktemp("ethermint")

tests/integration_tests/test_filters.py

@@ -15,6 +15,8 @@
  w3_wait_for_new_blocks,
 )
 
+pytestmark = pytest.mark.filter
+
 
 @pytest.fixture(scope="module")
 def custom_ethermint(tmp_path_factory):

tests/integration_tests/test_upgrade.py

@@ -21,6 +21,8 @@
  wait_for_port,
 )
 
+pytestmark = pytest.mark.upgrade
+
 
 def init_cosmovisor(home):
  """

tests/solidity/suites/staking/.github/workflows/ci_contracts.yml

@@ -3,7 +3,7 @@ name: contracts
 on:
  push:
  branches: 
- - main
+ - develop
  pull_request:
  branches: 
  - '*'