forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolving conflicts

Browse source
This commit is contained in:
Dustin Brickwood 2018-07-24 10:36:14 -04:00
parent b4e9ef8a64
commit 8a8c886ef1
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/shyft_database_util.go
View file

@ -8,7 +8,6 @@ import (
"database/sql" "database/sql"
"log" "log"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"fmt"
"github.com/ShyftNetwork/go-empyrean/common" "github.com/ShyftNetwork/go-empyrean/common"
"github.com/ShyftNetwork/go-empyrean/core/types" "github.com/ShyftNetwork/go-empyrean/core/types"
Rewards "github.com/ShyftNetwork/go-empyrean/consensus/ethash" Rewards "github.com/ShyftNetwork/go-empyrean/consensus/ethash"
@ -300,11 +299,9 @@ func swriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive,
Amount: tx.Value().String(), Amount: tx.Value().String(),
} }
fmt.Println("TO", sendAndReceiveData.To)
fmt.Println("FROM", sendAndReceiveData.From)
getAccountBalanceReceiver := SGetAccount(sqldb, sendAndReceiveData.To) getAccountBalanceReceiver := SGetAccount(sqldb, sendAndReceiveData.To)
getAccountBalanceSender:= SGetAccount(sqldb, sendAndReceiveData.From) getAccountBalanceSender:= SGetAccount(sqldb, sendAndReceiveData.From)
fmt.Println("HERE", getAccountBalanceReceiver)
var receiverData SendAndReceive var receiverData SendAndReceive
if err := json.Unmarshal([]byte(getAccountBalanceReceiver), &receiverData); err != nil { if err := json.Unmarshal([]byte(getAccountBalanceReceiver), &receiverData); err != nil {
log.Fatal(err) log.Fatal(err)

29
core/shyft_get_utils.go
View file

@ -280,20 +280,25 @@ func SGetTransaction(sqldb *sql.DB, txHash string) string {
return string(json) return string(json)
} }
func InnerSGetAccount(sqldb *sql.DB, address string) (SAccounts, bool) {
sqlStatement := `SELECT * FROM accounts WHERE addr=$1;`
var addr, balance, accountNonce string
err := sqldb.QueryRow(sqlStatement, address).Scan(&addr, &balance, &accountNonce)
if err == sql.ErrNoRows {
return SAccounts{}, false
} else {
account := SAccounts{
Addr: addr,
Balance: balance,
AccountNonce: accountNonce,
}
return account, true
}
}
//GetAccount returns account balances //GetAccount returns account balances
func SGetAccount(sqldb *sql.DB, address string) string { func SGetAccount(sqldb *sql.DB, address string) string {
sqlStatement := `SELECT * FROM accounts WHERE addr=$1;` var account, _ = InnerSGetAccount(sqldb, address)
row := sqldb.QueryRow(sqlStatement, address)
var addr, balance, accountNonce string
row.Scan(
&addr, &balance, &accountNonce)
account := SAccounts{
Addr: addr,
Balance: balance,
AccountNonce: accountNonce,
}
json, _ := json.Marshal(account) json, _ := json.Marshal(account)
return string(json) return string(json)
} }