aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/asm.go3
-rw-r--r--ethchain/block.go8
-rw-r--r--ethchain/chain_manager.go4
-rw-r--r--ethchain/dagger.go6
-rw-r--r--ethchain/dagger_test.go3
-rw-r--r--ethchain/filter.go2
-rw-r--r--ethchain/genesis.go4
-rw-r--r--ethchain/helper_test.go10
-rw-r--r--ethchain/state_manager.go12
-rw-r--r--ethchain/state_transition.go8
-rw-r--r--ethchain/transaction.go6
-rw-r--r--ethchain/transaction_pool.go6
-rw-r--r--ethchain/vm_env.go4
13 files changed, 39 insertions, 37 deletions
diff --git a/ethchain/asm.go b/ethchain/asm.go
index 9f99b0c48..57bb2fcf9 100644
--- a/ethchain/asm.go
+++ b/ethchain/asm.go
@@ -2,8 +2,9 @@ package ethchain
import (
"fmt"
- "github.com/ethereum/eth-go/ethutil"
"math/big"
+
+ "github.com/ethereum/go-ethereum/ethutil"
)
func Disassemble(script []byte) (asm []string) {
diff --git a/ethchain/block.go b/ethchain/block.go
index 951bd8de3..b98d806d8 100644
--- a/ethchain/block.go
+++ b/ethchain/block.go
@@ -8,10 +8,10 @@ import (
_ "strconv"
"time"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethtrie"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethtrie"
+ "github.com/ethereum/go-ethereum/ethutil"
)
type BlockInfo struct {
diff --git a/ethchain/chain_manager.go b/ethchain/chain_manager.go
index 9f82eae41..d949f0ce7 100644
--- a/ethchain/chain_manager.go
+++ b/ethchain/chain_manager.go
@@ -5,8 +5,8 @@ import (
"fmt"
"math/big"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethlog"
+ "github.com/ethereum/go-ethereum/ethutil"
)
var chainlogger = ethlog.NewLogger("CHAIN")
diff --git a/ethchain/dagger.go b/ethchain/dagger.go
index 2d2b5720f..7efcf469d 100644
--- a/ethchain/dagger.go
+++ b/ethchain/dagger.go
@@ -6,9 +6,9 @@ import (
"math/rand"
"time"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethlog"
+ "github.com/ethereum/go-ethereum/ethutil"
"github.com/obscuren/sha3"
)
diff --git a/ethchain/dagger_test.go b/ethchain/dagger_test.go
index 9d4e03c92..2ffba0485 100644
--- a/ethchain/dagger_test.go
+++ b/ethchain/dagger_test.go
@@ -1,9 +1,10 @@
package ethchain
import (
- "github.com/ethereum/eth-go/ethutil"
"math/big"
"testing"
+
+ "github.com/ethereum/go-ethereum/ethutil"
)
func BenchmarkDaggerSearch(b *testing.B) {
diff --git a/ethchain/filter.go b/ethchain/filter.go
index 4e8df7d5f..4e7fe68a8 100644
--- a/ethchain/filter.go
+++ b/ethchain/filter.go
@@ -5,7 +5,7 @@ import (
"fmt"
"math"
- "github.com/ethereum/eth-go/ethstate"
+ "github.com/ethereum/go-ethereum/ethstate"
)
type AccountChange struct {
diff --git a/ethchain/genesis.go b/ethchain/genesis.go
index 8a6cb5527..232986d53 100644
--- a/ethchain/genesis.go
+++ b/ethchain/genesis.go
@@ -3,8 +3,8 @@ package ethchain
import (
"math/big"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethutil"
)
/*
diff --git a/ethchain/helper_test.go b/ethchain/helper_test.go
index 2da01d8a6..e4aef67d0 100644
--- a/ethchain/helper_test.go
+++ b/ethchain/helper_test.go
@@ -4,11 +4,11 @@ import (
"container/list"
"fmt"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethdb"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/eth-go/ethwire"
- "github.com/ethereum/eth-go/event"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/ethwire"
+ "github.com/ethereum/go-ethereum/event"
)
// Implement our EthTest Manager
diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go
index ed513c9dc..1de46b371 100644
--- a/ethchain/state_manager.go
+++ b/ethchain/state_manager.go
@@ -9,12 +9,12 @@ import (
"sync"
"time"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/eth-go/ethwire"
- "github.com/ethereum/eth-go/event"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethlog"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/ethwire"
+ "github.com/ethereum/go-ethereum/event"
)
var statelogger = ethlog.NewLogger("STATE")
diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index 1e6834729..1274915d5 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -4,10 +4,10 @@ import (
"fmt"
"math/big"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethtrie"
- "github.com/ethereum/eth-go/ethutil"
- "github.com/ethereum/eth-go/vm"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethtrie"
+ "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/vm"
)
/*
diff --git a/ethchain/transaction.go b/ethchain/transaction.go
index fe11be3bb..c78c27ed6 100644
--- a/ethchain/transaction.go
+++ b/ethchain/transaction.go
@@ -5,9 +5,9 @@ import (
"fmt"
"math/big"
- "github.com/ethereum/eth-go/ethcrypto"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethutil"
+ "github.com/ethereum/go-ethereum/ethcrypto"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethutil"
"github.com/obscuren/secp256k1-go"
)
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go
index 0ddc4e435..063688aa8 100644
--- a/ethchain/transaction_pool.go
+++ b/ethchain/transaction_pool.go
@@ -7,9 +7,9 @@ import (
"math/big"
"sync"
- "github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/ethwire"
+ "github.com/ethereum/go-ethereum/ethlog"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/ethwire"
)
var txplogger = ethlog.NewLogger("TXP")
diff --git a/ethchain/vm_env.go b/ethchain/vm_env.go
index 36c9d6002..6dda27c6f 100644
--- a/ethchain/vm_env.go
+++ b/ethchain/vm_env.go
@@ -3,8 +3,8 @@ package ethchain
import (
"math/big"
- "github.com/ethereum/eth-go/ethstate"
- "github.com/ethereum/eth-go/vm"
+ "github.com/ethereum/go-ethereum/ethstate"
+ "github.com/ethereum/go-ethereum/vm"
)
type VMEnv struct {