aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <obscuren@obscura.com>2014-01-04 07:33:41 +0800
committerobscuren <obscuren@obscura.com>2014-01-04 07:33:41 +0800
commit2c90c0df65132bf65abbcf4e4caecb89b671b93f (patch)
tree3b50e63e893b19d778bd53092a5add6f78e97eb9
parent2d3c3674faa2c9c15d4ab27c7dc6b3e07a532780 (diff)
downloadgo-tangerine-2c90c0df65132bf65abbcf4e4caecb89b671b93f.tar.gz
go-tangerine-2c90c0df65132bf65abbcf4e4caecb89b671b93f.tar.zst
go-tangerine-2c90c0df65132bf65abbcf4e4caecb89b671b93f.zip
Updated fee
-rw-r--r--transaction.go17
1 files changed, 10 insertions, 7 deletions
diff --git a/transaction.go b/transaction.go
index 1cfa6d729..f5c848a31 100644
--- a/transaction.go
+++ b/transaction.go
@@ -34,9 +34,10 @@ var Period3Reward *big.Int = new(big.Int)
var Period4Reward *big.Int = new(big.Int)
type Transaction struct {
+ nonce string
sender string
recipient string
- value uint32
+ value uint64
fee uint32
data []string
memory []int
@@ -47,8 +48,9 @@ type Transaction struct {
addr string
}
-func NewTransaction(to string, value uint32, data []string) *Transaction {
+func NewTransaction(to string, value uint64, data []string) *Transaction {
tx := Transaction{sender: "1234567890", recipient: to, value: value}
+ tx.nonce = "0"
tx.fee = 0//uint32((ContractFee + MemoryFee * float32(len(tx.data))) * 1e8)
tx.lastTx = "0"
@@ -102,16 +104,16 @@ func (tx *Transaction) UnmarshalRlp(data []byte) {
// If only I knew of a better way.
if value, ok := slice[3].(uint8); ok {
- tx.value = uint32(value)
+ tx.value = uint64(value)
}
if value, ok := slice[3].(uint16); ok {
- tx.value = uint32(value)
+ tx.value = uint64(value)
}
if value, ok := slice[3].(uint32); ok {
- tx.value = uint32(value)
+ tx.value = uint64(value)
}
if value, ok := slice[3].(uint64); ok {
- tx.value = uint32(value)
+ tx.value = uint64(value)
}
if fee, ok := slice[4].(uint8); ok {
tx.fee = uint32(fee)
@@ -146,7 +148,8 @@ func InitFees() {
b80 := new(big.Int)
b80.Exp(big.NewInt(2), big.NewInt(80), big.NewInt(0))
- StepFee.Div(b60, big.NewInt(64))
+ StepFee.Exp(big.NewInt(10), big.NewInt(16), big.NewInt(0))
+ //StepFee.Div(b60, big.NewInt(64))
//fmt.Println("StepFee:", StepFee)
TxFee.Exp(big.NewInt(2), big.NewInt(64), big.NewInt(0))