diff --git a/Makefile b/Makefile index 521df2a..47d3478 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: default build default: build -build: node.go client.go serve.go +build: node.go client.go serve.go values.go go build -o node node.go serve.go values.go go build -o client client.go values.go diff --git a/blockchain/chain.go b/blockchain/chain.go index 991c640..6b0fd96 100644 --- a/blockchain/chain.go +++ b/blockchain/chain.go @@ -242,7 +242,7 @@ func (chain *BlockChain) timeIsValid(block *Block, index uint64) bool { } result := btime.Sub(ltime) - return result >= TIME_SESSION + return result > 0 } func (chain *BlockChain) hashIsValid(block *Block, index uint64) bool { diff --git a/blockchain/settings.go b/blockchain/settings.go index 287fbbb..6642b8b 100644 --- a/blockchain/settings.go +++ b/blockchain/settings.go @@ -31,7 +31,6 @@ const ( GENESIS_REWARD = 100 DIFFICULTY = 20 // 15 TXS_LIMIT = 2 // 6 - TIME_SESSION = 1 * time.Minute // minutes START_PERCENT = 10 RAND_BYTES = 32 ) diff --git a/serve.go b/serve.go index 44f53b1..9695f06 100644 --- a/serve.go +++ b/serve.go @@ -12,7 +12,6 @@ import ( "os" "strconv" "strings" - "time" ) var ( @@ -195,21 +194,8 @@ func addTransaction(pack *nt.Package) string { return "fail" } if len(Block.Transactions) == bc.TXS_LIMIT { - lastBlock := getLastBlock() - if lastBlock == nil { - return "fail" - } - btime, err := time.Parse(time.RFC3339, lastBlock.TimeStamp) - if err != nil { - return "fail" - } - mod := time.Now().Sub(btime) - diff := mod < bc.TIME_SESSION go func() { block := *Block - if diff { - time.Sleep(bc.TIME_SESSION - mod) - } IsMining = true res := Chain.AcceptBlock(User, &block, BreakMining) IsMining = false @@ -223,13 +209,6 @@ func addTransaction(pack *nt.Package) string { return "ok" } -func getLastBlock() *bc.Block { - var sblock string - row := Chain.DB.QueryRow("SELECT Block FROM BlockChain ORDER BY Id DESC") - row.Scan(&sblock) - return bc.DeserializeBlock(sblock) -} - func pushBlockToNet(block *bc.Block) { var sblock = bc.SerializeBlock(block) for _, addr := range Addresses {