Changes from upstream

.editorconfig

@@ -10,5 +10,8 @@ insert_final_newline = true
 [*.rs]
 indent_size = 4
 
+[*.toml]
+indent_size = 4 # For compliance with our taplo config
+
 [*.py]
 indent_size = 4

.github/workflows/autofix.yml

@@ -0,0 +1,56 @@
+name: autofix.ci # needed to securely identify the workflow
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  autofix-text:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "oldstable"
+
+      - name: Install shfmt
+        run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
+      - name: Install npx (for prettier)
+        run: sudo apt install nodejs
+
+      - name: Format Markdown
+        run: ./devtools/format_md.sh
+      - name: Format YAML
+        run: ./devtools/format_yml.sh
+      - name: Format Shell
+        run: ./devtools/format_sh.sh
+
+      # Get latest version from https://autofix.ci/setup
+      - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
+
+  autofix-schemas:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update schemas
+        run: ./devtools/update_schemas.sh
+
+      # Get latest version from https://autofix.ci/setup
+      - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
+
+  autofix-toml:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install taplo
+        run: |
+          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
+            | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
+      - run: |
+          taplo fmt
+
+      # Get latest version from https://autofix.ci/setup
+      - uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a

.github/workflows/ci.yml → .github/workflows/contract.yml

@@ -1,4 +1,4 @@
-name: Contract Development
+name: Contract
 
 # Pushes to long living branches and all PRs
 on:
@@ -29,14 +29,12 @@ jobs:
         working-directory: ./contracts/hackatom
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.59.0
-          target: wasm32-unknown-unknown
-          profile: minimal
-          override: true
+          toolchain: 1.81.0
+          targets: wasm32-unknown-unknown
       - name: Build hackatom wasm
         run: cargo wasm --locked
       - name: Unit Test hackatom

.github/workflows/toml.yml

@@ -0,0 +1,26 @@
+name: "TOML checks"
+
+on:
+  merge_group:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  fmt-check:
+    name: "Formatting"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install taplo
+        run: |
+          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
+            | gzip -d - | install -m 755 /dev/stdin /usr/local/bin/taplo
+      - run: |
+          taplo fmt
+          CHANGES_IN_REPO=$(git status --porcelain)
+          if [[ -n "$CHANGES_IN_REPO" ]]; then
+              exit 1
+          fi

.github/workflows/typo-check.yml

@@ -0,0 +1,28 @@
+name: Check for typos
+
+on:
+  merge_group:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  check-typos:
+    name: "Spell-check repository source"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - id: files
+        uses: tj-actions/changed-files@v46
+        with:
+          files_ignore: |
+            contracts/**/schema/**
+            packages/crypto/**/*.json
+            packages/vm/**/*.wasm
+      - name: Run spell-check
+        uses: crate-ci/typos@master
+        with:
+          files: ${{ steps.files.outputs.all_changed_files }}

.github/workflows/workspace.yml

@@ -0,0 +1,43 @@
+name: Workspace
+
+# Check workspace build on merge commit of all PRs.
+# Branches are checked better by CircleCI.
+on:
+  pull_request:
+
+env:
+  RUST_BACKTRACE: 1
+
+jobs:
+  check-workspace:
+    name: Check workspace
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.81.0
+          targets: wasm32-unknown-unknown
+          components: clippy, rustfmt
+      - name: "Cache build artifacts"
+        uses: Swatinem/rust-cache@v2
+      - name: Check workspace
+        run: ./devtools/check_workspace.sh
+
+  test-workspace:
+    name: Test workspace
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.81.0
+          components: rustfmt
+      - name: "Cache build artifacts"
+        uses: Swatinem/rust-cache@v2
+      - name: Test workspace
+        run: ./devtools/test_workspace.sh

.gitignore

@@ -9,7 +9,6 @@ target/
 artifacts/
 
 # IDEs
-.vscode/
 .idea/
 *.iml
 
@@ -18,3 +17,4 @@ artifacts/
 
 # Log files (e.g. memory profiling)
 *.log
+dhat-heap.json

.mergify.yml

@@ -6,27 +6,50 @@ pull_request_rules:
       - "#approved-reviews-by>=1"
       - base=main
       - label=automerge
+      - -draft
       - label!=WIP
-      # We need to list them all individually. Here is why: https://doc.mergify.io/conditions.html#validating-all-status-check
-      - "status-success=ci/circleci: package_crypto"
-      - "status-success=ci/circleci: package_schema"
-      - "status-success=ci/circleci: package_std"
-      - "status-success=ci/circleci: package_storage"
-      - "status-success=ci/circleci: package_vm"
+      # We need to list them all individually. Here is why: https://docs.mergify.com/conditions/#validating-all-status-checks
+      # Also make sure to update this when the CI names change
+      - "status-success=macOS"
+      - "status-success=Windows"
+      - "status-success=ci/circleci: arm64"
+      - "status-success=ci/circleci: clippy-1.67.0"
+      - "status-success=ci/circleci: clippy-1.68.2"
       - "status-success=ci/circleci: contract_burner"
       - "status-success=ci/circleci: contract_crypto_verify"
+      - "status-success=ci/circleci: contract_cyberpunk"
+      - "status-success=ci/circleci: contract_ibc2"
+      - "status-success=ci/circleci: contract_floaty"
+      - "status-success=ci/circleci: contract_hackatom"
       - "status-success=ci/circleci: contract_hackatom"
       - "status-success=ci/circleci: contract_ibc_reflect"
       - "status-success=ci/circleci: contract_ibc_reflect_send"
-      - "status-success=ci/circleci: contract_floaty"
       - "status-success=ci/circleci: contract_queue"
       - "status-success=ci/circleci: contract_reflect"
       - "status-success=ci/circleci: contract_staking"
+      - "status-success=ci/circleci: contract_virus"
+      # disabled temporarily because Rust version is too low
+      # - "status-success=ci/circleci: coverage"
       - "status-success=ci/circleci: fmt"
-      - "status-success=ci/circleci: clippy-1.54.0"
-      - "status-success=ci/circleci: clippy-1.58.1"
-      - "status-success=Windows"
-      - "status-success=macOS"
+      - "status-success=ci/circleci: fmt_extra"
+      - "status-success=ci/circleci: package_check"
+      - "status-success=ci/circleci: package_crypto"
+      - "status-success=ci/circleci: package_schema"
+      - "status-success=ci/circleci: package_schema_derive"
+      - "status-success=ci/circleci: package_std"
+      - "status-success=ci/circleci: package_vm"
+      - "status-success=ci/circleci: package_vm_windows"
     actions:
       merge:
         method: merge
+  - name: backport PRs to minor version branch
+    conditions:
+      - base=main
+      - label=backport
+    actions:
+      backport:
+        branches:
+          # Update this when going to a new minor version
+          - "release/1.4"
+        assignees:
+          - "{{ author }}"

.taplo.toml

@@ -0,0 +1,2 @@
+[formatting]
+indent_string = "    "

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "rust-analyzer.cargo.features": [
+    "ibc2",
+    "stargate",
+    "staking",
+    "cosmwasm_2_1"
+  ]
+}