Feat/merge with dev

.cargo/config.toml

@@ -50,6 +50,8 @@ rustflags = [
   "--cfg",
   "tokio_unstable",
   "-C",
+  "linker=clang",
+  "-C",
   "link-arg=-fuse-ld=lld",
   "-C",
   "force-frame-pointers=yes",
@@ -71,3 +73,7 @@ rustflags = [
   "-C",
   "link-arg=/STACK:8000000",  # Set stack to 8 MB
 ]
+
+[env]
+CMAKE_POLICY_VERSION_MINIMUM = "3.5"
+CXXFLAGS = "-include cstdint"        # Needed for `librocksdb-sys` build

.cursorrules

@@ -0,0 +1,32 @@
+# Supra Move Development Rules
+
+CRITICAL: This is a Supra Move project, NOT Aptos Move. Never use aptos_framework.
+
+## Framework Rules:
+1. ALWAYS use supra_framework:: instead of aptos_framework::
+2. Available namespaces: supra_framework::, std::
+3. Main modules in supra_framework: config_buffer, create_signer, system_addresses, block, reconfiguration, reconfiguration_with_dkg, genesis, automation_registry, event, randomness, state_storage, transaction_fee, util, fungible_asset, multisig_account, function_info, validator_consensus_info, dispatchable_fungible_asset, aggregator_v2, aggregator_factory, chain_id, chain_status, consensus_config, execution_config, gas_schedule, pbo_delegation_pool, staking_config, staking_contract, storage_gas, supra_config, supra_governance, timestamp, transaction_validation, version, vesting, vesting_without_staking, supra_coin, account, supra_account
+4. Standard library modules: vector, table, borrow_mut, error, features, option, signer, string, fixed_point32
+
+## Code Generation Rules:
+- Use supra_framework::account for account operations
+- Use supra_framework::supra_coin for native token operations
+- Use supra_framework::timestamp for time operations
+- Use supra_framework::event for event handling
+- Use std::vector for vector operations
+- Use std::table for table operations
+
+## Example Patterns:
+```move
+module supra_framework::example {
+    use supra_framework::account;
+    use supra_framework::signer;
+    use std::vector;
+
+    public fun init(account: &signer) {
+        // Supra Move code
+    }
+}
+```
+
+When generating Move code, ALWAYS use the Supra Move framework patterns above.

.github/workflows/aptos-framework-test.yaml

@@ -1,4 +1,5 @@
 name: Run aptos framework checks
+
 on:
   push:
     branches: [ "dev", "release/**", "feature/**" ]
@@ -7,25 +8,55 @@ on:
     types: [opened, synchronize, ready_for_review]
     branches: [ "dev", "release/**", "feature/**" ]
     paths-ignore: [ '**/*.md' ]
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
+
 env:
   CARGO_TERM_COLOR: always
   CARGO_NET_GIT_FETCH_WITH_CLI: true
   DOCKER_BUILDKIT: 1
-  FORGE_BIN: ~/.foundry/bin/forge
-  SUI_BIN: ~/.cargo/bin/sui
-  APTOS_BIN: ~/.local/bin/aptos
-  SCRYPTO_BIN: ~/.cargo/bin/scrypto
+
 jobs:
   build:
-    runs-on: ghr-elastic-supra-aptos-core-runner
+    runs-on: [self-hosted, do-ephemeral]
     timeout-minutes: 90
+
     steps:
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/checkout@v4
-      - run: cargo test --release -p aptos-types --lib unit_tests --no-fail-fast
-      - run: cargo test --release -p aptos-framework -- --skip prover
-      - run: RUST_MIN_STACK=104857600 cargo test run -p language-e2e-testsuite --no-fail-fast
-      - run: RUST_MIN_STACK=104857600 cargo test run -p e2e-move-tests --no-fail-fast
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@nextest
+
+      - name: Setup SSH access
+        run: |
+          mkdir -p ~/.ssh
+
+          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+          echo "Host github.com
+            StrictHostKeyChecking no
+          " >> ~/.ssh/config
+
+      - name: Test SSH connection
+        run: ssh -T git@github.com || true
+
+      - name: Run aptos-types tests
+        run: cargo test --release -p aptos-types --lib unit_tests --no-fail-fast
+
+      - name: Run aptos-framework tests
+        run: cargo test --release -p aptos-framework -- --skip prover
+
+      - name: Run language e2e tests
+        run: RUST_MIN_STACK=104857600 cargo nextest run -p language-e2e-testsuite --no-fail-fast
+
+      - name: Run move e2e tests
+        run: RUST_MIN_STACK=104857600 cargo nextest run -p e2e-move-tests --no-fail-fast