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.

Sign up for GitHub

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

Jump to bottom

Dry marginal #14

Merged
merged 74 commits into from
Apr 3, 2024
Merged

Dry marginal #14

merged 74 commits into from
Apr 3, 2024

Conversation

zancas
Copy link

@zancas zancas commented Apr 3, 2024

No description provided.

rex4539 and others added 30 commits March 8, 2024 13:57
@rex4539 @zancas
Fix RUSTSEC-2024-0019
36366cf 
(cherry picked from commit cd99cd4)
@fluidvanadium
Merge pull request zingolabs#833 from zancas/RUSTSEC-2024-0019_on_stable
a51b593 
Fix RUSTSEC-2024-0019
@zancas
set to latest stable
30d0b67
@zancas
Merge branch 'stable' into update
b44b74b
@zancas
Merge pull request zingolabs#834 from fluidvanadium/update
ba6df0e 
stabilize rust toolchain
@Oscar-Pepper
remove fakemainnet
6dd88f0
@AloeareV
Merge pull request zingolabs#851 from fluidvanadium/build_transaction…
f30fe7b 
…_request

implement a new function necessary to transmute the Receivers into an…
@Oscar-Pepper
fixed failing test
d1a8a08
@Oscar-Pepper
remove unused TransactionIndex
fe15c29
@Oscar-Pepper
remove unused import
08f1864
@zancas
update toolchain to rust 1.77
f08e3b7
@zancas
run cargo update
8d92a2a
@zancas
Merge branch 'dev' into remove_fake_mainnet
0eb2d77
@zancas
maybe someday this will be used, probably not valuable to rip it out now
9ba11d9
@zancas
Merge pull request zingolabs#850 from Oscar-Pepper/remove_fake_mainnet
c20f2eb 
remove fakemainnet
@fluidvanadium
Merge branch 'dev' into rescue_transaction_context
ba38f77
@zancas
add donation address to zingoconfig
f531151
@Oscar-Pepper
Merge pull request zingolabs#848 from fluidvanadium/rescue_transactio…
9ce9c25 
…n_context

Rescue transaction context
@zancas
when I remove these two flakes all the tests on dev pass, as required
5fcb9b9
@zancas
Merge branch 'dev' into donation_address
e17207f
@zancas
Merge pull request zingolabs#855 from zancas/ignore_flakey_tests
5c6c584 
when I remove these two flakes all the tests on dev pass, as required
@Oscar-Pepper @zancas
added zingocli data to gitignore and corrected mine to address
4ffdd1c 
(cherry picked from commit b4b2317)
@zancas
Merge branch 'dev' into donation_address
2dd42d6
@zancas
unify zcash.conf source of truth for regtests and zingocli regtest mode
337c3a6
@zancas
allow bugfixes in the toolchain
cd46177
@zancas
clean up .gitignore
18303db
@zancas
code cherry picked from spend_kit: 7c0f689
6e42fe3 
(cherry picked from commit 65cb364)
@zancas
fix bug, replace wet code with DRY composition
819b2fb 
(cherry picked from commit 3493715)
@zancas
add complementary is_[confirmed|broadcast] assertions, tighten bounda…
a8dd7cb 
…ry conditions, remove obsolete comment
@zancas
trigger doctests (and other internal tests picked up by cargo test) i…
548d0ef 
…n zingo*/src directories
zancas and others added 22 commits April 1, 2024 20:43
@zancas
Merge branch 'dev' into unify_zcash_conf
a6557af
@Oscar-Pepper
Merge pull request zingolabs#870 from zancas/set_rustc_stable
70afc96 
set toolchains to stable
@Oscar-Pepper
Resolved merge conflicts backporting stable toolchain from stable
e25ae08
@zancas
temporary revert
18b9d39
@Oscar-Pepper
Merge pull request zingolabs#857 from zancas/unify_zcash_conf
79ad9b9 
Unify zcash conf
@zancas
Merge pull request zingolabs#875 from Oscar-Pepper/backport_stable_to…
5ad4c5d 
…olchain_from_stable

Backport stable toolchain from stable
@zancas
Merge pull request zingolabs#872 from Oscar-Pepper/add_stable_to_ci_p…
9fb44db 
…ush_list

add stable to CI push list
@zancas
update dirs per dependabot recommendation
78aebb5
@zancas
update Cargo.lock with new dirs
7b38a8e
@AloeareV
Merge pull request zingolabs#878 from zancas/update_dirs
4d574a9 
Update dirs
@zancas
unify webpki dependency
663ed50
@zancas
resolve conflicts from stable
eda7a0a
@zancas
update Cargo.lock
ba00e2f
@zancas
Merge pull request zingolabs#880 from zancas/update_deps_from_stable
32e9c37 
Update deps from stable
@zancas
update to zip339 from stable
d12dc4c
@zancas
merge in latest dev
0bfbdd5
@zancas
fix missed conflict markers
0cf777c
@zancas
make send be a default feature-gated feature, and add doc-comments
450c9f5
@zancas
hack to get u64 for MARGINAL_FEE, but use correct SSOT, and be concise
bdc5eb6
@zancas
fix fn name
90df703
@zancas
remove duplicate definitions of MARGINAL_FEE
3a6fd74
@zancas
fix trailing whitespace
fed8b5f
This was referenced Apr 3, 2024
Closed
Closed
fluidvanadium
fluidvanadium requested changes Apr 3, 2024
View reviewed changes
Copy link
Owner

@fluidvanadium fluidvanadium left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i left 2 complementary comments and 2 that i think should be changed

docker/Dockerfile Show resolved Hide resolved
zingo-status/src/confirmation_status.rs Show resolved Hide resolved
rust-toolchain.toml Show resolved Hide resolved
zingoconfig/src/lib.rs Show resolved Hide resolved
@fluidvanadium fluidvanadium merged commit d30d3f8 into fluidvanadium:spend_kit Apr 3, 2024
2 of 4 checks passed
@zancas zancas deleted the DRY_MARGINAL branch May 30, 2024 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fluidvanadium fluidvanadium Awaiting requested review from fluidvanadium

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zancas @fluidvanadium @rex4539 @Oscar-Pepper @AloeareV