Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dry marginal #14

Merged
merged 74 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
36366cf
Fix RUSTSEC-2024-0019
rex4539 Mar 8, 2024
a51b593
Merge pull request #833 from zancas/RUSTSEC-2024-0019_on_stable
fluidvanadium Mar 11, 2024
30d0b67
set to latest stable
zancas Mar 11, 2024
b44b74b
Merge branch 'stable' into update
zancas Mar 11, 2024
ba6df0e
Merge pull request #834 from fluidvanadium/update
zancas Mar 11, 2024
6dd88f0
remove fakemainnet
Oscar-Pepper Mar 15, 2024
f30fe7b
Merge pull request #851 from fluidvanadium/build_transaction_request
AloeareV Mar 19, 2024
d1a8a08
fixed failing test
Oscar-Pepper Mar 22, 2024
fe15c29
remove unused TransactionIndex
Oscar-Pepper Mar 22, 2024
08f1864
remove unused import
Oscar-Pepper Mar 22, 2024
f08e3b7
update toolchain to rust 1.77
zancas Mar 22, 2024
8d92a2a
run cargo update
zancas Mar 22, 2024
0eb2d77
Merge branch 'dev' into remove_fake_mainnet
zancas Mar 22, 2024
9ba11d9
maybe someday this will be used, probably not valuable to rip it out now
zancas Mar 22, 2024
c20f2eb
Merge pull request #850 from Oscar-Pepper/remove_fake_mainnet
zancas Mar 22, 2024
ba38f77
Merge branch 'dev' into rescue_transaction_context
fluidvanadium Mar 22, 2024
f531151
add donation address to zingoconfig
zancas Mar 23, 2024
9ce9c25
Merge pull request #848 from fluidvanadium/rescue_transaction_context
Oscar-Pepper Mar 26, 2024
5fcb9b9
when I remove these two flakes all the tests on dev pass, as required
zancas Mar 30, 2024
e17207f
Merge branch 'dev' into donation_address
zancas Mar 30, 2024
5c6c584
Merge pull request #855 from zancas/ignore_flakey_tests
zancas Mar 30, 2024
4ffdd1c
added zingocli data to gitignore and corrected mine to address
Oscar-Pepper Mar 29, 2024
2dd42d6
Merge branch 'dev' into donation_address
zancas Mar 30, 2024
337c3a6
unify zcash.conf source of truth for regtests and zingocli regtest mode
zancas Mar 30, 2024
cd46177
allow bugfixes in the toolchain
zancas Mar 30, 2024
18303db
clean up .gitignore
zancas Mar 30, 2024
6e42fe3
code cherry picked from spend_kit: 7c0f68940
zancas Mar 31, 2024
819b2fb
fix bug, replace wet code with DRY composition
zancas Mar 31, 2024
a8dd7cb
add complementary is_[confirmed|broadcast] assertions, tighten bounda…
zancas Mar 31, 2024
548d0ef
trigger doctests (and other internal tests picked up by cargo test) i…
zancas Mar 31, 2024
1ade74d
Merge pull request #859 from zancas/doctest_ci
fluidvanadium Mar 31, 2024
53594f8
Merge pull request #858 from zancas/fix_is_confirmed_before_bug
zancas Mar 31, 2024
e3e6171
Merge pull request #854 from zancas/donation_address
zancas Mar 31, 2024
b65cc1f
Bump tracing-log from 0.1.4 to 0.2.0
dependabot[bot] Apr 1, 2024
5852a23
Bump env_logger from 0.10.2 to 0.11.3
dependabot[bot] Apr 1, 2024
4084786
add donation address to zingoconfig
zancas Mar 23, 2024
3d55102
Run only doc tests and for the whole workspace
Oscar-Pepper Apr 1, 2024
b3cd8d9
Removed unused struct
Oscar-Pepper Apr 1, 2024
e27aa77
Better error handling for zingocli
Oscar-Pepper Apr 1, 2024
e8821e0
Add protoc, toolchain and cache
Oscar-Pepper Apr 1, 2024
a1a68e7
Fixed toolchain in CI
Oscar-Pepper Apr 1, 2024
41117b8
Merge pull request #867 from Oscar-Pepper/remove_unused_struct_breaki…
zancas Apr 1, 2024
f78167c
Merge pull request #866 from Oscar-Pepper/modify_doc_test_ci
zancas Apr 1, 2024
1c8ea36
Merge branch 'stable' into add_donation_address
zancas Apr 1, 2024
c956959
Merge pull request #864 from zingolabs/dependabot/cargo/env_logger-0.…
Oscar-Pepper Apr 1, 2024
ea9cc4e
Merge pull request #865 from Oscar-Pepper/add_donation_address
Oscar-Pepper Apr 1, 2024
77c3dcc
Merge pull request #862 from zingolabs/dependabot/cargo/tracing-log-0…
Oscar-Pepper Apr 1, 2024
984f48b
add stable to CI push list
Oscar-Pepper Apr 1, 2024
e8a14e5
set toolchains to stable
zancas Apr 1, 2024
a0e6392
return String for template fill errors
zancas Apr 1, 2024
a6557af
Merge branch 'dev' into unify_zcash_conf
zancas Apr 2, 2024
70afc96
Merge pull request #870 from zancas/set_rustc_stable
Oscar-Pepper Apr 2, 2024
e25ae08
Resolved merge conflicts backporting stable toolchain from stable
Oscar-Pepper Apr 2, 2024
18b9d39
temporary revert
zancas Apr 2, 2024
79ad9b9
Merge pull request #857 from zancas/unify_zcash_conf
Oscar-Pepper Apr 2, 2024
5ad4c5d
Merge pull request #875 from Oscar-Pepper/backport_stable_toolchain_f…
zancas Apr 2, 2024
9fb44db
Merge pull request #872 from Oscar-Pepper/add_stable_to_ci_push_list
zancas Apr 2, 2024
78aebb5
update dirs per dependabot recommendation
zancas Apr 2, 2024
7b38a8e
update Cargo.lock with new dirs
zancas Apr 2, 2024
4d574a9
Merge pull request #878 from zancas/update_dirs
AloeareV Apr 2, 2024
663ed50
unify webpki dependency
zancas Apr 2, 2024
eda7a0a
resolve conflicts from stable
zancas Apr 2, 2024
ba00e2f
update Cargo.lock
zancas Apr 2, 2024
32e9c37
Merge pull request #880 from zancas/update_deps_from_stable
zancas Apr 2, 2024
d12dc4c
update to zip339 from stable
zancas Apr 3, 2024
0bfbdd5
merge in latest dev
zancas Apr 3, 2024
0cf777c
fix missed conflict markers
zancas Apr 3, 2024
450c9f5
make send be a default feature-gated feature, and add doc-comments
zancas Apr 3, 2024
bdc5eb6
hack to get u64 for MARGINAL_FEE, but use correct SSOT, and be concise
zancas Apr 3, 2024
90df703
fix fn name
zancas Apr 3, 2024
3a6fd74
remove duplicate definitions of MARGINAL_FEE
zancas Apr 3, 2024
fed8b5f
fix trailing whitespace
zancas Apr 3, 2024
a6b633b
lint fixes
zancas Apr 3, 2024
d9fe4c7
apply more lints
zancas Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
pull_request:
push:
branches: [main, dev]
branches: [stable, dev]
workflow_dispatch:

jobs:
Expand All @@ -20,6 +20,28 @@ jobs:
- name: Reject trailing whitespace
run: ./utils/trailing-whitespace.sh reject

run-doc-tests:
name: Run doc tests
runs-on: ubuntu-22.04
env:
RUSTFLAGS: -D warnings
steps:
- name: Checkout repository
uses: actions/checkout@v3

- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: stable

- name: Install protoc
run: sudo apt-get install protobuf-compiler

- name: Cargo cache
uses: Swatinem/rust-cache@v2

- name: Run doc tests
run: cargo test --doc

test:
uses: ./.github/workflows/test.yaml
with:
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ cobertura.xml
docker-ci/lightwalletd
target
wallets/*
zingocli/regtest/logs/
zingocli/regtest/data/
zingocli/regtest/zingo-wallet.dat
zingocli/regtest/
zingocli/target
zingocli/tests/data/basic_zcashd.conf
zingocli/tests/data/externalwallet_coinbaseaddress.conf
Expand Down
Loading
Loading