github update

This commit is contained in:
Christopher Franko 2015-09-01 19:41:15 -04:00
parent 92b5926495
commit 64ced6629a
21 changed files with 122 additions and 122 deletions

View file

@ -4,6 +4,6 @@ are ignored (use gofmt!). If you send pull requests make absolute sure that you
commit on the `develop` branch and that you do not merge to master.
Commits that are directly based on master are simply ignored.
See [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
See [Developers' Guide](https://github.com/expanse-project/go-expanse/wiki/Developers'-Guide)
for more details on configuring your environment, testing, and
dependency management.

View file

@ -26,9 +26,9 @@ import (
"strings"
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/tests"
"github.com/expanse-project/go-expanse/core/vm"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/tests"
)
var (

View file

@ -25,14 +25,14 @@ import (
"time"
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/expanse-project/go-expanse/cmd/utils"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/core/vm"
"github.com/expanse-project/go-expanse/ethdb"
"github.com/expanse-project/go-expanse/logger/glog"
)
var (

View file

@ -19,11 +19,11 @@ package core
import (
"math"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
)
type AccountChange struct {

View file

@ -19,10 +19,10 @@ package vm
import (
"math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/params"
)
type instrFn func(instr instruction, env Environment, context *Context, memory *Memory, stack *stack)

View file

@ -21,10 +21,10 @@ import (
"math/big"
"sync/atomic"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/params"
"github.com/hashicorp/golang-lru"
)

View file

@ -20,10 +20,10 @@ import (
"testing"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/ethdb"
)
const maxRun = 1000

View file

@ -21,12 +21,12 @@ import (
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/params"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/params"
)
// Vm implements VirtualMachine

View file

@ -29,23 +29,23 @@ import (
"time"
"github.com/ethereum/ethash"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/compiler"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/whisper"
"github.com/expanse-project/go-expanse/accounts"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/common/compiler"
"github.com/expanse-project/go-expanse/core"
"github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/core/vm"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/eth/downloader"
"github.com/expanse-project/go-expanse/ethdb"
"github.com/expanse-project/go-expanse/event"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/miner"
"github.com/expanse-project/go-expanse/p2p"
"github.com/expanse-project/go-expanse/p2p/discover"
"github.com/expanse-project/go-expanse/p2p/nat"
"github.com/expanse-project/go-expanse/whisper"
)
const (

View file

@ -22,16 +22,16 @@ import (
"math/big"
"sync/atomic"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/pow"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/core"
"github.com/expanse-project/go-expanse/core/state"
"github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/eth/downloader"
"github.com/expanse-project/go-expanse/event"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/params"
"github.com/expanse-project/go-expanse/pow"
)
type Miner struct {

View file

@ -23,9 +23,9 @@ import (
"net"
"time"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/p2p/discover"
)
const (

View file

@ -25,11 +25,11 @@ import (
"net"
"time"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/rlp"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/p2p/nat"
"github.com/expanse-project/go-expanse/rlp"
)
const Version = 4

View file

@ -25,10 +25,10 @@ import (
"sync"
"time"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/p2p/discover"
"github.com/expanse-project/go-expanse/p2p/nat"
)
const (

View file

@ -23,22 +23,22 @@ import (
"os"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/compiler"
"github.com/ethereum/go-ethereum/common/docserver"
"github.com/ethereum/go-ethereum/common/natspec"
"github.com/ethereum/go-ethereum/common/registrar"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
"github.com/ethereum/go-ethereum/xeth"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/common/compiler"
"github.com/expanse-project/go-expanse/common/docserver"
"github.com/expanse-project/go-expanse/common/natspec"
"github.com/expanse-project/go-expanse/common/registrar"
"github.com/expanse-project/go-expanse/core"
"github.com/expanse-project/go-expanse/core/types"
"github.com/expanse-project/go-expanse/crypto"
"github.com/expanse-project/go-expanse/eth"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rlp"
"github.com/expanse-project/go-expanse/rpc/codec"
"github.com/expanse-project/go-expanse/rpc/comms"
"github.com/expanse-project/go-expanse/rpc/shared"
"github.com/expanse-project/go-expanse/rpc/useragent"
"github.com/expanse-project/go-expanse/xeth"
)
const (

View file

@ -18,10 +18,10 @@ package api
import (
"github.com/ethereum/ethash"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/eth"
"github.com/expanse-project/go-expanse/rpc/codec"
"github.com/expanse-project/go-expanse/rpc/shared"
)
const (

View file

@ -29,10 +29,10 @@ import (
"io"
"io/ioutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rpc/codec"
"github.com/expanse-project/go-expanse/rpc/shared"
"github.com/rs/cors"
)

View file

@ -22,11 +22,11 @@ import (
"net"
"os"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rpc/codec"
"github.com/expanse-project/go-expanse/rpc/shared"
"github.com/expanse-project/go-expanse/rpc/useragent"
)
func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {

View file

@ -28,11 +28,11 @@ import (
"time"
"unsafe"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rpc/codec"
"github.com/expanse-project/go-expanse/rpc/shared"
"github.com/expanse-project/go-expanse/rpc/useragent"
)
var (

View file

@ -20,14 +20,14 @@ import (
"encoding/json"
"fmt"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/jsre"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/comms"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
"github.com/ethereum/go-ethereum/xeth"
"github.com/expanse-project/go-expanse/cmd/utils"
"github.com/expanse-project/go-expanse/jsre"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rpc/comms"
"github.com/expanse-project/go-expanse/rpc/shared"
"github.com/expanse-project/go-expanse/rpc/useragent"
"github.com/expanse-project/go-expanse/xeth"
"github.com/robertkrimen/otto"
)

View file

@ -21,11 +21,11 @@ import (
"fmt"
"net"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/expanse-project/go-expanse/accounts"
"github.com/expanse-project/go-expanse/common"
"github.com/expanse-project/go-expanse/logger"
"github.com/expanse-project/go-expanse/logger/glog"
"github.com/expanse-project/go-expanse/rpc/shared"
)
// remoteFrontend implements xeth.Frontend and will communicate with an external

View file

@ -21,7 +21,7 @@ import (
"path/filepath"
"testing"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/expanse-project/go-expanse/core/vm"
)
func init() {