Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

Bzz js api#13

Merged
zsfelfoldi merged 43 commits intobzzfrom
bzz-js-api
Jul 16, 2015
Merged

Bzz js api#13
zsfelfoldi merged 43 commits intobzzfrom
bzz-js-api

Conversation

@zelig
Copy link
Copy Markdown
Member

@zelig zelig commented Jul 11, 2015

on top of #12

zelig and others added 30 commits July 7, 2015 14:22
eth, ethdb: fix a data race during startup/shutdown
eth: calculate the correct TD, only update if better
eth/downloader: drop peer if advertised TD but won't delvier
miner, xeth: fire log event during mining. Fix return raw tx
accounts, crypto: fixed file naming for windows
Implemented the --genesis flag thru which we can set a custom genesis
block, including the official Ethereum genesis block.
zelig and others added 13 commits July 11, 2015 13:49
* ethreg is set up on swarm in admin
* utils.parseApi takes docroot as argument passed to adminApi.New
* if ethereum.swarm not nil, docserver will register the bzz scheme via roundtripper proxying to ethereum.Swarm.Port
Added PutBlockReceipts; storing receipts by blocks. Eventually this will
require pruning during some cleanup cycle. During forks the receipts by
block are used to get the new canonical receipts and transactions.

This PR fixes #1473 by rewriting transactions and receipts from the point
of where the fork occured.
core: during chain reorg rewrite receipts and transactions
cmd/geth/js, rpc/api/admin: ds.RegisterProtocol -> ds.RegisterScheme

Conflicts:
	core/genesis.go
@zelig
Copy link
Copy Markdown
Member Author

zelig commented Jul 16, 2015

@nagydani @zsfelfoldi ready to merge

zsfelfoldi added a commit that referenced this pull request Jul 16, 2015
@zsfelfoldi zsfelfoldi merged commit 68c68c3 into bzz Jul 16, 2015
@zelig zelig deleted the bzz-js-api branch December 8, 2015 20:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants