From 184055b3e2995894ccaba364484223e488730627 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 23 Oct 2014 15:48:53 +0200
Subject: cmd/*: add license headers
---
cmd/ethereum/main.go | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index f7d7761e8..9e9a3e356 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -1,3 +1,20 @@
+// Copyright (c) 2013-2014, Jeffrey Wilcke. All rights reserved.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301 USA
+
package main
import (
--
cgit v1.2.3
From 9e2f071d26d5c4ed343d2a91e48fec4e7751b99d Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 29 Oct 2014 14:20:42 +0100
Subject: Removed events from the state manager
---
cmd/ethereum/main.go | 2 ++
1 file changed, 2 insertions(+)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 9e9a3e356..b78d49cae 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -98,6 +98,8 @@ func main() {
// Leave the Println. This needs clean output for piping
fmt.Printf("%s\n", block.State().Dump())
+ fmt.Println(block)
+
os.Exit(0)
}
--
cgit v1.2.3
From fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 31 Oct 2014 12:37:43 +0100
Subject: ethcrypto => crypto
---
cmd/ethereum/main.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index b78d49cae..71b9b72f1 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -22,7 +22,7 @@ import (
"os"
"runtime"
- "github.com/ethereum/go-ethereum/ethchain"
+ "github.com/ethereum/go-ethereum/chain"
"github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/utils"
@@ -74,7 +74,7 @@ func main() {
ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
if Dump {
- var block *ethchain.Block
+ var block *chain.Block
if len(DumpHash) == 0 && DumpNumber == -1 {
block = ethereum.ChainManager().CurrentBlock
--
cgit v1.2.3
From b1c247231b11f313ca0eedff75ea563926d23f68 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 31 Oct 2014 12:56:05 +0100
Subject: ethlog => logger
---
cmd/ethereum/main.go | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 71b9b72f1..fa85865fc 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -23,9 +23,10 @@ import (
"runtime"
"github.com/ethereum/go-ethereum/chain"
- "github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/utils"
+ "github.com/ethgo.old/ethlog"
)
const (
@@ -33,7 +34,7 @@ const (
Version = "0.7.0"
)
-var logger = ethlog.NewLogger("CLI")
+var clilogger = logger.NewLogger("CLI")
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
--
cgit v1.2.3
From 8826e9694c3a8d4f480f0a021d8c02f7f61612c6 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 31 Oct 2014 14:20:11 +0100
Subject: Moved utils to cmd
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index fa85865fc..d7bc74c27 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -23,9 +23,9 @@ import (
"runtime"
"github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
- "github.com/ethereum/go-ethereum/utils"
"github.com/ethgo.old/ethlog"
)
--
cgit v1.2.3
From f3473312ba90b37b9a4100592a8c4d5d5bf245b7 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 31 Oct 2014 18:40:32 +0100
Subject: all: fix rename breakage
---
cmd/ethereum/main.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index d7bc74c27..c78972bfe 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -26,7 +26,6 @@ import (
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
- "github.com/ethgo.old/ethlog"
)
const (
@@ -131,5 +130,5 @@ func main() {
// this blocks the thread
ethereum.WaitForShutdown()
- ethlog.Flush()
+ logger.Flush()
}
--
cgit v1.2.3
From d56d0c64aa84ae4f85f2ceb110e5b676f7adea7f Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 4 Nov 2014 01:50:16 +0100
Subject: Version bump
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index c78972bfe..f8ef3855e 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.0"
+ Version = "0.7.3"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 60cdb1148c404218846fd39331690658168f4e04 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 12 Nov 2014 01:36:36 +0100
Subject: Transaction execution fixes
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index f8ef3855e..eb7be1ea7 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.3"
+ Version = "0.7.4"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 711be7009ef5b9ad77f37a4ccd0dffcc9286e1f8 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 14 Nov 2014 13:51:41 +0100
Subject: Version bump
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index eb7be1ea7..ed42dfafb 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.4"
+ Version = "0.7.5"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 1ecb3b4cf358a9c8fb0152b54bde70c925eaa5c9 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Fri, 14 Nov 2014 15:53:45 -0600
Subject: Remove failing Printf
---
cmd/ethereum/main.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index ed42dfafb..c894a8f85 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -93,7 +93,8 @@ func main() {
os.Exit(1)
}
- fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
+ // block.GetRoot() does not exist
+ //fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
// Leave the Println. This needs clean output for piping
fmt.Printf("%s\n", block.State().Dump())
--
cgit v1.2.3
From 93e693be72e1a7734e826016316434c1e2320de9 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 18 Nov 2014 19:52:45 +0100
Subject: Fixed tests for 'types'
---
cmd/ethereum/main.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index c894a8f85..aa933c4e7 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -21,8 +21,7 @@ import (
"fmt"
"os"
"runtime"
-
- "github.com/ethereum/go-ethereum/chain"
+ "github.com/ethereum/go-ethereum/chain/types"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
@@ -74,7 +73,7 @@ func main() {
ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
if Dump {
- var block *chain.Block
+ var block *types.Block
if len(DumpHash) == 0 && DumpNumber == -1 {
block = ethereum.ChainManager().CurrentBlock
--
cgit v1.2.3
From 0f471291134c0b38df07b9a9cffda5c9807435ae Mon Sep 17 00:00:00 2001
From: Eric Robitaille <eric@vianet.ca>
Date: Thu, 20 Nov 2014 14:16:22 -0500
Subject: Updated main.go - fix for broken develop build
Transaction execution fixes - 60cdb1148c404218846fd39331690658168f4e04
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index ed42dfafb..88549b30a 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -93,7 +93,7 @@ func main() {
os.Exit(1)
}
- fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.GetRoot(), block.Hash())
+ fmt.Printf("RLP: %x\nstate: %x\nhash: %x\n", ethutil.Rlp(block), block.Root(), block.Hash())
// Leave the Println. This needs clean output for piping
fmt.Printf("%s\n", block.State().Dump())
--
cgit v1.2.3
From a3559c5e1b469890bb8d71e9992175febaae31c7 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 28 Nov 2014 21:38:10 +0100
Subject: updated PV
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 88549b30a..1493de384 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.5"
+ Version = "0.7.6"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 3d9a4e7084c33cb28a2265c0dd232a0ea3871c92 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 3 Dec 2014 12:21:12 +0100
Subject: Fixed mem error in vm. Fixed logs tests
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 1493de384..60052314c 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.6"
+ Version = "0.7.7"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 83663ed4b01480c628ce2c849e4e881ac04b5120 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 4 Dec 2014 10:53:49 +0100
Subject: Renames for chain, updated VM, moved methods
* Renamed a couple more chain => core
* Updated VM `pc` to be uint64 rather than big int
* XEth interface cleanup
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 7e67a6dcc..c39f904fb 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -22,8 +22,8 @@ import (
"os"
"runtime"
- "github.com/ethereum/go-ethereum/chain/types"
"github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
)
--
cgit v1.2.3
From 73c4ca3a6fcf948f4bc637f5c1b55277cf64c06f Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 4 Dec 2014 15:31:48 +0100
Subject: Upped protocol version
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index c39f904fb..14921bf10 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.7"
+ Version = "0.7.8"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 9925916851c00323336e213fc18c83da5fceee94 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 5 Dec 2014 16:26:39 +0100
Subject: upped proto version and modified block pool
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 14921bf10..43551fb3a 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.8"
+ Version = "0.7.9"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3
From 2d09e67713757e2a80eb614562c97f962af36cf7 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 18 Dec 2014 13:17:24 +0100
Subject: Updated to new methods
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 43551fb3a..9efc8e9dc 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -77,7 +77,7 @@ func main() {
var block *types.Block
if len(DumpHash) == 0 && DumpNumber == -1 {
- block = ethereum.ChainManager().CurrentBlock
+ block = ethereum.ChainManager().CurrentBlock()
} else if len(DumpHash) > 0 {
block = ethereum.ChainManager().GetBlock(ethutil.Hex2Bytes(DumpHash))
} else {
--
cgit v1.2.3
From 88af879f7ae55249ff7a9669184b52a611e4fb20 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 19 Dec 2014 01:18:22 +0100
Subject: version bump
---
cmd/ethereum/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'cmd/ethereum/main.go')
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index 9efc8e9dc..2a3c46054 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -30,7 +30,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
- Version = "0.7.9"
+ Version = "0.7.10"
)
var clilogger = logger.NewLogger("CLI")
--
cgit v1.2.3