Skip to content

Commit 6f131f9

Browse files
committed
Pending updates, changes for Win
1 parent 71146c2 commit 6f131f9

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

.github/workflows/Zero_Linux_CI.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@ name: Zero Linux CI
22

33
on:
44
pull_request:
5-
branches: [master]
65
push:
7-
branches: [master]
86
schedule:
97
- cron: '0 19 * * *'
108

119
jobs:
1210

1311
linux-build:
1412
name: Linux Build
15-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-24.04
1614

1715
steps:
18-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1917

2018
- name: Install deps (Linux)
2119

@@ -25,7 +23,7 @@ jobs:
2523
sudo apt-get update # prevents repo404 errors on apt-remove below
2624
sudo apt-get install \
2725
build-essential pkg-config libc6-dev m4 g++-multilib \
28-
autoconf libtool ncurses-dev unzip git python python-zmq \
26+
autoconf libtool ncurses-dev unzip git python3 python3-zmq python-is-python3 \
2927
zlib1g-dev wget bsdmainutils automake cmake curl
3028
./zcutil/fetch-params.sh
3129
@@ -35,7 +33,7 @@ jobs:
3533
tar -czvf zero-linux.tar.gz src/zerod src/zero-cli
3634
3735
- name: Upload zero-linux.tar.gz as artifact
38-
uses: actions/upload-artifact@v1
36+
uses: actions/upload-artifact@v4
3937
with:
4038
name: zero-linux
4139
path: ./zero-linux.tar.gz

Subsidy.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@ void FillBlockPayee(CMutableTransaction& txNew, CAmount nFees, CTxOut& txFounder
255255
| Location | Issue |
256256
|----------|-------|
257257
| `src/amount.h` | `MAX_MONEY = 1695014989600000` (16.95M ZER in zatoshi). Zero total supply ~25.6M ZER exceeds this; validation uses per-subsidy `MoneyRange` only. |
258-
| (removed) | `338665500000000` — outdated total subsidy (zatoshi); Zero total ≈ 2.56e15. |
259-
| `TODO.md` | Same `338665500000000` reference. |
260-
| `TEST.md` | Same `338665500000000` reference. |
261258
| `README.md` | "Stable supply is 3888 ZER, after first halfing" — ambiguous; 3888 ≈ daily emission (720×5.4) after first halving, not total supply. |
262259
| `doc/tor.md` | `"subver" : "/MagicBean:1.0.0/"` — legacy; Zero uses Ambrym. |
263260

@@ -273,6 +270,17 @@ void FillBlockPayee(CMutableTransaction& txNew, CAmount nFees, CTxOut& txFounder
273270
| `invalidblockrequest.py` | Fixed: tx amounts 9 ZER for 10 ZER coinbase. |
274271
| `wallet.py` and others | Use initialize_chain_clean; expected amounts may need Zero-specific updates. |
275272

273+
### 11.3 Wrong Subsidy Value `338665500000000<?>`
274+
275+
**Unit:** The value is in **zatoshi** (1 ZER = 10⁸ zatoshis, same as Bitcoin satoshi).
276+
`338665500000000` zatoshi = **3,386,655 ZER**.
277+
278+
**Correct reference:** Zero total supply ≈ **25.6M ZER** (see §11). Founders reward total: **1,275,000 ZER** (under 1.5M ZER) = 1.275×10¹⁴ zatoshi.
279+
280+
**Comparison:** `338665500000000` (3.39M ZER) is ~2.7× the correct founders total. It appears in `src/gtest/test_foundersreward.cpp:189` as the expected "total founders reward" from `slow_start_subsidy`. The test uses `GetBlockSubsidy(...) / 5` (20%) — a **Zcash-derived formula**. Zero uses **7.5%** founders reward (`payments.cpp:306`). The value is wrong for Zero; append `<?>` as a reminder wherever it appears.
281+
282+
**Tracking:** See UpdateZero.md §4.6 (Documented Mismatches).
283+
276284
---
277285

278286
## 12. Consensus Validation

UpdateTests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Aggregated from coverage analysis. Detailed limitations, justifications for excl
592592

593593
### 9.4 Recent Fixes (June 2025)
594594

595-
- **Founders reward:** Halving (9,10), 11 addresses, subsidy 338665500000000. Accuracy TBD.
595+
- **Founders reward:** Halving (9,10), 11 addresses. See Subsidy.md §11.3 (338665500000000<?>).
596596
- **Alert:** Placeholder keys; verification disabled; deprecated.
597597
- **Tx size:** Sapling limits validated.
598598
- **PTHREAD_STACK_MIN:** configure.ac, depends; threading compatibility.

UpdateZero.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ bugs also present in HUSH3.
135135
| Python 3 migration | Planned | When feasible; hashlib.blake2b replaces pyblake2 |
136136
| GTest 1.12.1 upgrade | Pending | C++14 min; cross-fork validation |
137137

138-
### 4.6 Documented Mismatches (Subsidy §11.1)
138+
### 4.6 Documented Mismatches (Subsidy §11.1, §11.3)
139139

140140
| Location | Issue |
141141
|----------|-------|
142142
| `src/amount.h` | `MAX_MONEY = 16.95M ZER`; Zero total supply ~25.6M ZER exceeds this; validation uses per-subsidy `MoneyRange` only, not cumulative |
143-
| `TODO.md`, `TEST_ZERO.md` | Outdated `338665500000000` total subsidy reference; Zero total ≈ 2.56e15 zatoshi |
143+
| `src/gtest/test_foundersreward.cpp:189` | `338665500000000<?>` — wrong founders total; test uses /5 (20%), Zero has 7.5%; see Subsidy.md §11.3 |
144144
| `README.md` | "Stable supply is 3888 ZER, after first halfing" — ambiguous; 3888 ≈ daily emission (720×5.4) after first halving, not total supply |
145145
| `doc/tor.md` | `"subver" : "/MagicBean:1.0.0/"` — legacy; Zero uses Ambrym |
146146

src/gtest/test_foundersreward.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ TEST(founders_reward_test, slow_start_subsidy) {
186186
}
187187
//std::cout << "Total Founders Fee " << totalSubsidy << "\n";
188188
// Updated to match actual calculated total subsidy
189-
ASSERT_TRUE(totalSubsidy == 338665500000000);
189+
ASSERT_TRUE(totalSubsidy == 338665500000000); // <?> wrong for Zero: test uses /5 (20%), Zero has 7.5%; see Subsidy.md §11.3
190190

191191
//Max Money
192192
totalSubsidy = 0;

0 commit comments

Comments
 (0)