mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 14:16:44 +00:00
synced up to go-ethereum 1.5.0-unstable develop branch major features: * api overhaul due to rpc v2 and node service stack interface changes * blockchain/ethereum contract interaction rewritten using abi/abigen (chequebook, ens) * swarm - cluster control CLI - migration and revamp of prehistoric eth-utils repo * poor man's end to end testing: scripted scenarios in swarm/test using swarm CLI * http proxy now handles 3 url schemes for 1) ens-enabled [bzz], 2) immutable [bzzi] and 3) raw manifest [bzzr] resolution * fixes issues with remote address setting, forwarding and syncing * new control flags to switch swap and sync on and off * placeholder basic implementation Ethereum Name Service * improved logging - now debug level is coherent regression: * uri based versioning support is dropped temporarily since state tree pruning does not guarantee historical record * registrar related functionality temporarily restricted - current ENS provides basic free and unrestricted Register/Resolve accounts/abi: * bind: repeated attempt deployment of contracts, validation against known code, transactor creation from private keys * accountmanager: getUnlocked snatch private key when unlocked cmd: * unlockAccount moved to utils/cmd and exported * getPassPhrase moved to utils/input and exported * accountcmds: reflect the change * js: GlobalRegistrar is dropped (ens) flags: * chequebook, bzzaccount, bzzport, bzzconfig, bzznoswap, bzznosync chequebook: * move from common/ to swarm/services * abigen-ised * specifies its own API (removed chequebook api from swarm/api) kademlia: * move from common to swarm/network/kademlia * address abstracted out to separate file + tests dns/ens/registrar: * moved from swarm/api to swarm/services/ens * implementation is basic placeholder before ENS is implemented * temporary rpc api via ens namespace * the old common/registrar is removed (also from eth/backend apis) swap: * the abstract swap module moved from common to swarm/services * now embedded in the swarm and chequebook specific setup (this will change) * safer chequebook deployment using abigen helpers * backend not field of swap params eth: * public accessor for GPO, needed to construct a PublicBlockChainAPI * extends ContractBackend in eth/bind.go with BalanceAt, GetTxReceipt and CodeAt API calls internal/web3ext * add js bindings for bzz, chequebook rpc apis swarm/api: * refactored api into smaller modules filesystem/storage/testapi * ethereum backend (needed for dns, swap, etc) moved to abi/bind * TODO: further refactor due to #2040 * swarm/api/http: now supports the 3 uri schemes * examples/album updated swarm/cmd: * migrate old eth-utils and modify into a cluster control CLI * bzzup now allows non-local gateway, endpoint specified as second argument swarm/network: * forwarder improved log messages, fixup condition on whether syncer is nil * hive extended with controls for testing support block read/write, swap/sync enabled/disabled * hive keepAlive launches with alarm in case no discover and no kaddb * fix IP address formatting issue [::1] -> became ::1 which refused to dial, now use discover.NewNode#String * integrate functionality for enabling/disabling sync and swap * allow nil sync state - improve syncer interface in protocol * fix SData slice out of bounds bug * fix disconnects by not replacing a node when bucket is full swarm/test * poor man's testing framework. scripts invoking swarm/cmd/swarm * added tests for basic scenarios connections, swap, sync swarm: * rewrite api using rpc v2 * blockchain comms via abi/abigen + eth.ContractBackend * integrate new flags
313 lines
7.6 KiB
Go
313 lines
7.6 KiB
Go
package api
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"sync"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/logger"
|
|
"github.com/ethereum/go-ethereum/logger/glog"
|
|
"github.com/ethereum/go-ethereum/swarm/storage"
|
|
)
|
|
|
|
const (
|
|
manifestType = "application/bzz-manifest+json"
|
|
)
|
|
|
|
type manifestTrie struct {
|
|
dpa *storage.DPA
|
|
entries [257]*manifestTrieEntry // indexed by first character of path, entries[256] is the empty path entry
|
|
hash storage.Key // if hash != nil, it is stored
|
|
}
|
|
|
|
type manifestJSON struct {
|
|
Entries []*manifestTrieEntry `json:"entries"`
|
|
}
|
|
|
|
type manifestTrieEntry struct {
|
|
Path string `json:"path"`
|
|
Hash string `json:"hash"` // for manifest content type, empty until subtrie is evaluated
|
|
ContentType string `json:"contentType"`
|
|
Status int `json:"status"`
|
|
subtrie *manifestTrie
|
|
}
|
|
|
|
func loadManifest(dpa *storage.DPA, hash storage.Key) (trie *manifestTrie, err error) { // non-recursive, subtrees are downloaded on-demand
|
|
|
|
glog.V(logger.Detail).Infof("[BZZ] manifest lookup key: '%v'.", hash.Log())
|
|
// retrieve manifest via DPA
|
|
manifestReader := dpa.Retrieve(hash)
|
|
return readManifest(manifestReader, hash, dpa)
|
|
}
|
|
|
|
func readManifest(manifestReader storage.SectionReader, hash storage.Key, dpa *storage.DPA) (trie *manifestTrie, err error) { // non-recursive, subtrees are downloaded on-demand
|
|
|
|
// TODO check size for oversized manifests
|
|
manifestData := make([]byte, manifestReader.Size())
|
|
var size int
|
|
size, err = manifestReader.Read(manifestData)
|
|
if int64(size) < manifestReader.Size() {
|
|
glog.V(logger.Detail).Infof("[BZZ] Manifest %v not found.", hash.Log())
|
|
if err == nil {
|
|
err = fmt.Errorf("Manifest retrieval cut short: read %v, expect %v", size, manifestReader.Size())
|
|
}
|
|
return
|
|
}
|
|
|
|
glog.V(logger.Detail).Infof("[BZZ] Manifest %v retrieved", hash.Log())
|
|
man := manifestJSON{}
|
|
err = json.Unmarshal(manifestData, &man)
|
|
if err != nil {
|
|
err = fmt.Errorf("Manifest %v is malformed: %v", hash.Log(), err)
|
|
glog.V(logger.Detail).Infof("[BZZ] %v", err)
|
|
return
|
|
}
|
|
|
|
glog.V(logger.Detail).Infof("[BZZ] Manifest %v has %d entries.", hash.Log(), len(man.Entries))
|
|
|
|
trie = &manifestTrie{
|
|
dpa: dpa,
|
|
}
|
|
for _, entry := range man.Entries {
|
|
trie.addEntry(entry)
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *manifestTrie) addEntry(entry *manifestTrieEntry) {
|
|
self.hash = nil // trie modified, hash needs to be re-calculated on demand
|
|
|
|
if len(entry.Path) == 0 {
|
|
self.entries[256] = entry
|
|
return
|
|
}
|
|
|
|
b := byte(entry.Path[0])
|
|
if (self.entries[b] == nil) || (self.entries[b].Path == entry.Path) {
|
|
self.entries[b] = entry
|
|
return
|
|
}
|
|
|
|
oldentry := self.entries[b]
|
|
cpl := 0
|
|
for (len(entry.Path) > cpl) && (len(oldentry.Path) > cpl) && (entry.Path[cpl] == oldentry.Path[cpl]) {
|
|
cpl++
|
|
}
|
|
|
|
if (oldentry.ContentType == manifestType) && (cpl == len(oldentry.Path)) {
|
|
if self.loadSubTrie(oldentry) != nil {
|
|
return
|
|
}
|
|
entry.Path = entry.Path[cpl:]
|
|
oldentry.subtrie.addEntry(entry)
|
|
oldentry.Hash = ""
|
|
return
|
|
}
|
|
|
|
commonPrefix := entry.Path[:cpl]
|
|
|
|
subtrie := &manifestTrie{
|
|
dpa: self.dpa,
|
|
}
|
|
entry.Path = entry.Path[cpl:]
|
|
oldentry.Path = oldentry.Path[cpl:]
|
|
subtrie.addEntry(entry)
|
|
subtrie.addEntry(oldentry)
|
|
|
|
self.entries[b] = &manifestTrieEntry{
|
|
Path: commonPrefix,
|
|
Hash: "",
|
|
ContentType: manifestType,
|
|
subtrie: subtrie,
|
|
}
|
|
}
|
|
|
|
func (self *manifestTrie) getCountLast() (cnt int, entry *manifestTrieEntry) {
|
|
for _, e := range self.entries {
|
|
if e != nil {
|
|
cnt++
|
|
entry = e
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *manifestTrie) deleteEntry(path string) {
|
|
self.hash = nil // trie modified, hash needs to be re-calculated on demand
|
|
|
|
if len(path) == 0 {
|
|
self.entries[256] = nil
|
|
return
|
|
}
|
|
|
|
b := byte(path[0])
|
|
entry := self.entries[b]
|
|
if entry == nil {
|
|
return
|
|
}
|
|
if entry.Path == path {
|
|
self.entries[b] = nil
|
|
return
|
|
}
|
|
|
|
epl := len(entry.Path)
|
|
if (entry.ContentType == manifestType) && (len(path) >= epl) && (path[:epl] == entry.Path) {
|
|
if self.loadSubTrie(entry) != nil {
|
|
return
|
|
}
|
|
entry.subtrie.deleteEntry(path[epl:])
|
|
entry.Hash = ""
|
|
// remove subtree if it has less than 2 elements
|
|
cnt, lastentry := entry.subtrie.getCountLast()
|
|
if cnt < 2 {
|
|
if lastentry != nil {
|
|
lastentry.Path = entry.Path + lastentry.Path
|
|
}
|
|
self.entries[b] = lastentry
|
|
}
|
|
}
|
|
}
|
|
|
|
func (self *manifestTrie) recalcAndStore() error {
|
|
if self.hash != nil {
|
|
return nil
|
|
}
|
|
|
|
var buffer bytes.Buffer
|
|
buffer.WriteString(`{"entries":[`)
|
|
|
|
list := &manifestJSON{}
|
|
for _, entry := range self.entries {
|
|
if entry != nil {
|
|
if entry.Hash == "" { // TODO: paralellize
|
|
err := entry.subtrie.recalcAndStore()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
entry.Hash = entry.subtrie.hash.String()
|
|
}
|
|
list.Entries = append(list.Entries, entry)
|
|
}
|
|
}
|
|
|
|
manifest, err := json.Marshal(list)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sr := io.NewSectionReader(bytes.NewReader(manifest), 0, int64(len(manifest)))
|
|
wg := &sync.WaitGroup{}
|
|
key, err2 := self.dpa.Store(sr, wg)
|
|
wg.Wait()
|
|
self.hash = key
|
|
return err2
|
|
}
|
|
|
|
func (self *manifestTrie) loadSubTrie(entry *manifestTrieEntry) (err error) {
|
|
if entry.subtrie == nil {
|
|
hash := common.Hex2Bytes(entry.Hash)
|
|
entry.subtrie, err = loadManifest(self.dpa, hash)
|
|
entry.Hash = "" // might not match, should be recalculated
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *manifestTrie) listWithPrefixInt(prefix, rp string, cb func(entry *manifestTrieEntry, suffix string)) (err error) {
|
|
plen := len(prefix)
|
|
var start, stop int
|
|
if plen == 0 {
|
|
start = 0
|
|
stop = 256
|
|
} else {
|
|
start = int(prefix[0])
|
|
stop = start
|
|
}
|
|
|
|
for i := start; i <= stop; i++ {
|
|
entry := self.entries[i]
|
|
if entry != nil {
|
|
epl := len(entry.Path)
|
|
if entry.ContentType == manifestType {
|
|
l := plen
|
|
if epl < l {
|
|
l = epl
|
|
}
|
|
if prefix[:l] == entry.Path[:l] {
|
|
sterr := self.loadSubTrie(entry)
|
|
if sterr == nil {
|
|
entry.subtrie.listWithPrefixInt(prefix[l:], rp+entry.Path[l:], cb)
|
|
} else {
|
|
err = sterr
|
|
}
|
|
}
|
|
} else {
|
|
if (epl >= plen) && (prefix == entry.Path[:plen]) {
|
|
cb(entry, rp+entry.Path[plen:])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *manifestTrie) listWithPrefix(prefix string, cb func(entry *manifestTrieEntry, suffix string)) (err error) {
|
|
return self.listWithPrefixInt(prefix, "", cb)
|
|
}
|
|
|
|
func (self *manifestTrie) findPrefixOf(path string) (entry *manifestTrieEntry, pos int) {
|
|
|
|
glog.V(logger.Detail).Infof("[BZZ] findPrefixOf(%s)", path)
|
|
|
|
if len(path) == 0 {
|
|
return self.entries[256], 0
|
|
}
|
|
|
|
b := byte(path[0])
|
|
entry = self.entries[b]
|
|
if entry == nil {
|
|
return self.entries[256], 0
|
|
}
|
|
epl := len(entry.Path)
|
|
glog.V(logger.Detail).Infof("[BZZ] path = %v entry.Path = %v epl = %v", path, entry.Path, epl)
|
|
if (len(path) >= epl) && (path[:epl] == entry.Path) {
|
|
glog.V(logger.Detail).Infof("[BZZ] entry.ContentType = %v", entry.ContentType)
|
|
if entry.ContentType == manifestType {
|
|
if self.loadSubTrie(entry) != nil {
|
|
return nil, 0
|
|
}
|
|
entry, pos = entry.subtrie.findPrefixOf(path[epl:])
|
|
if entry != nil {
|
|
pos += epl
|
|
}
|
|
} else {
|
|
pos = epl
|
|
}
|
|
} else {
|
|
entry = nil
|
|
}
|
|
return
|
|
}
|
|
|
|
// file system manifest always contains regularized paths
|
|
// no leading or trailing slashes, only single slashes inside
|
|
func RegularSlashes(path string) (res string) {
|
|
for i := 0; i < len(path); i++ {
|
|
if (path[i] != '/') || ((i > 0) && (path[i-1] != '/')) {
|
|
res = res + path[i:i+1]
|
|
}
|
|
}
|
|
if (len(res) > 0) && (res[len(res)-1] == '/') {
|
|
res = res[:len(res)-1]
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *manifestTrie) getEntry(spath string) (entry *manifestTrieEntry, fullpath string) {
|
|
path := RegularSlashes(spath)
|
|
var pos int
|
|
entry, pos = self.findPrefixOf(path)
|
|
return entry, path[:pos]
|
|
}
|