forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

upstream merge continued

Browse source
This commit is contained in:
Christopher Franko 2017-03-26 12:08:39 -04:00
parent 10ded829b0
commit a85150f0b4
136 changed files with 7 additions and 1331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/secp256k1/secp256_test.go
View file

@ -24,12 +24,8 @@ import (
"encoding/hex"
"testing"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/crypto/randentropy"
=======
"github.com/expanse-org/go-expanse/common/math"
"github.com/expanse-org/go-expanse/crypto/randentropy"
>>>>>>> refs/remotes/ethereum/master
)
const TestCount = 1000

5
crypto/signature_cgo.go
View file

@ -23,13 +23,8 @@ import (
"crypto/elliptic"
"fmt"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto/secp256k1"
=======
"github.com/expanse-org/go-expanse/common/math"
"github.com/expanse-org/go-expanse/crypto/secp256k1"
>>>>>>> refs/remotes/ethereum/master
)
func Ecrecover(hash, sig []byte) ([]byte, error) {

18
eth/api.go
View file

@ -30,23 +30,6 @@ import (
"strings"
"time"
<<<<<<< HEAD
"github.com/ethereum/ethash"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/miner"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core"
@ -57,7 +40,6 @@ import (
"github.com/expanse-org/go-expanse/miner"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const defaultTraceTimeout = 5 * time.Second

17
eth/api_backend.go
View file

@ -20,22 +20,6 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/eth/gasprice"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/math"
@ -50,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// EthApiBackend implements ethapi.Backend for full nodes

48
eth/backend.go
View file

@ -24,28 +24,7 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/ethereum/ethash"
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/eth/filters"
"github.com/expanse-org/go-expanse/eth/gasprice"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/miner"
"github.com/expanse-org/go-expanse/node"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
@ -64,7 +43,6 @@ import (
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
const (
@ -208,32 +186,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
core.WriteBlockChainVersion(chainDb, core.BlockChainVersion)
}
<<<<<<< HEAD
// load the genesis block or write a new one if no genesis
// block is prenent in the database.
genesis := core.GetBlock(chainDb, core.GetCanonicalHash(chainDb, 0), 0)
if genesis == nil {
genesis, err = core.WriteDefaultGenesisBlock(chainDb)
if err != nil {
return nil, err
}
glog.V(logger.Info).Infoln("WARNING: Wrote default expanse genesis block")
}
if config.ChainConfig == nil {
return nil, errors.New("missing chain config")
}
core.WriteChainConfig(chainDb, genesis.Hash(), config.ChainConfig)
eth.chainConfig = config.ChainConfig
glog.V(logger.Info).Infoln("Chain config:", eth.chainConfig)
eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.EventMux(), vm.Config{EnablePreimageRecording: config.EnablePreimageRecording})
=======
vmConfig := vm.Config{EnablePreimageRecording: config.EnablePreimageRecording}
eth.blockchain, err = core.NewBlockChain(chainDb, eth.chainConfig, eth.pow, eth.eventMux, vmConfig)
>>>>>>> refs/remotes/ethereum/master
if err != nil {
return nil, err
}

8
eth/bad_block.go
View file

@ -23,18 +23,10 @@ import (
"net/http"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const (

11
eth/bind.go
View file

@ -20,7 +20,6 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
@ -28,16 +27,6 @@ import (
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// ContractBackend implements bind.ContractBackend with direct calls to Ethereum

10
eth/db_upgrade.go
View file

@ -24,22 +24,12 @@ import (
"math/big"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
var useSequentialKeys = []byte("dbUpgrade_20160530sequentialKeys")

7
eth/downloader/api.go
View file

@ -20,16 +20,9 @@ import (
"context"
"sync"
<<<<<<< HEAD
ethereum "github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
ethereum "github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// PublicDownloaderAPI provides an API which gives information about the current synchronisation status.

12
eth/downloader/downloader.go
View file

@ -27,17 +27,6 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
ethereum "github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/trie"
=======
ethereum "github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
@ -46,7 +35,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
"github.com/rcrowley/go-metrics"
)

4
eth/downloader/peer.go
View file

@ -29,12 +29,8 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

11
eth/downloader/queue.go
View file

@ -25,16 +25,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/trie"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
@ -42,7 +32,6 @@ import (
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
"github.com/rcrowley/go-metrics"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)

8
eth/fetcher/fetcher.go
View file

@ -22,18 +22,10 @@ import (
"math/rand"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)

11
eth/filters/api.go
View file

@ -25,23 +25,12 @@ import (
"sync"
"time"
<<<<<<< HEAD
"golang.org/x/net/context"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
var (

10
eth/filters/filter.go
View file

@ -22,22 +22,12 @@ import (
"math/big"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
type Backend interface {

9
eth/filters/filter_system.go
View file

@ -25,20 +25,11 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// Type determines the kind of filter and is used to put the filter in to

12
eth/filters/filter_system_test.go
View file

@ -23,9 +23,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"golang.org/x/net/context"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -33,15 +30,6 @@ import (
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
type testBackend struct {

12
eth/filters/filter_test.go
View file

@ -23,9 +23,6 @@ import (
"os"
"testing"
<<<<<<< HEAD
"golang.org/x/net/context"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -33,15 +30,6 @@ import (
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
>>>>>>> refs/remotes/ethereum/master
)
func makeReceipt(addr common.Address) *types.Receipt {

9
eth/gasprice/gasprice.go
View file

@ -21,20 +21,11 @@ import (
"math/rand"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

7
eth/gasprice/lightprice.go
View file

@ -22,16 +22,9 @@ import (
"sort"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
const (

29
eth/handler.go
View file

@ -26,22 +26,6 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/eth/fetcher"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -55,7 +39,6 @@ import (
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const (
@ -243,11 +226,7 @@ func (pm *ProtocolManager) Start() {
}
func (pm *ProtocolManager) Stop() {
<<<<<<< HEAD
glog.V(logger.Info).Infoln("Stopping expanse protocol handler...")
=======
log.Info("Stopping Ethereum protocol")
>>>>>>> refs/remotes/ethereum/master
log.Info("Stopping Expanse protocol")
pm.txSub.Unsubscribe() // quits txBroadcastLoop
pm.minedBlockSub.Unsubscribe() // quits blockBroadcastLoop
@ -268,11 +247,7 @@ func (pm *ProtocolManager) Stop() {
// Wait for all peer handler goroutines and the loops to come down.
pm.wg.Wait()
<<<<<<< HEAD
glog.V(logger.Info).Infoln("Expanse protocol handler stopped")
=======
log.Info("Ethereum protocol stopped")
>>>>>>> refs/remotes/ethereum/master
log.Info("Expanse protocol stopped")
}
func (pm *ProtocolManager) newPeer(pv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {

14
eth/handler_test.go
View file

@ -23,19 +23,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/params"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
@ -48,7 +35,6 @@ import (
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
var bigTxGas = new(big.Int).SetUint64(params.TxGas)

13
eth/helper_test.go
View file

@ -27,18 +27,6 @@ import (
"sync"
"testing"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/params"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -50,7 +38,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
var (

9
eth/peer.go
View file

@ -23,19 +23,10 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
"gopkg.in/fatih/set.v0"
)

9
eth/sync.go
View file

@ -21,20 +21,11 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/discover"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p/discover"
>>>>>>> refs/remotes/ethereum/master
)
const (

10
ethclient/ethclient.go
View file

@ -23,22 +23,12 @@ import (
"fmt"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// Client defines typed wrappers for the Ethereum RPC API.

6
ethdb/database.go
View file

@ -22,14 +22,8 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/metrics"
=======
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/metrics"
>>>>>>> refs/remotes/ethereum/master
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/filter"

14
ethstats/ethstats.go
View file

@ -29,19 +29,6 @@ import (
"strconv"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/les"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/node"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -52,7 +39,6 @@ import (
"github.com/expanse-org/go-expanse/node"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
"golang.org/x/net/websocket"
)

5
event/subscription.go
View file

@ -21,12 +21,7 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common/mclock"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common/mclock"
>>>>>>> refs/remotes/ethereum/master
)
// Subscription represents a stream of events. The carrier of the events is typically a

5
internal/debug/api.go
View file

@ -33,12 +33,7 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
// Handler is the global debugging handler.

5
internal/debug/flags.go
View file

@ -24,14 +24,9 @@ import (
"os"
"runtime"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/log/term"
colorable "github.com/mattn/go-colorable"
>>>>>>> refs/remotes/ethereum/master
"gopkg.in/urfave/cli.v1"
)

5
internal/debug/trace.go
View file

@ -23,12 +23,7 @@ import (
"os"
"runtime/trace"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
// StartGoTrace turns on tracing, writing to the given file.

18
internal/ethapi/api.go
View file

@ -26,23 +26,6 @@ import (
"strings"
"time"
<<<<<<< HEAD
"github.com/ethereum/ethash"
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/accounts/keystore"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/accounts/keystore"
"github.com/expanse-org/go-expanse/common"
@ -59,7 +42,6 @@ import (
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/util"
)

14
internal/ethapi/backend.go
View file

@ -21,7 +21,6 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
@ -32,19 +31,6 @@ import (
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// Backend interface provides the common API services (that are provided by

17
les/api_backend.go
View file

@ -20,22 +20,6 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/eth/gasprice"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/math"
@ -50,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
type LesApiBackend struct {

24
les/backend.go
View file

@ -21,29 +21,6 @@ import (
"fmt"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/compiler"
"github.com/expanse-org/go-expanse/common/hexutil"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/eth/filters"
"github.com/expanse-org/go-expanse/eth/gasprice"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/internal/ethapi"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/node"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
rpc "github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/compiler"
@ -64,7 +41,6 @@ import (
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
rpc "github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
type LightEthereum struct {

10
les/fetcher.go
View file

@ -22,22 +22,12 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

32
les/handler.go
View file

@ -26,25 +26,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
@ -61,7 +42,6 @@ import (
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
)
const (
@ -310,11 +290,7 @@ func (pm *ProtocolManager) Start(srvr *p2p.Server) {
func (pm *ProtocolManager) Stop() {
// Showing a log message. During download / process this could actually
// take between 5 to 10 seconds and therefor feedback is required.
<<<<<<< HEAD
glog.V(logger.Info).Infoln("Stopping light expanse protocol handler...")
=======
log.Info("Stopping light Ethereum protocol")
>>>>>>> refs/remotes/ethereum/master
log.Info("Stopping light Expanse protocol")
// Quit the sync loop.
// After this send has completed, no new peers will be accepted.
@ -331,11 +307,7 @@ func (pm *ProtocolManager) Stop() {
// Wait for any process action
pm.wg.Wait()
<<<<<<< HEAD
glog.V(logger.Info).Infoln("Light expanse protocol handler stopped")
=======
log.Info("Light Ethereum protocol stopped")
>>>>>>> refs/remotes/ethereum/master
log.Info("Light Expanse protocol stopped")
}
func (pm *ProtocolManager) newPeer(pv, nv int, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {

14
les/helper_test.go
View file

@ -27,19 +27,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/les/flowcontrol"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/params"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -53,7 +40,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
var (

9
les/odr.go
View file

@ -23,19 +23,10 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
var (

13
les/odr_requests.go
View file

@ -23,18 +23,6 @@ import (
"errors"
"fmt"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -44,7 +32,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
)
var (

13
les/odr_test.go
View file

@ -23,18 +23,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/math"
"github.com/expanse-org/go-expanse/core"
@ -45,7 +33,6 @@ import (
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte

11
les/peer.go
View file

@ -24,23 +24,12 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/les/flowcontrol"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/les/flowcontrol"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
var (

9
les/request_test.go
View file

@ -21,20 +21,11 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/light"
>>>>>>> refs/remotes/ethereum/master
)
var testBankSecureTrieKey = secAddr(testBankAddress)

15
les/server.go
View file

@ -23,20 +23,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/les/flowcontrol"
"github.com/expanse-org/go-expanse/light"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -48,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
)
type LesServer struct {

11
les/serverpool.go
View file

@ -27,16 +27,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/log"
@ -44,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const (

7
les/sync.go
View file

@ -20,16 +20,9 @@ import (
"context"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/light"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/light"
>>>>>>> refs/remotes/ethereum/master
)
const (

21
light/lightchain.go
View file

@ -23,18 +23,6 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -44,7 +32,6 @@ import (
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
"github.com/hashicorp/golang-lru"
)
@ -109,15 +96,7 @@ func NewLightChain(odr OdrBackend, config *params.ChainConfig, pow pow.PoW, mux
bc.genesisBlock, _ = bc.GetBlockByNumber(NoOdr, 0)
if bc.genesisBlock == nil {
<<<<<<< HEAD
bc.genesisBlock, err = core.WriteDefaultGenesisBlock(odr.Database())
if err != nil {
return nil, err
}
glog.V(logger.Info).Infoln("WARNING: Wrote default expanse genesis block")
=======
return nil, core.ErrNoGenesis
>>>>>>> refs/remotes/ethereum/master
}
if bc.genesisBlock.Hash() == params.MainNetGenesisHash {

13
light/lightchain_test.go
View file

@ -22,8 +22,6 @@ import (
"math/big"
"testing"
<<<<<<< HEAD
"github.com/ethereum/ethash"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -31,17 +29,6 @@ import (
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
"github.com/hashicorp/golang-lru"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
// So we can deterministically seed different blockchains

10
light/odr.go
View file

@ -22,22 +22,12 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/rlp"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
// NoOdr is the default context passed to an ODR capable function when the ODR

15
light/odr_test.go
View file

@ -24,20 +24,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/math"
"github.com/expanse-org/go-expanse/core"
@ -51,7 +37,6 @@ import (
"github.com/expanse-org/go-expanse/pow"
"github.com/expanse-org/go-expanse/rlp"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
)
var (

12
light/odr_util.go
View file

@ -22,24 +22,12 @@ import (
"errors"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
var sha3_nil = crypto.Keccak256Hash(nil)

8
light/state.go
View file

@ -20,16 +20,8 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
>>>>>>> refs/remotes/ethereum/master
)
// LightState is a memory representation of a state.

9
light/state_object.go
View file

@ -22,18 +22,9 @@ import (
"fmt"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
var emptyCodeHash = crypto.Keccak256(nil)

9
light/state_test.go
View file

@ -22,20 +22,11 @@ import (
"math/big"
"testing"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
>>>>>>> refs/remotes/ethereum/master
)
func makeTestState() (common.Hash, ethdb.Database) {

6
light/trie.go
View file

@ -17,16 +17,10 @@
package light
import (
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/trie"
"golang.org/x/net/context"
=======
"context"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/trie"
>>>>>>> refs/remotes/ethereum/master
)
// LightTrie is an ODR-capable wrapper around trie.SecureTrie

13
light/txpool.go
View file

@ -22,18 +22,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -42,7 +30,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
// txPermanent is the number of mined blocks after a mined transaction is

11
light/txpool_test.go
View file

@ -23,16 +23,6 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/types"
@ -41,7 +31,6 @@ import (
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
type testTxRelay struct {

8
light/vm_env.go
View file

@ -20,17 +20,9 @@ import (
"context"
"math/big"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/crypto"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/crypto"
>>>>>>> refs/remotes/ethereum/master
)
// VMState is a wrapper for the light state that holds the actual context and

5
metrics/metrics.go
View file

@ -23,12 +23,7 @@ import (
"strings"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
"github.com/rcrowley/go-metrics"
"github.com/rcrowley/go-metrics/exp"
)

8
miner/agent.go
View file

@ -22,18 +22,10 @@ import (
"sync/atomic"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/pow"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
type CpuAgent struct {

15
miner/miner.go
View file

@ -22,20 +22,6 @@ import (
"math/big"
"sync/atomic"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/eth/downloader"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
@ -47,7 +33,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
// Backend wraps all methods required for mining.

9
miner/remote_agent.go
View file

@ -24,19 +24,10 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/ethereum/ethash"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/pow"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
)
type hashrate struct {

7
miner/unconfirmed.go
View file

@ -21,16 +21,9 @@ import (
"fmt"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
// headerRetriever is used by the unconfirmed block set to verify whether a previously

15
miner/worker.go
View file

@ -24,20 +24,6 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/core/state"
"github.com/expanse-org/go-expanse/core/types"
"github.com/expanse-org/go-expanse/core/vm"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core"
@ -49,7 +35,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/params"
"github.com/expanse-org/go-expanse/pow"
>>>>>>> refs/remotes/ethereum/master
"gopkg.in/fatih/set.v0"
)

16
mobile/geth.go
View file

@ -25,17 +25,6 @@ import (
"math/big"
"path/filepath"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/ethclient"
"github.com/expanse-org/go-expanse/ethstats"
"github.com/expanse-org/go-expanse/les"
"github.com/expanse-org/go-expanse/node"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/params"
whisper "github.com/expanse-org/go-expanse/whisper/whisperv2"
=======
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/eth"
"github.com/expanse-org/go-expanse/ethclient"
@ -45,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/params"
whisper "github.com/expanse-org/go-expanse/whisper/whisperv2"
>>>>>>> refs/remotes/ethereum/master
)
// NodeConfig represents the collection of configuration values to fine tune the Gexp
@ -106,9 +94,6 @@ func NewNodeConfig() *NodeConfig {
return &config
}
<<<<<<< HEAD
// Node represents a Gexp Ethereum node instance.
=======
// SetMainnet sets up the node for use on the Ethereum mainnet.
func (cfg *NodeConfig) SetMainnet() {
cfg.EthereumGenesis = ""
@ -122,7 +107,6 @@ func (cfg *NodeConfig) SetTestnet() {
}
// Node represents a Geth Ethereum node instance.
>>>>>>> refs/remotes/ethereum/master
type Node struct {
node *node.Node
}

5
mobile/init.go
View file

@ -22,12 +22,7 @@ import (
"os"
"runtime"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
func init() {

4
mobile/logger.go
View file

@ -17,13 +17,9 @@
package gexp
import (
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger/glog"
=======
"os"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
// SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go).

6
mobile/params.go
View file

@ -19,17 +19,11 @@
package gexp
import (
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/params"
=======
"encoding/json"
"github.com/expanse-org/go-expanse/core"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/params"
>>>>>>> refs/remotes/ethereum/master
)
// MainnetChainConfig returns the chain configurations for the main Ethereum network.

14
node/config.go
View file

@ -26,19 +26,6 @@ import (
"runtime"
"strings"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/accounts/keystore"
"github.com/expanse-org/go-expanse/accounts/usbwallet"
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/accounts/keystore"
"github.com/expanse-org/go-expanse/accounts/usbwallet"
@ -49,7 +36,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
>>>>>>> refs/remotes/ethereum/master
)
var (

11
node/node.go
View file

@ -27,16 +27,6 @@ import (
"sync"
"syscall"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
"github.com/expanse-org/go-expanse/internal/debug"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rpc"
=======
"github.com/expanse-org/go-expanse/accounts"
"github.com/expanse-org/go-expanse/ethdb"
"github.com/expanse-org/go-expanse/event"
@ -44,7 +34,6 @@ import (
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p"
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
"github.com/syndtr/goleveldb/leveldb/storage"
)

7
p2p/dial.go
View file

@ -24,16 +24,9 @@ import (
"net"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/netutil"
=======
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/netutil"
>>>>>>> refs/remotes/ethereum/master
)
const (

7
p2p/discover/database.go
View file

@ -27,16 +27,9 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/iterator"

5
p2p/discover/ntp.go
View file

@ -25,12 +25,7 @@ import (
"sort"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

7
p2p/discover/table.go
View file

@ -32,16 +32,9 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

9
p2p/discover/udp.go
View file

@ -25,20 +25,11 @@ import (
"net"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const Version = 4

7
p2p/discv5/database.go
View file

@ -28,16 +28,9 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/iterator"

12
p2p/discv5/net.go
View file

@ -24,17 +24,6 @@ import (
"net"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/crypto/sha3"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/crypto"
@ -43,7 +32,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
var (

5
p2p/discv5/ntp.go
View file

@ -26,12 +26,7 @@ import (
"strings"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

10
p2p/discv5/udp.go
View file

@ -24,22 +24,12 @@ import (
"net"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/crypto"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const Version = 4

6
p2p/nat/nat.go
View file

@ -25,12 +25,8 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
"github.com/jackpal/go-nat-pmp"
)

7
p2p/peer.go
View file

@ -24,17 +24,10 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/rlp"
=======
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/rlp"
>>>>>>> refs/remotes/ethereum/master
)
const (

9
p2p/server.go
View file

@ -25,14 +25,6 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/p2p/discover"
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/common/mclock"
"github.com/expanse-org/go-expanse/log"
@ -40,7 +32,6 @@ import (
"github.com/expanse-org/go-expanse/p2p/discv5"
"github.com/expanse-org/go-expanse/p2p/nat"
"github.com/expanse-org/go-expanse/p2p/netutil"
>>>>>>> refs/remotes/ethereum/master
)
const (

14
params/bootnodes.go
View file

@ -19,7 +19,6 @@ package params
// MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on
// the main Ethereum network.
var MainnetBootnodes = []string{
<<<<<<< HEAD
// EXP/DEV Go Bootnodes
"enode://7f335a047654f3e70d6f91312a7cf89c39704011f1a584e2698250db3d63817e74b88e26b7854111e16b2c9d0c7173c05419aeee2d0321850227b126d8b1be3f@46.101.156.249:42786",
"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
@ -28,19 +27,6 @@ var MainnetBootnodes = []string{
"enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786",
"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
"enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786",
=======
// Ethereum Foundation Go Bootnodes
"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303", // IE
"enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303", // US-WEST
"enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303", // BR
"enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303", // AU
"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303", // SG
// Ethereum Foundation Cpp Bootnodes
"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303", // DE
>>>>>>> refs/remotes/ethereum/master
}
// TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the

28
params/config.go
View file

@ -23,37 +23,12 @@ import (
"github.com/expanse-org/go-expanse/common"
)
<<<<<<< HEAD
// MainnetChainConfig is the chain parameters to run a node on the main network.
var MainnetChainConfig = &ChainConfig{
ChainId: MainNetChainID,
HomesteadBlock: MainNetHomesteadBlock,
DAOForkBlock: nil,
DAOForkSupport: false,
EIP150Block: MainNetHomesteadGasRepriceBlock,
EIP150Hash: MainNetHomesteadGasRepriceHash,
EIP155Block: MainNetSpuriousDragon,
EIP158Block: MainNetSpuriousDragon,
}
// TestnetChainConfig is the chain parameters to run a node on the test network.
var TestnetChainConfig = &ChainConfig{
ChainId: big.NewInt(3),
HomesteadBlock: big.NewInt(0),
DAOForkBlock: nil,
DAOForkSupport: false,
EIP150Block: big.NewInt(0),
EIP150Hash: common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"),
EIP155Block: big.NewInt(10),
EIP158Block: big.NewInt(10),
}
=======
var (
// MainnetChainConfig is the chain parameters to run a node on the main network.
MainnetChainConfig = &ChainConfig{
ChainId: MainNetChainID,
HomesteadBlock: MainNetHomesteadBlock,
DAOForkBlock: MainNetDAOForkBlock,
DAOForkBlock: nil,
DAOForkSupport: true,
EIP150Block: MainNetHomesteadGasRepriceBlock,
EIP150Hash: MainNetHomesteadGasRepriceHash,
@ -85,7 +60,6 @@ var (
AllProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0)}
TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0)}
)
>>>>>>> refs/remotes/ethereum/master
// ChainConfig is the core config which determines the blockchain settings.
//

6
rpc/client.go
View file

@ -31,13 +31,7 @@ import (
"sync/atomic"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
var (

5
rpc/client_example_test.go
View file

@ -22,12 +22,7 @@ import (
"math/big"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/rpc"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/rpc"
>>>>>>> refs/remotes/ethereum/master
)
// In this example, our client whishes to track the latest 'block number'

6
rpc/client_test.go
View file

@ -31,13 +31,7 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
func TestClientRequest(t *testing.T) {

6
rpc/ipc.go
View file

@ -21,13 +21,7 @@ import (
"fmt"
"net"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
// CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on

5
rpc/json.go
View file

@ -26,12 +26,7 @@ import (
"strings"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
const (

6
rpc/server.go
View file

@ -24,13 +24,7 @@ import (
"sync"
"sync/atomic"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
"gopkg.in/fatih/set.v0"
)

6
rpc/websocket.go
View file

@ -27,13 +27,7 @@ import (
"strings"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"golang.org/x/net/context"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
"golang.org/x/net/websocket"
"gopkg.in/fatih/set.v0"
)

7
swarm/api/api.go
View file

@ -24,16 +24,9 @@ import (
"strings"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
)
var (

6
swarm/api/api_test.go
View file

@ -23,14 +23,8 @@ import (
"os"
"testing"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
)
func testApi(t *testing.T, f func(*Api)) {

7
swarm/api/filesystem.go
View file

@ -25,16 +25,9 @@ import (
"path/filepath"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
)
const maxParallelFiles = 5

5
swarm/api/http/roundtripper.go
View file

@ -20,12 +20,7 @@ import (
"fmt"
"net/http"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
=======
"github.com/expanse-org/go-expanse/log"
>>>>>>> refs/remotes/ethereum/master
)
/*

8
swarm/api/http/server.go
View file

@ -29,18 +29,10 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/api"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/api"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
"github.com/rs/cors"
)

7
swarm/api/manifest.go
View file

@ -22,16 +22,9 @@ import (
"fmt"
"sync"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
)
const (

5
swarm/api/swarmfs.go
View file

@ -21,15 +21,10 @@ import (
"sync"
)
<<<<<<< HEAD:pow/block.go
"github.com/expanse-org/go-expanse/common"
"github.com/expanse-org/go-expanse/core/types"
=======
const (
Swarmfs_Version = "0.1"
mountTimeout = time.Second * 5
maxFuseMounts = 5
>>>>>>> refs/remotes/ethereum/master:swarm/api/swarmfs.go
)

6
swarm/network/depo.go
View file

@ -22,14 +22,8 @@ import (
"fmt"
"time"
<<<<<<< HEAD
"github.com/expanse-org/go-expanse/logger"
"github.com/expanse-org/go-expanse/logger/glog"
"github.com/expanse-org/go-expanse/swarm/storage"
=======
"github.com/expanse-org/go-expanse/log"
"github.com/expanse-org/go-expanse/swarm/storage"
>>>>>>> refs/remotes/ethereum/master
)
// Handler for storage/retrieval related protocol requests

Some files were not shown because too many files have changed in this diff Show more