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

feat(protocol): alpha-4 with staking-based tokenomics #14065

Merged
merged 84 commits into from
Aug 3, 2023
Merged

Conversation

dantaik
Copy link
Contributor

@dantaik dantaik commented Jun 28, 2023

Initial implementation of a token-staking based tokenomics.

Co-authored-by: D <[email protected]>
Co-authored-by: dantaik <[email protected]>
Co-authored-by: dave | d1onys1us <[email protected]>
Co-authored-by: adaki2004 <[email protected]>
Co-authored-by: jeff <[email protected]>
Co-authored-by: Francisco Ramos <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: Kenk <[email protected]>
Co-authored-by: mfinestone <[email protected]>
Co-authored-by: hideonbug <[email protected]>
Co-authored-by: megumii <[email protected]>
Co-authored-by: Tomaž <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Daniel Wang <[email protected]>
Co-authored-by: adaki2004 <[email protected]>
Co-authored-by: Jeffery Walsh <[email protected]>
Co-authored-by: cyberhorsey <[email protected]>
Co-authored-by: Brecht Devos <[email protected]>
@dantaik dantaik marked this pull request as ready for review June 28, 2023 07:31
@codecov
Copy link

codecov bot commented Jun 28, 2023

Codecov Report

Merging #14065 (42bbc5f) into main (d5ca9c1) will increase coverage by 16.85%.
Report is 70 commits behind head on main.
The diff coverage is 36.32%.

@@             Coverage Diff             @@
##             main   #14065       +/-   ##
===========================================
+ Coverage   50.89%   67.75%   +16.85%     
===========================================
  Files         153       88       -65     
  Lines        3973     3045      -928     
  Branches      336      112      -224     
===========================================
+ Hits         2022     2063       +41     
+ Misses       1840      859      -981     
- Partials      111      123       +12     
Flag Coverage Δ
bridge-ui 94.25% <100.00%> (-0.02%) ⬇️
eventindexer 51.71% <35.71%> (-9.36%) ⬇️
protocol ?
relayer 59.13% <ø> (ø)
ui ?
Files Changed Coverage Δ
packages/bridge-ui/src/token/tokens.ts 100.00% <ø> (ø)
...exer/http/get_assigned_blocks_by_prover_address.go 0.00% <0.00%> (ø)
packages/eventindexer/http/get_current_provers.go 0.00% <0.00%> (ø)
packages/eventindexer/http/user_added_liquidity.go 0.00% <0.00%> (ø)
packages/eventindexer/http/get_pos_stats.go 26.31% <26.31%> (ø)
packages/eventindexer/repo/event.go 57.57% <41.86%> (-7.60%) ⬇️
packages/eventindexer/http/get_stats.go 66.66% <62.50%> (+4.16%) ⬆️
packages/eventindexer/http/get_unique_proposers.go 71.42% <62.50%> (-1.30%) ⬇️
packages/eventindexer/http/get_unique_provers.go 71.42% <62.50%> (-1.30%) ⬇️
packages/eventindexer/http/server.go 91.11% <81.25%> (-5.00%) ⬇️
... and 2 more

... and 69 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Co-authored-by: dantaik <[email protected]>
Co-authored-by: Jeffery Walsh <[email protected]>
Co-authored-by: cyberhorsey <[email protected]>
@cyberhorsey
Copy link
Contributor

cyberhorsey commented Aug 2, 2023

@Brechtpd @davidtaikocha @adaki2004 could you please approve this PR again for merging before too many changes on the main branch?

I can approve, but should the protocol build pass first? Also seems a bunch of warnings that the new vaults exceed max solidity contract size?

@adaki2004
Copy link
Contributor

adaki2004 commented Aug 2, 2023

@Brechtpd @davidtaikocha @adaki2004 could you please approve this PR again for merging before too many changes on the main branch?

I can approve, but should the protocol build pass first? Also seems a bunch of warnings that the new vaults exceed max solidity contract size?

I'd wait also, there is a fix for the failing test on a separate branch (with rearranging the 2 release (ETH+token) TXN into 1), tho i do not see any code size exceeded issues.

Update: yeah, forge build does not throw them - with hardhat compile i see it, will address on the same branch i mentioned.

@davidtaikocha davidtaikocha added this pull request to the merge queue Aug 3, 2023
Merged via the queue into main with commit 1eeba9d Aug 3, 2023
12 checks passed
@github-actions github-actions bot mentioned this pull request Aug 3, 2023
2manslkh added a commit that referenced this pull request Aug 7, 2023
Co-authored-by: D <[email protected]>
Co-authored-by: dantaik <[email protected]>
Co-authored-by: dave | d1onys1us <[email protected]>
Co-authored-by: adaki2004 <[email protected]>
Co-authored-by: jeff <[email protected]>
Co-authored-by: Francisco Ramos <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: Kenk <[email protected]>
Co-authored-by: mfinestone <[email protected]>
Co-authored-by: hideonbug <[email protected]>
Co-authored-by: megumii <[email protected]>
Co-authored-by: Tomaž <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Daniel Wang <[email protected]>
Co-authored-by: adaki2004 <[email protected]>
Co-authored-by: Jeffery Walsh <[email protected]>
Co-authored-by: cyberhorsey <[email protected]>
Co-authored-by: Brecht Devos <[email protected]>
Co-authored-by: d1onys1us <[email protected]>
Co-authored-by: Roger <[email protected]>
Co-authored-by: Korbinian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants