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

[move] patch arithmetic issue on net_val_reward 6.9.2 #142

Merged
merged 94 commits into from
Jan 13, 2024
Merged

[move] patch arithmetic issue on net_val_reward 6.9.2 #142

merged 94 commits into from
Jan 13, 2024

Conversation

sirouk
Copy link
Contributor

@sirouk sirouk commented Jan 13, 2024 •
edited by 0o-de-lally
Loading

Crucial change was adding a simple check if (nominal_reward_to_vals > entry_fee) before assigning net_val_reward in epoch_boundary.move

This is the patch implemented on 6.9.2 for the rescue mission.

@0o-de-lally
add rescue tests to ci
e8111b3
@0o-de-lally
rescue tests failing, stake::remove_validators was removed. Reintrodu…
22e6cfa 
…ce, but
@0o-de-lally
clean
d6ab64e
@0o-de-lally
release head.mrb
4231057
@0o-de-lally
tests: rescue cli produces a valid genesis from smoke db
012b947
@0o-de-lally
add meta test for stopping network
b0d1f63
@0o-de-lally
split up e2e tests
367cfbf
@0o-de-lally
can apply tx to database at rest and restart
152d229
@0o-de-lally
adding debug print to epoch boundary
3b67e1a
@0o-de-lally
refactor stake::remove_validators for 0L case
e9d8d12
@0o-de-lally
testing restart works. adapt to issue where swarm can't drop a valida…
4eb5062 
…tor from suite
@0o-de-lally
add full e2e test including catch up
83816a6
@0o-de-lally
update rust min stack
31a3c53
@0o-de-lally
scaffold framework test
0af2663
@0o-de-lally
make rescue ci only run a single test at a time to prevent multiple c…
91f360a 
…oncurrent swarms
@0o-de-lally
patch ci yaml
f1be5e0
@0o-de-lally
fmt
a9c94d9
@0o-de-lally
cleanig up rescue cli
4a03217
@0o-de-lally
wip try to bump epoch
0345a9c
@0o-de-lally
add emitting of epoch to reconfigure for test
3d88139
@0o-de-lally
add debugger commands
61af7ce
@0o-de-lally
add a framework upgrade script
130bcb0
@0o-de-lally
create framework upgrade test from script
0cee636
@0o-de-lally
remove deprecated admin_script_builder, remove deprecated templates.
c8f4915
@0o-de-lally
cleanup ci
468e24d
@0o-de-lally
try disabling reconfiguration
b7acf9d
@0o-de-lally
revert cargo.toml dev profile
f3a89dd
@0o-de-lally
cleanup. remove option of upgrades via move vm session
e873455
@0o-de-lally
clean up reconfiguration logic. Add apis for calling a reconfiguratio…
ba98233 
…n that ignores timestamp, if we need to do a rescue on round 0.
@0o-de-lally
allow diem governance to call stake::maybe_reconfigure
061cadb
@0o-de-lally 0o-de-lally changed the title [Carpe] Rescue twin [tools] refactor rescue cli Jan 13, 2024
@0o-de-lally 0o-de-lally mentioned this pull request Jan 13, 2024
Merged
3 tasks
@0o-de-lally 0o-de-lally changed the title [tools] refactor rescue cli [move] patch arithmetic issue on net_val_reward 6.9.2 Jan 13, 2024
hemulin
hemulin approved these changes Jan 13, 2024
View reviewed changes
Copy link
Contributor

@hemulin hemulin left a comment

Choose a reason for hiding this comment

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

LGTM 🙏

