From 494e62c69ab50992a5b0fa1db6027299d626acd3 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Wed, 1 Aug 2018 15:59:38 -0400 Subject: [PATCH] wip --- core/shyft_database_util.go | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 1448b7cc35..1aa75f1119 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -271,28 +271,24 @@ func swriteFromBalance(sqldb *sql.DB, tx *types.Transaction) error { func adjustBalanceFromAddr(sqldb *sql.DB, s SendAndReceive, value *big.Int) { fromAddressBalance, fromAccountNonce, err := AccountExists(sqldb, s.From) - switch { - case err == sql.ErrNoRows: - accountNonce := "1" - //s.Amount should be 0? - CreateAccount(sqldb, s.From, s.Amount, accountNonce) - case err != nil: + if err != nil { log.Fatal(err) - default: - var newBalanceSender, newAccountNonceSender big.Int - var nonceIncrement = big.NewInt(1) - - fromBalance := new(big.Int) - fromBalance, _ = fromBalance.SetString(fromAddressBalance, 10) - - fromNonce := new(big.Int) - fromNonce, _ = fromNonce.SetString(fromAccountNonce, 10) - - newBalanceSender.Sub(fromBalance, value) - newAccountNonceSender.Add(fromNonce, nonceIncrement) - - UpdateAccount(sqldb, s.From, newBalanceSender.String(), newAccountNonceSender.String()) } + + var newBalanceSender, newAccountNonceSender big.Int + var nonceIncrement = big.NewInt(1) + + fromBalance := new(big.Int) + fromBalance, _ = fromBalance.SetString(fromAddressBalance, 10) + + fromNonce := new(big.Int) + fromNonce, _ = fromNonce.SetString(fromAccountNonce, 10) + + newBalanceSender.Sub(fromBalance, value) + newAccountNonceSender.Add(fromNonce, nonceIncrement) + + UpdateAccount(sqldb, s.From, newBalanceSender.String(), newAccountNonceSender.String()) + //} } func balanceHelper(sqldb *sql.DB, s SendAndReceive, value *big.Int) {