Fixed timestamp handling in new blocks

blockchain.go

@@ -437,7 +437,11 @@ func OpenBlockFile(fileName string) (*Block, error) {
 		return nil, err
 	}
 	if b.TimeAccepted, err = b.dbGetMetaTime("Timestamp"); err != nil {
-		return nil, err
+		st, err := os.Stat(fileName)
+		if err != nil {
+			return nil, err
+		}
+		b.TimeAccepted = st.ModTime()
 	}
 	return &b, nil
 }

cliactions.go

@@ -99,6 +99,11 @@ func actionSignImportBlock(fn string) {
 	if err != nil {
 		log.Fatalln(err)
 	}
+	err = dbSetMetaString(db, "Timestamp", time.Now().Format(time.RFC3339))
+	if err != nil {
+		log.Fatalln(err)
+	}
+
 	pkdb, err := dbGetPublicKey(publicKeyHash)
 	if err != nil {
 		log.Panic(err)
@@ -468,6 +473,7 @@ func actionPull(baseURL string) {
 
 	// Step 4: Initialise databases
 	dbInit()
+	dbClearSavedPeers()
 	cryptoInit()
 
 	blk, err := OpenBlockFile(blockFilename)

db.go

@@ -462,6 +462,11 @@ func dbInsertBlock(dbb *DbBlockchainBlock) error {
 	return err
 }
 
+func dbClearSavedPeers() error {
+	_, err := mainDb.Exec("DELETE FROM peers")
+	return err
+}
+
 // Gets a list of saved p2p peer addresses
 func dbGetSavedPeers() peerStringMap {
 	result := peerStringMap{}

p2p.go

@@ -678,7 +678,7 @@ func (p2pc *p2pConnection) handleBlock(msg StrIfMap) {
 		defer resp.Body.Close()
 		blockFile, err = ioutil.TempFile("", "daisy")
 		if err != nil {
-			log.Println(err)
+			log.Println("Error creating temp file", err)
 			return
 		}
 		written, err := io.Copy(blockFile, resp.Body)
@@ -711,12 +711,12 @@ func (p2pc *p2pConnection) handleBlock(msg StrIfMap) {
 
 	blk, err := OpenBlockFile(blockFile.Name())
 	if err != nil {
-		log.Println(p2pc.conn, err)
+		log.Println("Error opening block file", p2pc.conn, err)
 		return
 	}
 	blk.HashSignature, err = hex.DecodeString(hashSignature)
 	if err != nil {
-		log.Println(p2pc.conn, err)
+		log.Println("Error decoding hash signature", p2pc.conn, err)
 		return
 	}
 	height, err := checkAcceptBlock(blk)