@0o-de-lally 0o-de-lally merged commit 6b57485 into main Jan 13, 2024
12 checks passed
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Jan 13, 2024
@0o-de-lally
Squashed commit of the following:
918cfb3 
commit a4c2f61
Author: sirouk <[email protected]>
Date:   Sat Jan 13 17:01:15 2024 -0500

    [move] set slow wallet entry function (0LNetworkCommunity#141)

    Co-authored-by: 0o-de-lally <>
    Co-authored-by: 0o-de-lally <[email protected]>

commit 6b57485
Author: sirouk <[email protected]>
Date:   Sat Jan 13 17:01:01 2024 -0500

    [move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommunity#142)

    Co-authored-by: 0o-de-lally <[email protected]>
    Co-authored-by: Nonast <[email protected]>
    Co-authored-by: sh1hsh1nk <[email protected]>

commit d982a70
Author: zoz <[email protected]>
Date:   Sat Jan 13 13:53:23 2024 -0800

    [tools] refactor rescue cli 6.9.1 (0LNetworkCommunity#137)

    Co-authored-by: 0o-de-lally <[email protected]>
0o-de-lally added a commit that referenced this pull request Jan 13, 2024
@0o-de-lally
Squashed commit of the following:
95c8802 
commit 2dab0e3
Merge: 918cfb3 a4c2f61
Author: 0o-de-lally <[email protected]>
Date:   Sat Jan 13 22:09:11 2024 +0000

    Merge branch 'main' into epoch_scheduler

commit 918cfb3
Author: 0o-de-lally <[email protected]>
Date:   Sat Jan 13 22:04:20 2024 +0000

    Squashed commit of the following:

    commit a4c2f61
    Author: sirouk <[email protected]>
    Date:   Sat Jan 13 17:01:15 2024 -0500

        [move] set slow wallet entry function (#141)

        Co-authored-by: 0o-de-lally <>
        Co-authored-by: 0o-de-lally <[email protected]>

    commit 6b57485
    Author: sirouk <[email protected]>
    Date:   Sat Jan 13 17:01:01 2024 -0500

        [move] patch arithmetic issue on net_val_reward 6.9.2 (#142)

        Co-authored-by: 0o-de-lally <[email protected]>
        Co-authored-by: Nonast <[email protected]>
        Co-authored-by: sh1hsh1nk <[email protected]>

    commit d982a70
    Author: zoz <[email protected]>
    Date:   Sat Jan 13 13:53:23 2024 -0800

        [tools] refactor rescue cli 6.9.1 (#137)

        Co-authored-by: 0o-de-lally <[email protected]>

commit db2813c
Author: 0o-de-lally <[email protected]>
Date:   Wed Dec 20 15:52:16 2023 +0000

    clean

commit d8cb2a6
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 18:25:30 2023 +0000

    notest

commit 5e4d26d
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 18:22:09 2023 +0000

    finish tests

commit d57ba94
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 16:02:34 2023 +0000

    and user can trigger epoch on boundary. functional test written.

commit b6b43ea
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 02:46:03 2023 +0000

    wip epoch count issue passing

commit c6ebe43
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 02:44:53 2023 +0000

    wip epoch count issue

commit ce3c1e8
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 01:48:21 2023 +0000

    patch

commit 43cacc6
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 01:47:15 2023 +0000

    enable epoch trigger
0o-de-lally added a commit that referenced this pull request Jan 14, 2024
@0o-de-lally
Squashed commit of the following:
b1699e2 
commit dbaebee
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 17:47:54 2024 +0000

    rename txs cli subcommand "upgrade" -> "governance", and include the epoch boundary tx.

commit a042461
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 17:30:22 2024 +0000

    make governance::trigger_epoch an entry function

commit 2dab0e3
Merge: 918cfb3 a4c2f61
Author: 0o-de-lally <[email protected]>
Date:   Sat Jan 13 22:09:11 2024 +0000

    Merge branch 'main' into epoch_scheduler

commit 918cfb3
Author: 0o-de-lally <[email protected]>
Date:   Sat Jan 13 22:04:20 2024 +0000

    Squashed commit of the following:

    commit a4c2f61
    Author: sirouk <[email protected]>
    Date:   Sat Jan 13 17:01:15 2024 -0500

        [move] set slow wallet entry function (#141)

        Co-authored-by: 0o-de-lally <>
        Co-authored-by: 0o-de-lally <[email protected]>

    commit 6b57485
    Author: sirouk <[email protected]>
    Date:   Sat Jan 13 17:01:01 2024 -0500

        [move] patch arithmetic issue on net_val_reward 6.9.2 (#142)

        Co-authored-by: 0o-de-lally <[email protected]>
        Co-authored-by: Nonast <[email protected]>
        Co-authored-by: sh1hsh1nk <[email protected]>

    commit d982a70
    Author: zoz <[email protected]>
    Date:   Sat Jan 13 13:53:23 2024 -0800

        [tools] refactor rescue cli 6.9.1 (#137)

        Co-authored-by: 0o-de-lally <[email protected]>

commit db2813c
Author: 0o-de-lally <[email protected]>
Date:   Wed Dec 20 15:52:16 2023 +0000

    clean

commit d8cb2a6
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 18:25:30 2023 +0000

    notest

commit 5e4d26d
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 18:22:09 2023 +0000

    finish tests

commit d57ba94
Author: 0o-de-lally <[email protected]>
Date:   Mon Dec 18 16:02:34 2023 +0000

    and user can trigger epoch on boundary. functional test written.

commit b6b43ea
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 02:46:03 2023 +0000

    wip epoch count issue passing

commit c6ebe43
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 02:44:53 2023 +0000

    wip epoch count issue

commit ce3c1e8
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 01:48:21 2023 +0000

    patch

commit 43cacc6
Author: 0o-de-lally <[email protected]>
Date:   Sun Dec 17 01:47:15 2023 +0000

    enable epoch trigger
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Jan 14, 2024
@sirouk @0o-de-lally
@nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
7617634 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit that referenced this pull request Jan 14, 2024
@0o-de-lally
Merge slow-wallet-alt-fix
05bc7aa 
Squashed commit of the following:

commit d62076d
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 19:54:25 2024 +0000

    revert ci change

commit 0cdf2b8
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 19:44:00 2024 +0000

    fmt

commit cef8b3c
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 19:42:01 2024 +0000

    update TXS cli tool to include account setting

commit 2baba5d
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 19:40:54 2024 +0000

    patch tests and build framework

commit 155d566
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 19:16:14 2024 +0000

    add previous framework build

commit 1ff06e1
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 18:59:37 2024 +0000

    changing incompatible upgrade because of changing visibility of set_slow. Instead we need a new entry function.

commit 7617634
Author: sirouk <[email protected]>
Date:   Sat Jan 13 17:01:01 2024 -0500

    [move] patch arithmetic issue on net_val_reward 6.9.2 (#142)

    Co-authored-by: 0o-de-lally <[email protected]>
    Co-authored-by: Nonast <[email protected]>
    Co-authored-by: sh1hsh1nk <[email protected]>

commit db75399
Author: 0o-de-lally <[email protected]>
Date:   Sun Jan 14 18:03:25 2024 +0000

    don't run CI on all branch pushes
0o-de-lally added a commit that referenced this pull request Jan 15, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (#142)
00e04ec 
Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit that referenced this pull request Jan 15, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (#142)
b595fc3 
Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
@0o-de-lally 0o-de-lally deleted the rescue-twin branch January 15, 2024 21:28
0o-de-lally added a commit that referenced this pull request Aug 8, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (#142)
9ce3d82 
Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit that referenced this pull request Aug 8, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (#142)
ad8774e 
Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 16, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
55ffa71 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 16, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
0befba8 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 16, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
31e7a14 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 16, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
099c0d4 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 16, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
666551f 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
5e65c58 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
af863aa 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
8d843f3 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
3dd5f2b 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
a85b1be 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
7d5b2eb 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
0o-de-lally added a commit to 0o-de-lally/libra-framework that referenced this pull request Aug 17, 2024
@0o-de-lally @nonast @sm86
[move] patch arithmetic issue on net_val_reward 6.9.2 (0LNetworkCommu…
61f594d 
…nity#142)

Co-authored-by: 0o-de-lally <[email protected]>
Co-authored-by: Nonast <[email protected]>
Co-authored-by: sh1hsh1nk <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hemulin hemulin hemulin approved these changes

@The1OneID The1OneID The1OneID approved these changes

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
@sirouk @hemulin @The1OneID @0o-de-lally @nonast