Changed fee structure

1 files changed, 13 insertions, 9 deletions

diff --git a/ethchain/fees.go b/ethchain/fees.go
index 57017cdc9..0096871d1 100644
--- a/ethchain/fees.go
+++ b/ethchain/fees.go
@@ -4,20 +4,18 @@ import (
 	"math/big"
 )
 
-var StepFee *big.Int = new(big.Int)
 var TxFeeRat *big.Int = big.NewInt(100000000000000)
+
 var TxFee *big.Int = big.NewInt(100)
-var ContractFee *big.Int = new(big.Int)
-var MemFee *big.Int = new(big.Int)
-var DataFee *big.Int = new(big.Int)
-var CryptoFee *big.Int = new(big.Int)
-var ExtroFee *big.Int = new(big.Int)
+var StepFee *big.Int = big.NewInt(1)
+var StoreFee *big.Int = big.NewInt(0)
+var DataFee *big.Int = big.NewInt(20)
+var ExtroFee *big.Int = big.NewInt(40)
+var CryptoFee *big.Int = big.NewInt(20)
+var ContractFee *big.Int = big.NewInt(100)
 
 var BlockReward *big.Int = big.NewInt(1.5e+18)
-
 var UncleReward *big.Int = big.NewInt(1.125e+18)
-
-//var UncleReward *big.Int = big.NewInt(2e18)
 var UncleInclusionReward *big.Int = big.NewInt(1.875e+17)
 
 var Period1Reward *big.Int = new(big.Int)
@@ -26,6 +24,12 @@ var Period3Reward *big.Int = new(big.Int)
 var Period4Reward *big.Int = new(big.Int)
 
 func InitFees() {
+	StepFee.Mul(StepFee, TxFeeRat)
+	StoreFee.Mul(StoreFee, TxFeeRat)
+	DataFee.Mul(DataFee, TxFeeRat)
+	ExtroFee.Mul(ExtroFee, TxFeeRat)
+	CryptoFee.Mul(CryptoFee, TxFeeRat)
+	ContractFee.Mul(ContractFee, TxFeeRat)
 	/*
 		// Base for 2**64
 		b60 := new(big.Int)