basic git-database functionality working.

Author: fiatjaf

.gitignore

@@ -12,3 +12,4 @@ browserify-cache.json
 runcall
 static/*bundle*
 .pyre
+gitdatabase

account_functions.go

@@ -3,36 +3,28 @@ package main
 import (
 	"crypto/hmac"
 	"crypto/sha256"
-	"database/sql"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
 	"sort"
 
-	"github.com/fiatjaf/etleneum/types"
-	"gopkg.in/antage/eventsource.v1"
+	"github.com/fiatjaf/etleneum/data"
 )
 
-func loadAccount(accountId string) (types.Account, error) {
-	var acct types.Account
-	err := pg.Get(&acct, `SELECT `+types.ACCOUNTFIELDS+` FROM accounts WHERE id = $1`, accountId)
-	return acct, err
-}
-
 func getAccountSecret(account string) string {
 	hash := sha256.Sum256([]byte(account + "-" + s.SecretKey))
 	return hex.EncodeToString(hash[:])
 }
 
-func hmacCall(call *types.Call) []byte {
+func hmacCall(call *data.Call) []byte {
 	mac := hmac.New(sha256.New, []byte(getAccountSecret(call.Caller)))
 	mac.Write([]byte(callHmacString(call)))
 	return mac.Sum(nil)
 }
 
-func callHmacString(call *types.Call) (res string) {
+func callHmacString(call *data.Call) (res string) {
 	res = fmt.Sprintf("%s:%s:%d,", call.ContractId, call.Method, call.Msatoshi)
 
 	var payload map[string]interface{}
@@ -57,47 +49,29 @@ func callHmacString(call *types.Call) (res string) {
 	return
 }
 
-func notifyHistory(es eventsource.EventSource, accountId string) {
-	var history []types.AccountHistoryEntry
-	err := pg.Select(&history,
-		`SELECT `+types.ACCOUNTHISTORYFIELDS+`
-         FROM account_history WHERE account_id = $1`,
-		accountId)
-	if err != nil && err != sql.ErrNoRows {
-		log.Error().Err(err).Str("id", accountId).
-			Msg("failed to load account history from session")
-		return
-	} else if err == sql.ErrNoRows {
-		es.SendEventMessage("[]", "history", "")
-	} else {
-		jhistory, _ := json.Marshal(history)
-		es.SendEventMessage(string(jhistory), "history", "")
-	}
-}
-
-func deleteFailedWithdrawals() error {
-	var bolt11s []string
-	err := pg.Select(&bolt11s, `SELECT bolt11 FROM withdrawals WHERE NOT fulfilled`)
-	if err != nil {
-		return err
-	}
-
-	for _, bolt11 := range bolt11s {
-		listpays, err := ln.Call("listpays", bolt11)
-		if err != nil {
-			return err
-		}
-		if listpays.Get("pays.#").Int() == 0 || listpays.Get("pays.0.status").String() == "failed" {
-			// delete failed withdraw attempt
-			pg.Exec("DELETE FROM withdrawals WHERE bolt11 = $1 AND NOT fulfilled", bolt11)
-		} else if listpays.Get("pays.0.status").String() == "complete" {
-			// mark as not pending anymore
-			pg.Exec("UPDATE withdrawals SET fulfilled = true WHERE bolt11 = $1 AND NOT fulfilled", bolt11)
-		}
-	}
-
-	return nil
-}
+// func deleteFailedWithdrawals() error {
+// 	var bolt11s []string
+// 	err := pg.Select(&bolt11s, `SELECT bolt11 FROM withdrawals WHERE NOT fulfilled`)
+// 	if err != nil {
+// 		return err
+// 	}
+//
+// 	for _, bolt11 := range bolt11s {
+// 		listpays, err := ln.Call("listpays", bolt11)
+// 		if err != nil {
+// 			return err
+// 		}
+// 		if listpays.Get("pays.#").Int() == 0 || listpays.Get("pays.0.status").String() == "failed" {
+// 			// delete failed withdraw attempt
+// 			pg.Exec("DELETE FROM withdrawals WHERE bolt11 = $1 AND NOT fulfilled", bolt11)
+// 		} else if listpays.Get("pays.0.status").String() == "complete" {
+// 			// mark as not pending anymore
+// 			pg.Exec("UPDATE withdrawals SET fulfilled = true WHERE bolt11 = $1 AND NOT fulfilled", bolt11)
+// 		}
+// 	}
+//
+// 	return nil
+// }
 
 func hmacAccount(accountId string) string {
 	mac := hmac.New(sha256.New, []byte(s.SecretKey))