aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-11-29 03:47:24 +0800
committerobscuren <geffobscura@gmail.com>2014-11-29 03:47:24 +0800
commit61556ef01de20a23951690376662ca58b345eca4 (patch)
tree005c5d54b48e637c4c4bb0ee8cfb5654559d6a3b
parent4cd9d57bad95a8c2266ed9d33e9723631da0626f (diff)
downloadgo-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar.gz
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar.bz2
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar.lz
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar.xz
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.tar.zst
go-tangerine-61556ef01de20a23951690376662ca58b345eca4.zip
GasData changes & removed min gas price
-rw-r--r--chain/block.go36
-rw-r--r--chain/chain_manager.go2
-rw-r--r--chain/state_transition.go18
-rw-r--r--miner/miner.go1
4 files changed, 29 insertions, 28 deletions
diff --git a/chain/block.go b/chain/block.go
index a4ab560dc..dccb7ca41 100644
--- a/chain/block.go
+++ b/chain/block.go
@@ -84,8 +84,6 @@ type Block struct {
Time int64
// The block number
Number *big.Int
- // Minimum Gas Price
- MinGasPrice *big.Int
// Gas limit
GasLimit *big.Int
// Gas used
@@ -124,16 +122,15 @@ func CreateBlock(root interface{},
extra string) *Block {
block := &Block{
- PrevHash: prevHash,
- Coinbase: base,
- Difficulty: Difficulty,
- Nonce: Nonce,
- Time: time.Now().Unix(),
- Extra: extra,
- UncleSha: nil,
- GasUsed: new(big.Int),
- MinGasPrice: new(big.Int),
- GasLimit: new(big.Int),
+ PrevHash: prevHash,
+ Coinbase: base,
+ Difficulty: Difficulty,
+ Nonce: Nonce,
+ Time: time.Now().Unix(),
+ Extra: extra,
+ UncleSha: nil,
+ GasUsed: new(big.Int),
+ GasLimit: new(big.Int),
}
block.SetUncles([]*Block{})
@@ -300,12 +297,11 @@ func (self *Block) setHeader(header *ethutil.Value) {
self.LogsBloom = header.Get(6).Bytes()
self.Difficulty = header.Get(7).BigInt()
self.Number = header.Get(8).BigInt()
- self.MinGasPrice = header.Get(9).BigInt()
- self.GasLimit = header.Get(10).BigInt()
- self.GasUsed = header.Get(11).BigInt()
- self.Time = int64(header.Get(12).BigInt().Uint64())
- self.Extra = header.Get(13).Str()
- self.Nonce = header.Get(14).Bytes()
+ self.GasLimit = header.Get(9).BigInt()
+ self.GasUsed = header.Get(10).BigInt()
+ self.Time = int64(header.Get(11).BigInt().Uint64())
+ self.Extra = header.Get(12).Str()
+ self.Nonce = header.Get(13).Bytes()
}
func NewUncleBlockFromValue(header *ethutil.Value) *Block {
@@ -351,8 +347,6 @@ func (block *Block) miningHeader() []interface{} {
block.Difficulty,
// The block number
block.Number,
- // Block minimum gas price
- block.MinGasPrice,
// Block upper gas bound
block.GasLimit,
// Block gas used
@@ -380,7 +374,6 @@ func (block *Block) String() string {
Bloom: %x
Difficulty: %v
Number: %v
- MinGas: %v
MaxLimit: %v
GasUsed: %v
Time: %v
@@ -399,7 +392,6 @@ func (block *Block) String() string {
block.LogsBloom,
block.Difficulty,
block.Number,
- block.MinGasPrice,
block.GasLimit,
block.GasUsed,
block.Time,
diff --git a/chain/chain_manager.go b/chain/chain_manager.go
index df390a4c0..0c3a7a928 100644
--- a/chain/chain_manager.go
+++ b/chain/chain_manager.go
@@ -59,8 +59,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *Block {
nil,
"")
- block.MinGasPrice = big.NewInt(10000000000000)
-
parent := bc.CurrentBlock
if parent != nil {
block.Difficulty = CalcDifficulty(block, parent)
diff --git a/chain/state_transition.go b/chain/state_transition.go
index afe044299..f9b82c58b 100644
--- a/chain/state_transition.go
+++ b/chain/state_transition.go
@@ -156,12 +156,24 @@ func (self *StateTransition) TransitionState() (err error) {
}
// Pay data gas
- dataPrice := big.NewInt(int64(len(self.data)))
- dataPrice.Mul(dataPrice, vm.GasData)
- if err = self.UseGas(dataPrice); err != nil {
+ var dgas int64
+ for _, byt := range self.data {
+ if byt != 0 {
+ dgas += vm.GasData.Int64()
+ } else {
+ dgas += 1 // This is 1/5. If GasData changes this fails
+ }
+ }
+ if err = self.UseGas(big.NewInt(dgas)); err != nil {
return
}
+ //dataPrice := big.NewInt(int64(len(self.data)))
+ //dataPrice.Mul(dataPrice, vm.GasData)
+ //if err = self.UseGas(dataPrice); err != nil {
+ // return
+ //}
+
if sender.Balance().Cmp(self.value) < 0 {
return fmt.Errorf("Insufficient funds to transfer value. Req %v, has %v", self.value, sender.Balance)
}
diff --git a/miner/miner.go b/miner/miner.go
index a678a6895..e3435f5a6 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -177,7 +177,6 @@ func (self *Miner) mine() {
chainMan = self.eth.ChainManager()
block = chainMan.NewBlock(self.Coinbase)
)
- block.MinGasPrice = self.MinAcceptedGasPrice
// Apply uncles
if len(self.uncles) > 0 {