Skip to content

Commit f9254ea

Browse files
sam0x17open-juniusales-otfgztensorbasfroman
authored
mainnet deploy 2/15/2025 (post dtao + hotfixes) (#1295)
* fix compile * Remove pallet-dynamic-fee and associated inherent data * Add tests, fix bugs * Cleanup * Add subnet volume migration to fix try-runtime * Revert endpoint change in try-runtime script * Use resulting average price formula for add-remove limit stake * commit Cargo.lock * cargo clippy * cargo fix * safe math usage * upgrade openssl * fix clippy * address freeze_struct * rename commit_reveal_period * apply criticial openssl update to fix RUSTSEC-2025-0004 (openssl) * remove subnet_info_v3 * address lint * update register_network with identity precompile * fix merge commit * bump spec * remove SubnetInfov3 struct * rename emission_values => emission_value * bump spec * safe math * remove duplicated function * use saturating math * add cleaned coinbase * noclaim * remove complexity * non scaled tao emission * bump * fix test * clean coinbase * pre merge * no tao in for non registration * move to moving prices rather than tao reserves * price * moving alpha * bump spec * Fix tests * add moving price tests * add alpha in tests * Fix all tests * Format * Fix unsafe math * alpha tests * set tao weight * reset default staking fee * fix names * add mainnet names * cargo clippy * cargo fmt * add a global min burn and migration * add more tests for root pending etc * alpha divs * fix test for root * new test root tao * fix wrong parse function * fix test * add toggle off for transfers * delete unused workflow file * Fix validation for transfer toggle * remove duplicate tests * fix subnet creation logic * cargo fmt * add new test * bump spec version to 228 * Add test test_drain_alpha_childkey_parentkey * spec bump * fix audit * fix audit * fix contract * commit Cargo.lock * cargo clippy * cargo fmt * fix min lock * fmt * fix migration test * cargo fmt * fix root * cargo fmt * add moving price to metagraph * use correct min burn init (#1265) * use correct min brun init * fmt * no into * no into 2 * bump spec * cargo update to fix cargo audit vulnerabilities * bump spec version * moving price init from emission * cargo fmt * bump spec version * commit Cargo.lock * cargo clippy * cargo fmt * DefaultMinimumPoolLiquidity and tempos in rao migration * update readme of support of M series macs * bump runtime version * add tao_emission to stakeinfo runtime * remove call from coinbase. already in block_step * add negation for pow-reg-allowed * only root can set min pow diff * oops * dont let ck-in-swap-sched move any stake/register * add tests for validation filter * add transfer stake to call nontransfer proxy filter * also add proxy filters for new calls * update staking priority * bump spec * use get_priority_staking for all stake operations * bump spec * clippy * Remove ownership check from transition stake validation * max the price for EMA calc at 1.0 * uncommitted lockfile change * bump spec version * fix merge conflicts * add CI action that requires clean merges between all named branches * fix * fixes * try again * fix again * fix * fix * stop needless wasting of CI hours with on push triggers we don't need * provide an identity for github action to prevent failure * Add serve_axon extrinsic validation * Bump spec version * Check IP validity in serve_axon validation first * make set diff only root * add test for set diff no owner * add migration for min diff * bump spec * only allow top-stake SN owner hk to stay immune * add tests * only allow replace non-top-stake owner hk * bump spec * add tests using SubnetOwnerHotkey * add impl for replace neuron * add swap test * add neuron prune impl * add swap hotkey impl * clippy * clippy * mistake in test --------- Co-authored-by: open-junius <zhou@opentensor.dev> Co-authored-by: Aliaksandr Tsurko <ales@opentensor.dev> Co-authored-by: Greg Zaitsev <gregz@opentensor.dev> Co-authored-by: Roman <167799377+roman-opentensor@users.noreply.github.com> Co-authored-by: JohnReedV <87283488+JohnReedV@users.noreply.github.com> Co-authored-by: Cameron Fairchild <cameron@opentensor.ai> Co-authored-by: unconst <jake@bittensor.com> Co-authored-by: Unconst <32490803+unconst@users.noreply.github.com> Co-authored-by: camfairchild <cameron@opentensor.dev> Co-authored-by: Prakash <qxprakash@gmail.com> Co-authored-by: ibraheem-opentensor <ibraheem@opentensor.dev>
1 parent f95810a commit f9254ea

File tree

32 files changed

+4850
-935
lines changed

32 files changed

+4850
-935
lines changed

‎.github/workflows/check-rust.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ concurrency:
55
cancel-in-progress: true
66

77
on:
8-
push:
9-
branches: [main, devnet-ready, devnet, testnet, finney]
10-
118
pull_request:
129

1310
## Allow running workflow manually from the Actions tab

‎.github/workflows/e2e-bittensor-tests.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ concurrency:
55
cancel-in-progress: true
66

77
on:
8-
push:
9-
branches: [main, devnet-ready, devnet, testnet, finney]
10-
118
pull_request:
129

1310
## Allow running workflow manually from the Actions tab

‎.github/workflows/require-clean-merges.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Require Clean Merges
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- devnet-ready
7+
- devnet
8+
- testnet
9+
10+
jobs:
11+
assert-clean-merges:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repository
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0 # Ensures we get all branches for merging
18+
19+
- name: Determine Target Branch and Set Merge List
20+
id: set-merge-branches
21+
run: |
22+
TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
23+
PR_BRANCH="${{ github.event.pull_request.head.ref }}"
24+
echo "PR_BRANCH=$PR_BRANCH" >> $GITHUB_ENV
25+
26+
if [[ "$TARGET_BRANCH" == "devnet-ready" ]]; then
27+
echo "MERGE_BRANCHES=devnet testnet main" >> $GITHUB_ENV
28+
elif [[ "$TARGET_BRANCH" == "devnet" ]]; then
29+
echo "MERGE_BRANCHES=testnet main" >> $GITHUB_ENV
30+
elif [[ "$TARGET_BRANCH" == "testnet" ]]; then
31+
echo "MERGE_BRANCHES=main" >> $GITHUB_ENV
32+
elif [[ "$TARGET_BRANCH" == "main" ]]; then
33+
echo "MERGE_BRANCHES=" >> $GITHUB_ENV # No need to merge anything into main
34+
else
35+
echo "MERGE_BRANCHES=devnet-ready devnet testnet main" >> $GITHUB_ENV
36+
fi
37+
38+
- name: Check Merge Cleanliness
39+
run: |
40+
TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
41+
PR_BRANCH="${{ github.event.pull_request.head.ref }}"
42+
echo "Fetching all branches..."
43+
git fetch --all --prune
44+
45+
echo "Checking out PR branch: $PR_BRANCH"
46+
git checkout $PR_BRANCH
47+
git reset --hard origin/$PR_BRANCH
48+
49+
# Configure a temporary Git identity to allow merging
50+
git config --local user.email "github-actions@github.com"
51+
git config --local user.name "GitHub Actions"
52+
53+
for branch in $MERGE_BRANCHES; do
54+
echo "Checking merge from $branch into $PR_BRANCH..."
55+
56+
# Ensure PR branch is up to date
57+
git reset --hard origin/$PR_BRANCH
58+
59+
# Merge without committing to check for conflicts
60+
if git merge --no-commit --no-ff origin/$branch; then
61+
echo "✅ Merge from $branch into $PR_BRANCH is clean."
62+
else
63+
echo "❌ Merge conflict detected when merging $branch into $PR_BRANCH"
64+
exit 1
65+
fi
66+
67+
# Abort merge if one was started, suppressing errors if no merge happened
68+
git merge --abort 2>/dev/null || true
69+
done

0 commit comments

Comments
 (0)