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

feat: phase4 #152

Merged
merged 72 commits into from
Sep 24, 2023
Merged

feat: phase4 #152

merged 72 commits into from
Sep 24, 2023

Conversation

nugaon
Copy link
Member

@nugaon nugaon commented May 17, 2023 •
edited
Loading

Introducing Phase4 storage incentives.

The PR is a bit bloated so it may be better to do the remaining test/refactor related tasks in other PRs, such as:

  • CAC inclusion proof related tests are done by the fixtures generated by Bee clients. The missing part is to write SOC related and other tests.
  • Do styling.
  • Refactoring code (rid of state var usage where it is not intended, etc.).

metacertain and others added 30 commits January 31, 2023 15:02
@metacertain
feat: stamp updates
7f1de1e
@metacertain
feat: price rate update
e9c0afd
@metacertain
fix: tests
033fddb
@metacertain
feat: add accessor to batch fields
c293080
@metacertain
feat: randomness update method
73565db
@metacertain
feat: remove nonce based rand
2e8ffc5
@metacertain
feat: add code
86388c7
@nugaon
test: first logic break
1046518
@nugaon
fix: span serialization on chunk address calculation
97dfb33
@nugaon
fix: span serialization at transformedChunk
e29892f
@nugaon
fix: inclusion proof on swarm address + segmentIndex correction + ran…
18458a3 
…domChunkIndex
@nugaon
test: first successful inclusion proof for last witness
fedfc1e
@nugaon
test: new test data
eaa0bc7
@nugaon
test: fix stake density
20cde3b
@nugaon
test: todos
6b202ab
@nugaon
feat: postage stamp index checkings
839f75f
@nugaon
fix: stampFunction
21e301a
@nugaon
feat: alive
ebff5ff
@nugaon
fix: index and bucket checks
56c176b
@nugaon
test: correct postage depth at migration to the correct value
179461c
@nugaon
refactor: renamings
0dbf37f
@nugaon
refactor: renamings
3ceb343
@nugaon
refactor: rewriting error messages
e8495f7
@nugaon
test: init node5 for fdp-play test
709fc2c
@nugaon
test: add node_5 signer
ab95352
@nugaon
test: add node_5 test data
5fb376e
@nugaon
feat: estimation
156f734
@nugaon
test: new sampling
d914d62
@nugaon
chore: Merge remote-tracking branch 'origin/master' into ph_f2
e13c67e
@nugaon
chore: comment out old claim
e4e3fb0
@nugaon nugaon marked this pull request as ready for review May 25, 2023 10:25
significance
significance reviewed Jun 5, 2023
View reviewed changes
src/Redistribution.sol Outdated Show resolved Hide resolved
@0xCardinalError
Copy link
Contributor

I added all of the above suggestions here in this PR so we can easily choose when and how we want to apply them
#164

@nugaon nugaon mentioned this pull request Jul 31, 2023
Closed
@0xCardinalError 0xCardinalError self-requested a review August 24, 2023 13:15
mrekucci
mrekucci reviewed Aug 25, 2023
View reviewed changes
src/PostageStamp.sol Outdated Show resolved Hide resolved
test/Redistribution.test.ts Outdated Show resolved Hide resolved
test/Redistribution.test.ts Outdated Show resolved Hide resolved
test/util/tools.ts Outdated Show resolved Hide resolved
@mrekucci
Copy link
Contributor

Please, resolve the conflicts.

@mrekucci
Copy link
Contributor

@nugaon the branch has still conflicts in src/Redistribution.sol.

@zelig zelig merged commit e4e9bc1 into master Sep 24, 2023
@zelig zelig deleted the feat/phase4 branch September 24, 2023 15:38
@0xCardinalError 0xCardinalError restored the feat/phase4 branch September 25, 2023 10:12
@0xCardinalError 0xCardinalError deleted the feat/phase4 branch September 25, 2023 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrekucci mrekucci mrekucci approved these changes

@zelig zelig zelig approved these changes

@0xCardinalError 0xCardinalError Awaiting requested review from 0xCardinalError

@significance significance Awaiting requested review from significance

Assignees
No one assigned
Labels
pull-request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nugaon @0xCardinalError @mrekucci @significance @zelig @metacertain