Commit Graph

5393 Commits

Author SHA1 Message Date
Arya d3319ba92b marks db as upgraded, maintains a copy of the value balance in the old format 2024-08-02 02:53:45 -04:00
Arya f40d0f8735 updates snapshots 2024-08-01 22:29:56 -04:00
Arya e981601f5f reverts major db version bump, bumps minor version instead, updates IntoDisk impl for ValueBalance associated Bytes type to vec, updates `to_bytes()` method to return a vec, updates tests 2024-08-01 21:56:48 -04:00
Marek 9cb40e47f7 Bump the major database format version 2024-08-02 00:10:05 +02:00
Marek 9620344f9b Merge branch 'update-value-balance' of github.com:ZcashFoundation/zebra into update-value-balance 2024-08-01 22:56:56 +02:00
Marek 93160c566f Merge branch 'deferred-pool' into update-value-balance 2024-08-01 22:56:32 +02:00
Arya 40da48d4da
Update zebra-consensus/src/checkpoint.rs 2024-08-01 12:14:54 -04:00
Arya cdb1684238 Updates the NU6 consensus branch id 2024-08-01 12:02:54 -04:00
Arya 8949301ab8 Uses FPF Testnet address for post-NU6 testnet funding streams 2024-08-01 10:06:51 -04:00
Marek bcdb7f3b37 Merge branch 'deferred-pool' into update-value-balance 2024-08-01 15:57:29 +02:00
Marek d7f3df9f43 Avoid a panic when deserializing value balances 2024-08-01 13:10:35 +02:00
Marek f826113b0b Cleanup: Simplify getting info for FS receivers 2024-08-01 13:01:37 +02:00
Marek 16eeee445b Update docs for value balances 2024-08-01 12:46:46 +02:00
Marek a813af85e5
Update zebra-consensus/src/checkpoint.rs
Co-authored-by: Arya <aryasolhi@gmail.com>
2024-08-01 12:24:55 +02:00
Arya e5eaf38ba1 Updates `FundingStreamRecipient::new()` to accept an iterator of items instead of an option of an iterator, updates a comment quoting the coinbase transaction balance consensus rule to note that the current code is inconsistent with the protocol spec, adds a TODO for updating the quote there once the protocol spec has been updated. 2024-07-31 21:40:03 -04:00
Arya 7987c76365 Adds a TODO for updating `FundingStreamReceiver::name()` method docs 2024-07-31 21:27:43 -04:00
Arya 14fbfb454f Updates `get_block_subsidy()` RPC method to exclude lockbox funding stream from `fundingstreams` field 2024-07-31 21:23:43 -04:00
Arya bf49432703 Updates deferred pool funding stream name to "Lockbox", moves post-NU6 height ranges to constants, updates TODO 2024-07-31 21:21:45 -04:00
Arya 126fdab77f updates test name 2024-07-31 21:05:57 -04:00
Arya b82f2be26e
Merge branch 'main' into deferred-pool 2024-07-31 15:55:57 -04:00
Marek 45261a26eb
Don't use a fixed size of serialized ValueBalance (#8732) 2024-07-31 16:09:24 +00:00
Marek c5e7dbe193 Merge branch 'update-value-balance' of github.com:ZcashFoundation/zebra into update-value-balance 2024-07-31 15:51:46 +02:00
Marek a1b3ca618f Refactor docs around chain value pool changes 2024-07-31 15:49:16 +02:00
Marek 0bdda3aaf9
Update zebra-chain/src/block.rs
Co-authored-by: Arya <aryasolhi@gmail.com>
2024-07-31 00:35:57 +02:00
Marek 9c0c7ffc89 Fix warnings raised by `cargo fmt` 2024-07-30 18:31:24 +02:00
Marek a0fd18afbd Fix warnings raised by Clippy 2024-07-30 18:25:22 +02:00
Marek 8074a1368f Merge branch 'deferred-pool' into update-value-balance 2024-07-30 16:48:15 +02:00
Marek cbafe35aed Simplify docs 2024-07-30 16:45:43 +02:00
dependabot[bot] 8b8a7a4ac5
build(deps): bump the devops group with 2 updates (#8720)
Bumps the devops group with 2 updates: [docker/login-action](https://github.com/docker/login-action) and [docker/build-push-action](https://github.com/docker/build-push-action).


Updates `docker/login-action` from 3.2.0 to 3.3.0
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v3.2.0...v3.3.0)

Updates `docker/build-push-action` from 6.4.1 to 6.5.0
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v6.4.1...v6.5.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: devops
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: devops
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-30 14:10:05 +00:00
Pili Guerra 6aa285838a
Merge branch 'main' into deferred-pool 2024-07-30 10:01:58 +01:00
dependabot[bot] 7b0c1adb62
build(deps): bump the prod group with 5 updates (#8726)
* build(deps): bump the prod group with 5 updates

Bumps the prod group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.10` | `4.5.11` |
| [toml](https://github.com/toml-rs/toml) | `0.8.15` | `0.8.16` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.39.0` | `1.39.2` |
| [console-subscriber](https://github.com/tokio-rs/console) | `0.3.0` | `0.4.0` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.120` | `1.0.121` |


Updates `clap` from 4.5.10 to 4.5.11
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.10...clap_complete-v4.5.11)

Updates `toml` from 0.8.15 to 0.8.16
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.15...toml-v0.8.16)

Updates `tokio` from 1.39.0 to 1.39.2
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.39.0...tokio-1.39.2)

