New Coinbase code, updates to screen

PaulSnow · PaulSnow · commit 3b1b9838877e · 2015-07-19T03:06:01.000-05:00
diff --git a/process/processor.go b/process/processor.go
@@ -108,7 +108,7 @@ func initProcessor() {
 	wire.FChainID = common.NewHash()
 	wire.FChainID.SetBytes(common.FACTOID_CHAINID)
 
-	FactoshisPerCredit = 666667 // .001 / .15 * 100000000 (assuming a Factoid is .15 cents, entry credit = .1 cents
+	FactoshisPerCredit = 66666 // .001 / .15 * 100000000 (assuming a Factoid is .15 cents, entry credit = .1 cents
 
 	// init Directory Block Chain
 	initDChain()
@@ -226,14 +226,6 @@ func serveCtlMsgRequest(msg wire.FtmInternalMsg) error {
 // Serve incoming msg from inMsgQueue
 func serveMsgRequest(msg wire.FtmInternalMsg) error {
 
-	if msg.Command() == wire.CmdFBlock {
-		fblock, ok := msg.(*wire.MsgFBlock)
-		if ok {
-			fmt.Printf("%s : Current chain height: %v\r", time.Now().Format(time.RFC3339), fblock.SC.GetDBHeight())
-		}
-
-	}
-
 	switch msg.Command() {
 	case wire.CmdCommitChain:
 		msgCommitChain, ok := msg.(*wire.MsgCommitChain)
@@ -314,6 +306,15 @@ func serveMsgRequest(msg wire.FtmInternalMsg) error {
 
 				plMgr.AddMyProcessListItem(msgEom, nil, msgEom.EOM_Type)
 			}
+			fmt.Printf("\033[s")             // save the cursor position
+            fmt.Printf("\033[1;0H%80s","")
+            fmt.Printf("\033[2;0H%80s","")
+            fmt.Printf("\033[3;0H     Minute %2v: %20s Current chain height: %7v         ", 
+                    msgEom.EOM_Type, 
+                    time.Now().Format(time.RFC3339), 
+                    dchain.NextDBHeight)
+            fmt.Printf("\033[4;0H%80s","")
+            fmt.Printf("\033[u")             // restore the cursor positio
 		}
 
 	case wire.CmdDirBlock:
diff --git a/process/syncup.go b/process/syncup.go
@@ -262,8 +262,9 @@ func storeBlocksFromMemPool(b *common.DirectoryBlock, fMemPool *ftmMemPool, db d
 			}
 			// Initialize the Factoid State
 			err = common.FactoidState.AddTransactionBlock(fBlkMsg.SC)
+            FactoshisPerCredit = fBlkMsg.SC.GetExchRate()
 			if err != nil {
-				panic("Failed to rebuild factoid state: " + err.Error())
+				return err
 			}
 
 			// for debugging
diff --git a/wsapi/wsapi.go b/wsapi/wsapi.go
@@ -359,7 +359,6 @@ func handleChainHead(ctx *web.Context, chainid string) {
 	}
 
 	c := new(chead)
-	fmt.Println("DEBUG:", c)
 	if mr, err := factomapi.ChainHead(chainid); err != nil {
 		wsLog.Error(err)
 		ctx.WriteHeader(httpBad)

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,9 @@ func storeBlocksFromMemPool(b common.DirectoryBlock, fMemPool ftmMemPool, db d`
`262`	`262`	`}`
`263`	`263`	`// Initialize the Factoid State`
`264`	`264`	`err = common.FactoidState.AddTransactionBlock(fBlkMsg.SC)`
	`265`	`+ FactoshisPerCredit = fBlkMsg.SC.GetExchRate()`
`265`	`266`	`if err != nil {`
`266`		`- panic("Failed to rebuild factoid state: " + err.Error())`
	`267`	`+ return err`
`267`	`268`	`}`
`268`	`269`
`269`	`270`	`// for debugging`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,6 @@ func handleChainHead(ctx *web.Context, chainid string) {`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`c := new(chead)`
`362`		`- fmt.Println("DEBUG:", c)`
`363`	`362`	`if mr, err := factomapi.ChainHead(chainid); err != nil {`
`364`	`363`	`wsLog.Error(err)`
`365`	`364`	`ctx.WriteHeader(httpBad)`