feat(ph4): inclusion proofs #4059
Conversation
vladopajic
requested review from
a team,
mrekucci,
istae,
aloknerurkar,
notanatol,
acha-bill and
nugaon
and removed request for
a team
vladopajic
force-pushed
the
ph4-proof
branch
2 times, most recently
from
10f9644 to
0a492d4
Compare
vladopajic
force-pushed
the
ph4-proof
branch
3 times, most recently
from
0bfbdff to
d7c93a7
Compare
mrekucci
force-pushed
the
localstorev2.0
branch
2 times, most recently
from
e012d95 to
54d8bdf
Compare
vladopajic
force-pushed
the
ph4-proof
branch
2 times, most recently
from
ffde79e to
94f2d3f
Compare
aloknerurkar
force-pushed
the
localstorev2.0
branch
from
ec22e42 to
b14e017
Compare
vladopajic
force-pushed
the
ph4-proof
branch
4 times, most recently
from
dc4f540 to
03cf689
Compare
| if err != nil { | ||
| a.logger.Info("failed getting anchor after second reveal", "err", err) | ||
| } else { | ||
| sample.Anchor2 = anchor2 |
There was a problem hiding this comment.
anchor 2 cannot be known at this point
| return fmt.Errorf("sample not found") | ||
| } | ||
|
|
||
| proofs, err := makeInclusionProofs(sampleData.ReserveSampleItems, sampleData.Anchor1, sampleData.Anchor2) |
There was a problem hiding this comment.
here sampleData.Anchor2 cannot be taken as it was set in reveal
proof creation needds to be delayed to claim phase
only then the reveal anchor (for seed determmines tuth selection and winner selectoin
There was a problem hiding this comment.
the claim period is long and doing the computation of the proofs is fast compare to the witness filtering.
Nevertheless, the anchor should be available for the witness proofs after the first reveal on the SC API.
|
|
||
| return true, nil | ||
| } | ||
|
|
||
| func (a *Agent) makeSample(ctx context.Context, storageRadius uint8) (SampleData, error) { | ||
| salt, err := a.contract.ReserveSalt(ctx) | ||
| anchor, err := a.contract.ReserveSalt(ctx) |
| } | ||
|
|
||
| func (a *Agent) SampleWithProofs( | ||
| ctx context.Context, | ||
| anchor1 []byte, | ||
| anchor2 []byte, |
| return SampleWithProofs{}, fmt.Errorf("sample hash: %w", err) | ||
| } | ||
|
|
||
| proofs, err := makeInclusionProofs(rSample.Items, anchor1, anchor2) |
| for i := 0; i < workers; i++ { | ||
| g.Go(func() error { | ||
| wstat := SampleStats{} | ||
| hasher := bmt.NewTrHasher(anchor) |
There was a problem hiding this comment.
for each routine you can get a tr hasher and defer put back to pool.
| hasher := bmt.NewTrHasher(anchor) | ||
|
|
||
| items := make([]SampleItem, len(chunks)) | ||
| for i, ch := range chunks { | ||
| tr, err := transformedAddress(hasher, ch, swarm.ChunkTypeContentAddressed) |
There was a problem hiding this comment.
the sample should remember the chunk and the transformed address. no need to calculate it again.
| } | ||
|
|
||
| // MakeSampleUsingChunks returns Sample constructed using supplied chunks. | ||
| func MakeSampleUsingChunks(chunks []swarm.Chunk, anchor []byte) (Sample, error) { |
There was a problem hiding this comment.
this is not needed the iterator should just create a SampleItem
which should be just
struct {
transformedAddress
chunk
}
| @@ -17,41 +16,62 @@ import ( | |||
| "time" | |||
|
|
|||
| "github.com/ethersphere/bee/pkg/bmt" | |||
| "github.com/ethersphere/bee/pkg/cac" | |||
There was a problem hiding this comment.
why is this file under storer and not under storage incentives
| hasher, trHasher := bmtpool.Get(), bmt.NewTrHasher(anchor1) | ||
| defer bmtpool.Put(hasher) | ||
|
|
||
| anchor2Big := new(big.Int).SetBytes(anchor2) |
There was a problem hiding this comment.
so here you are using the wrong anchor
|
closing as this is taken care of in #4373 |
Checklist
Description
This PR implements inclusion proofs for claim method of phase 4 redistribution smart contract.
Note: in code there is
// TODO_PH4which should be handled before PR is merged to master, please go through these markers in code and handle them accordingly.Closes: #3800