Updates `console-subscriber` from 0.3.0 to 0.4.0
- [Release notes](https://github.com/tokio-rs/console/releases)
- [Changelog](https://github.com/tokio-rs/console/blob/main/release-plz.toml)
- [Commits](https://github.com/tokio-rs/console/compare/console-subscriber-v0.3.0...console-subscriber-v0.4.0)

Updates `serde_json` from 1.0.120 to 1.0.121
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.120...v1.0.121)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: console-subscriber
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
...

Signed-off-by: dependabot[bot] <support@github.com>

* cargo vet

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>
2024-07-30 00:15:26 +00:00
Marek fbbd8d1512 Allow deserialization of legacy `ValueBalance`s 2024-07-30 01:01:18 +02:00
Marek 99b761e608 Fix `CheckpointVerifiedBlock` conversion in tests 2024-07-30 01:01:18 +02:00
Marek 27177f23cd Support heights below slow start shift in halvings 2024-07-30 01:01:18 +02:00
Marek 5c470efff6 Track deferred balances 2024-07-30 01:01:18 +02:00
Marek 8f83b14af2 Stop recalculating the block subsidy 2024-07-30 01:01:18 +02:00
Marek 3a3f2ed923 Add TODOs 2024-07-30 01:01:18 +02:00
Marek c54ef0c8b8 Unrelated: Revise docs 2024-07-30 01:01:18 +02:00
Marek 19f63b2b53 Update snapshots 2024-07-30 01:01:18 +02:00
Marek 4d7424546d Add `Deferred` to `ValueBalance` 2024-07-30 01:01:18 +02:00
Arya 4627c0854d Reverts changes for coinbase should balance exactly ZIP 2024-07-29 18:07:38 -04:00
Arya c113601cb5 Checks that the original valid block template at height 2 is accepted as a block submission 2024-07-29 17:02:26 -04:00
Arya 166bc23f06 Updates acceptance test to check that invalid blocks are rejected 2024-07-29 16:58:44 -04:00
Arya c6244e66fc
Update zebra-chain/src/parameters/network_upgrade.rs 2024-07-29 15:26:24 -04:00
Arya 7173af73f4 Fixes bad merge 2024-07-29 14:07:48 -04:00
Arya 95378fd284
Merge branch 'main' into deferred-pool 2024-07-29 14:02:17 -04:00
Arya 988dd55e48
change(network-params): Configurable Testnet funding streams (#8718)
* Addresses clippy lints

* checks network magic and returns early from `is_regtest()`

* Moves  `subsidy.rs` to `zebra-chain`, refactors funding streams into structs, splits them into pre/post NU6 funding streams, and adds them as a field on `testnet::Parameters`

* Replaces Vec with HashMap, adds `ConfiguredFundingStreams` type and conversion logic with constraints.

Minor refactors

* Empties recipients list

* Adds a comment on num_addresses calculation being invalid for configured Testnets, but that being okay since configured testnet parameters are checked when they're being built

* Documentation fixes, minor cleanup, renames a test, adds TODOs, and fixes test logic

* Removes unnecessary `ParameterSubsidy` impl for &Network, adds docs and TODOs

---------

Co-authored-by: Pili Guerra <mpguerra@users.noreply.github.com>
2024-07-29 16:15:09 +00:00
Arya 14f473d1ea
Adds timeouts tonic clients in tests (#8724) 2024-07-27 15:20:47 +00:00
dependabot[bot] 4f6c4aeaa1
build(deps): bump the prod group across 1 directory with 8 updates (#8717)
* build(deps): bump the prod group across 1 directory with 8 updates

Bumps the prod group with 8 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.9` | `4.5.10` |
| [toml](https://github.com/toml-rs/toml) | `0.8.14` | `0.8.15` |
| [tokio](https://github.com/tokio-rs/tokio) | `1.38.1` | `1.39.0` |
| [thiserror](https://github.com/dtolnay/thiserror) | `1.0.62` | `1.0.63` |
| [tonic](https://github.com/hyperium/tonic) | `0.12.0` | `0.12.1` |
| [tonic-build](https://github.com/hyperium/tonic) | `0.12.0` | `0.12.1` |
| [tonic-reflection](https://github.com/hyperium/tonic) | `0.12.0` | `0.12.1` |
| [syn](https://github.com/dtolnay/syn) | `2.0.71` | `2.0.72` |



Updates `clap` from 4.5.9 to 4.5.10
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.9...v4.5.10)

Updates `toml` from 0.8.14 to 0.8.15
- [Commits](https://github.com/toml-rs/toml/compare/toml-v0.8.14...toml-v0.8.15)

Updates `tokio` from 1.38.1 to 1.39.0
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.38.1...tokio-1.39.0)

Updates `thiserror` from 1.0.62 to 1.0.63
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.62...1.0.63)

Updates `tonic` from 0.12.0 to 0.12.1
- [Release notes](https://github.com/hyperium/tonic/releases)
- [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/tonic/compare/v0.12.0...v0.12.1)

Updates `tonic-build` from 0.12.0 to 0.12.1
- [Release notes](https://github.com/hyperium/tonic/releases)
- [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/tonic/compare/v0.12.0...v0.12.1)

Updates `tonic-reflection` from 0.12.0 to 0.12.1
- [Release notes](https://github.com/hyperium/tonic/releases)
- [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/tonic/compare/v0.12.0...v0.12.1)

Updates `syn` from 2.0.71 to 2.0.72
- [Release notes](https://github.com/dtolnay/syn/releases)
- [Commits](https://github.com/dtolnay/syn/compare/2.0.71...2.0.72)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: toml
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tonic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tonic-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: tonic-reflection
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
- dependency-name: syn
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod
...

Signed-off-by: dependabot[bot] <support@github.com>

* cargo vet

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alfredo Garcia <oxarbitrage@gmail.com>
Co-authored-by: Arya <aryasolhi@gmail.com>
2024-07-26 20:19:38 +00:00
Arya 7df2e2863f Fixes potential panic 2024-07-26 13:37:04 -04:00