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
175 lines
4.6 KiB
Go
175 lines
4.6 KiB
Go
package api
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"regexp"
|
|
"strings"
|
|
"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"
|
|
)
|
|
|
|
var (
|
|
hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}")
|
|
slashes = regexp.MustCompile("/+")
|
|
domainAndVersion = regexp.MustCompile("[@:;,]+")
|
|
)
|
|
|
|
type Resolver interface {
|
|
Resolve(string) (storage.Key, error)
|
|
}
|
|
|
|
/*
|
|
Api implements webserver/file system related content storage and retrieval
|
|
on top of the dpa
|
|
it is the public interface of the dpa which is included in the ethereum stack
|
|
*/
|
|
type Api struct {
|
|
dpa *storage.DPA
|
|
dns Resolver
|
|
}
|
|
|
|
//the api constructor initialises
|
|
func NewApi(dpa *storage.DPA, dns Resolver) (self *Api) {
|
|
self = &Api{
|
|
dpa: dpa,
|
|
dns: dns,
|
|
}
|
|
return
|
|
}
|
|
|
|
// DPA reader API
|
|
func (self *Api) Retrieve(key storage.Key) storage.SectionReader {
|
|
return self.dpa.Retrieve(key)
|
|
}
|
|
|
|
func (self *Api) Store(data storage.SectionReader, wg *sync.WaitGroup) (key storage.Key, err error) {
|
|
return self.dpa.Store(data, wg)
|
|
}
|
|
|
|
type ErrResolve error
|
|
|
|
// DNS Resolver
|
|
func (self *Api) Resolve(hostPort string, nameresolver bool) (contentHash storage.Key, err error) {
|
|
if hashMatcher.MatchString(hostPort) || self.dns == nil {
|
|
glog.V(logger.Detail).Infof("[BZZ] host is a contentHash: '%v'", hostPort)
|
|
return storage.Key(common.Hex2Bytes(hostPort)), nil
|
|
}
|
|
if !nameresolver {
|
|
err = fmt.Errorf("'%s' is not a content hash value.", hostPort)
|
|
return
|
|
}
|
|
contentHash, err = self.dns.Resolve(hostPort)
|
|
if err != nil {
|
|
err = ErrResolve(err)
|
|
glog.V(logger.Warn).Infof("[BZZ] DNS error : %v", err)
|
|
}
|
|
glog.V(logger.Detail).Infof("[BZZ] host lookup: %v -> %v", err)
|
|
return
|
|
}
|
|
|
|
func parse(uri string) (hostPort, path string) {
|
|
parts := slashes.Split(uri, 3)
|
|
var i int
|
|
if len(parts) == 0 {
|
|
return
|
|
}
|
|
// beginning with slash is now optional
|
|
for len(parts[i]) == 0 {
|
|
i++
|
|
}
|
|
hostPort = parts[i]
|
|
for i < len(parts)-1 {
|
|
i++
|
|
if len(path) > 0 {
|
|
path = path + "/" + parts[i]
|
|
} else {
|
|
path = parts[i]
|
|
}
|
|
}
|
|
glog.V(logger.Debug).Infof("[BZZ] Swarm: host: '%s', path '%s' requested.", hostPort, path)
|
|
return
|
|
}
|
|
|
|
func (self *Api) parseAndResolve(uri string, nameresolver bool) (contentHash storage.Key, hostPort, path string, err error) {
|
|
hostPort, path = parse(uri)
|
|
//resolving host and port
|
|
contentHash, err = self.Resolve(hostPort, nameresolver)
|
|
glog.V(logger.Debug).Infof("[BZZ] Resolved '%s' to contentHash: '%s', path: '%s'", uri, contentHash, path)
|
|
return
|
|
}
|
|
|
|
// Put provides singleton manifest creation on top of dpa store
|
|
func (self *Api) Put(content, contentType string) (string, error) {
|
|
sr := io.NewSectionReader(strings.NewReader(content), 0, int64(len(content)))
|
|
wg := &sync.WaitGroup{}
|
|
key, err := self.dpa.Store(sr, wg)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
manifest := fmt.Sprintf(`{"entries":[{"hash":"%v","contentType":"%s"}]}`, key, contentType)
|
|
sr = io.NewSectionReader(strings.NewReader(manifest), 0, int64(len(manifest)))
|
|
key, err = self.dpa.Store(sr, wg)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
wg.Wait()
|
|
return key.String(), nil
|
|
}
|
|
|
|
// Get uses iterative manifest retrieval and prefix matching
|
|
// to resolve path to content using dpa retrieve
|
|
// it returns a section reader, mimeType, status and an error
|
|
func (self *Api) Get(uri string, nameresolver bool) (reader storage.SectionReader, mimeType string, status int, err error) {
|
|
|
|
key, _, path, err := self.parseAndResolve(uri, nameresolver)
|
|
|
|
trie, err := loadManifest(self.dpa, key)
|
|
if err != nil {
|
|
glog.V(logger.Warn).Infof("[BZZ] Swarm: loadManifestTrie error: %v", err)
|
|
return
|
|
}
|
|
|
|
glog.V(logger.Detail).Infof("[BZZ] Swarm: getEntry(%s)", path)
|
|
entry, _ := trie.getEntry(path)
|
|
if entry != nil {
|
|
key = common.Hex2Bytes(entry.Hash)
|
|
status = entry.Status
|
|
mimeType = entry.ContentType
|
|
glog.V(logger.Detail).Infof("[BZZ] Swarm: content lookup key: '%v' (%v)", key, mimeType)
|
|
reader = self.dpa.Retrieve(key)
|
|
} else {
|
|
err = fmt.Errorf("manifest entry for '%s' not found", path)
|
|
glog.V(logger.Warn).Infof("[BZZ] Swarm: %v", err)
|
|
}
|
|
return
|
|
}
|
|
|
|
func (self *Api) Modify(uri, contentHash, contentType string, nameresolver bool) (newRootHash string, err error) {
|
|
root, _, path, err := self.parseAndResolve(uri, nameresolver)
|
|
trie, err := loadManifest(self.dpa, root)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
if contentHash != "" {
|
|
entry := &manifestTrieEntry{
|
|
Path: path,
|
|
Hash: contentHash,
|
|
ContentType: contentType,
|
|
}
|
|
trie.addEntry(entry)
|
|
} else {
|
|
trie.deleteEntry(path)
|
|
}
|
|
|
|
err = trie.recalcAndStore()
|
|
if err != nil {
|
|
return
|
|
}
|
|
return trie.hash.String(), nil
|
|
}
|