stamp support in storage and protocols #1321

zelig · 2021-02-24T02:15:19Z

#898
AP https://hackmd.io/2NgPR2CeQICKzWBAH7Mk0Q#

pkg/localstore/export.go

pkg/localstore/localstore_test.go

pkg/localstore/mode_get.go

pkg/node/node.go

pkg/shed/db.go

pkg/shed/index.go

pkg/swarm/swarm.go

acud

Good to go from my side

zelig · 2021-04-01T19:56:50Z

pkg/localstore/subscription_push.go

@@ -74,7 +74,7 @@ func (db *DB) SubscribePush(ctx context.Context) (c <-chan swarm.Chunk, stop fun
 					}

 					select {
-					case chunks <- swarm.NewChunk(swarm.NewAddress(dataItem.Address), dataItem.Data).WithTagID(item.Tag).WithStamp(dataItem.Stamp):
+					case chunks <- swarm.NewChunk(swarm.NewAddress(dataItem.Address), dataItem.Data).WithTagID(item.Tag):


wait, are we not mising WithStamp here?

we are, then why did you remove it? :)
I added a test coverage for this case, which was missing 👍

pkg/postage/stamp.go

pkg/pullsync/pullsync.go

pkg/pullsync/pullsync_test.go

pkg/swarm/swarm.go

ralph-pichler · 2021-04-02T10:23:48Z

pkg/node/node.go

@@ -261,6 +261,7 @@ func NewBee(addr string, swarmAddress swarm.Address, publicKey ecdsa.PublicKey,
 	// register localstore unreserve function on the batchstore before batch service starts listening to blockchain events

 	batchStore, err := batchstore.New(stateStore, nil)
+	// batchStore, err := batchstore.New(stateStore, storer.UnreserveBatch)


remove from this PR

ralph-pichler · 2021-04-02T10:27:35Z

pkg/pushsync/pushsync.go

@@ -153,14 +157,18 @@ func (ps *PushSync) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream)
 // a receipt from that peer and returns error or nil based on the receiving and
 // the validity of the receipt.
 func (ps *PushSync) PushChunkToClosest(ctx context.Context, ch swarm.Chunk) (*Receipt, error) {
-	r, err := ps.pushToClosest(ctx, ch)
+	stamp, err := ch.Stamp().MarshalBinary()


is there a specific reason why the marshal binary is done here and not inside pushToClosest directly (which also could do it as it has access to ch)?

No clue, I think we can move it in. Good point

postage: new pkg for postage stamps, uploader stamping (#890) * postage: new pkg for postage stamps, uploader stamping * postage: amount->value, blockNumber big.Int-> uint64, stamp only has batch ID, not Batch * postage: fix godoc and copyright * postage, swarm: - swarm.Stamp as an interface - add postage/testing for mock Stamps - fix Stamp MarshalBinary to allow nil batch id and signature - add StampSize const * postage: heed review feedback Co-authored-by: acud <[email protected]> Storage incentives: add stamper putter to api Postage BatchStore and BatchService (#1070) Co-authored-by: zelig <[email protected]> add normalisedBalance to updater interface (#1108) make value the normalised balance (#1111) postage: add event listener (#1099) Wire up postage stamp syncing (#1114) localstore, shed: persist stamps (#1116) add --postage to beeinfra.sh setup pullsync, pushsync: add postage stamps (#1117) postage: add create endpoint (#1142) retrieve erc20 address from postage contract (#1169) postage: check balance before attempting stamp creation (#1177) postage: fix bucket depth (#1178) api: use hex encoding in postage api (#1179) increase page size (#1182) postage: handle bucket depth error in api (#1183) localstore: attach stamp to outgoing chunk (#1192) update postage stamp contract addresses for new token (#1208) batchstore: reserve (#1262) * postage/batchstore: reserve logic Co-authored-by: acud <[email protected]> stamp support in storage and protocols (#1321) api: endpoints for stamp issuers (#1535) retrieval: add stamps (#1552) localstore reserve logic (#1322) Co-authored-by: acud <[email protected]>

zelig added the builds on open pr builds on another open one label Feb 24, 2021

zelig self-assigned this Feb 24, 2021

bee-runner bot added the pull-request label Feb 24, 2021

zelig mentioned this pull request Feb 24, 2021

localstore: simplify and fix #1063

Closed

zelig force-pushed the postage-stamp-storage branch 2 times, most recently from 1694c83 to c020c7a Compare February 24, 2021 02:37

zelig mentioned this pull request Feb 24, 2021

localstore: preliminary changes related to postage stamps/batches #933

Closed

zelig added the ready for review The PR is ready to be reviewed label Feb 24, 2021

zelig force-pushed the postage-stamp-storage branch from c020c7a to de15213 Compare February 24, 2021 05:40

zelig requested review from acud and ralph-pichler March 3, 2021 14:16

acud suggested changes Mar 8, 2021

View reviewed changes

acud reviewed Mar 9, 2021

View reviewed changes

pkg/swarm/swarm.go Show resolved Hide resolved

zelig force-pushed the postage-batchstore-reserve branch 2 times, most recently from 41f4502 to fab6980 Compare March 13, 2021 07:36

zelig force-pushed the postage-stamp-storage branch from de15213 to f850603 Compare March 14, 2021 13:23

zelig force-pushed the postage-batchstore-reserve branch 2 times, most recently from 88f49a2 to f652df3 Compare March 14, 2021 13:29

zelig force-pushed the postage-stamp-storage branch from f850603 to 435d47b Compare March 15, 2021 01:01

acud force-pushed the postage-batchstore-reserve branch from 261602d to a572579 Compare March 26, 2021 15:57

Base automatically changed from postage-batchstore-reserve to storage-incentives March 31, 2021 10:09

support postage stamps in localstore and protocols

e326684

acud force-pushed the postage-stamp-storage branch from 435d47b to e326684 Compare March 31, 2021 13:01

address some of the PR comments

8f693cc

acud removed the builds on open pr builds on another open one label Mar 31, 2021

move unused code to other pr

c78a4fc

acud self-requested a review March 31, 2021 14:16

acud approved these changes Mar 31, 2021

View reviewed changes

zelig commented Apr 1, 2021

View reviewed changes

dostuff

72cfe4a

lint

4789943

ralph-pichler approved these changes Apr 2, 2021

View reviewed changes

address pr comments

827abf5

acud merged commit b2e92d9 into storage-incentives Apr 2, 2021

acud deleted the postage-stamp-storage branch April 2, 2021 12:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

stamp support in storage and protocols #1321

stamp support in storage and protocols #1321

zelig commented Feb 24, 2021 •

edited

Loading

acud left a comment

zelig Apr 1, 2021

acud Apr 2, 2021

ralph-pichler Apr 2, 2021

ralph-pichler Apr 2, 2021

acud Apr 2, 2021

stamp support in storage and protocols #1321

stamp support in storage and protocols #1321

Conversation

zelig commented Feb 24, 2021 • edited Loading

acud left a comment

Choose a reason for hiding this comment

zelig Apr 1, 2021

Choose a reason for hiding this comment

acud Apr 2, 2021

Choose a reason for hiding this comment

ralph-pichler Apr 2, 2021

Choose a reason for hiding this comment

ralph-pichler Apr 2, 2021

Choose a reason for hiding this comment

acud Apr 2, 2021

Choose a reason for hiding this comment

zelig commented Feb 24, 2021 •

edited

Loading