Merge branch 'master' of https://github.com/OpenBazaar/openbazaar-go

Author: hoffmabc

Godeps/Godeps.json

@@ -182,7 +182,7 @@ func (w *BitcoindWallet) Transactions() ([]spvwallet.Txn, error) {
 		t := spvwallet.Txn{
 			Txid:   r.TxID,
 			Value:  int64(amt.ToUnit(btc.AmountSatoshi)),
-			Height: uint32(*r.BlockIndex),
+			Height: int32(*r.BlockIndex),
 		}
 		ret = append(ret, t)
 	}

bitcoin/bitcoind/wallet.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"crypto/sha256"
+
 	"github.com/OpenBazaar/jsonpb"
 	"github.com/OpenBazaar/openbazaar-go/ipfs"
 	"github.com/OpenBazaar/openbazaar-go/pb"
@@ -32,8 +33,10 @@ const (
 	MaxCategories            = 10
 	MaxListItems             = 30
 	FilenameMaxCharacters    = 255
+	CodeMaxCharacters        = 20
 	WordMaxCharacters        = 40
 	SentenceMaxCharacters    = 70
+	CouponTitleMaxCharacters = 70
 	PolicyMaxCharacters      = 10000
 	MaxCountryCodes          = 255
 )
@@ -886,9 +889,12 @@ func validateListing(listing *pb.Listing) (err error) {
 		return fmt.Errorf("Number of coupons is greater than the max of %d", MaxListItems)
 	}
 	for _, coupon := range listing.Coupons {
-		if len(coupon.Title) > SentenceMaxCharacters {
+		if len(coupon.Title) > CouponTitleMaxCharacters {
 			return fmt.Errorf("Coupon title length must be less than the max of %d", SentenceMaxCharacters)
 		}
+		if len(coupon.GetDiscountCode()) > CodeMaxCharacters {
+			return fmt.Errorf("Coupon code length must be less than the max of %d", CodeMaxCharacters)
+		}
 		if coupon.GetPercentDiscount() > 100 {
 			return errors.New("Percent discount cannot be over 100 percent")
 		}

core/listings.go

@@ -925,7 +925,10 @@ func (service *OpenBazaarService) handleChat(p peer.ID, pmes *pb.Message, option
 	if !offline {
 		t = time.Now()
 	} else {
-		t = time.Unix(chat.Timestamp.Seconds, int64(chat.Timestamp.Nanos))
+		if chat.Timestamp == nil {
+			return nil, errors.New("Invalid timestamp")
+		}
+		t = time.Unix(chat.Timestamp.Seconds, 0)
 	}
 
 	// Put to database

net/service/handlers.go

@@ -262,7 +262,7 @@ func initDatabaseTables(db *sql.DB, password string) error {
 	create table keys (scriptPubKey text primary key not null, purpose integer, keyIndex integer, used integer, key text);
 	create table utxos (outpoint text primary key not null, value integer, height integer, scriptPubKey text, freeze int);
 	create table stxos (outpoint text primary key not null, value integer, height integer, scriptPubKey text, spendHeight integer, spendTxid text);
-	create table txns (txid text primary key not null, value integer, height integer, tx blob);
+	create table txns (txid text primary key not null, value integer, height integer, timestamp integer, tx blob);
 	create table inventory (slug text primary key not null, count integer);
 	create table purchases (orderID text primary key not null, contract blob, state integer, read integer, date integer, total integer, thumbnail text, vendorID text, vendorBlockchainID text, title text, shippingName text, shippingAddress text, paymentAddr text, funded integer, transactions blob);
 	create index index_purchases on purchases (paymentAddr);
@@ -316,7 +316,6 @@ func (c *ConfigDB) Init(mnemonic string, identityKey []byte, password string) er
 	}
 	tx.Commit()
 	return nil
-
 }
 
 func (c *ConfigDB) GetMnemonic() (string, error) {

repo/db/db.go

@@ -7,29 +7,30 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"sync"
+	"time"
 )
 
 type TxnsDB struct {
 	db   *sql.DB
 	lock sync.RWMutex
 }
 
-func (t *TxnsDB) Put(txn *wire.MsgTx, value, height int) error {
+func (t *TxnsDB) Put(txn *wire.MsgTx, value, height int, timestamp time.Time) error {
 	t.lock.Lock()
 	defer t.lock.Unlock()
 	tx, err := t.db.Begin()
 	if err != nil {
 		return err
 	}
-	stmt, err := tx.Prepare("insert or replace into txns(txid, value, height, tx) values(?,?,?,?)")
+	stmt, err := tx.Prepare("insert or replace into txns(txid, value, height, timestamp, tx) values(?,?,?,?,?)")
+	defer stmt.Close()
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
-	defer stmt.Close()
 	var buf bytes.Buffer
 	txn.Serialize(&buf)
-	_, err = stmt.Exec(txn.TxHash().String(), value, height, buf.Bytes())
+	_, err = stmt.Exec(txn.TxHash().String(), value, height, int(timestamp.Unix()), buf.Bytes())
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -38,28 +39,29 @@ func (t *TxnsDB) Put(txn *wire.MsgTx, value, height int) error {
 	return nil
 }
 
-func (t *TxnsDB) Get(txid chainhash.Hash) (*wire.MsgTx, uint32, error) {
+func (t *TxnsDB) Get(txid chainhash.Hash) (*wire.MsgTx, int32, time.Time, error) {
 	t.lock.Lock()
 	defer t.lock.Unlock()
-	stmt, err := t.db.Prepare("select tx, height from txns where txid=?")
+	stmt, err := t.db.Prepare("select tx, height, timestamp from txns where txid=?")
 	defer stmt.Close()
 	var ret []byte
 	var height int
-	err = stmt.QueryRow(txid.String()).Scan(&ret, &height)
+	var timestamp int
+	err = stmt.QueryRow(txid.String()).Scan(&ret, &height, &timestamp)
 	if err != nil {
-		return nil, uint32(0), err
+		return nil, int32(0), time.Now(), err
 	}
 	r := bytes.NewReader(ret)
 	msgTx := wire.NewMsgTx(1)
 	msgTx.BtcDecode(r, 1)
-	return msgTx, uint32(height), nil
+	return msgTx, int32(height), time.Unix(int64(timestamp), 0), nil
 }
 
 func (t *TxnsDB) GetAll() ([]spvwallet.Txn, error) {
 	t.lock.Lock()
 	defer t.lock.Unlock()
 	var ret []spvwallet.Txn
-	stm := "select tx, value, height from txns"
+	stm := "select tx, value, height, timestamp from txns"
 	rows, err := t.db.Query(stm)
 	defer rows.Close()
 	if err != nil {
@@ -69,14 +71,15 @@ func (t *TxnsDB) GetAll() ([]spvwallet.Txn, error) {
 		var tx []byte
 		var value int
 		var height int
-		if err := rows.Scan(&tx, &value, &height); err != nil {
+		var timestamp int
+		if err := rows.Scan(&tx, &value, &height, &timestamp); err != nil {
 			continue
 		}
 		r := bytes.NewReader(tx)
 		msgTx := wire.NewMsgTx(1)
 		msgTx.BtcDecode(r, 1)
 
-		txn := spvwallet.Txn{msgTx.TxHash().String(), int64(value), uint32(height)}
+		txn := spvwallet.Txn{msgTx.TxHash().String(), int64(value), int32(height), time.Unix(int64(timestamp), 0)}
 		ret = append(ret, txn)
 	}
 	return ret, nil
@@ -91,3 +94,24 @@ func (t *TxnsDB) Delete(txid *chainhash.Hash) error {
 	}
 	return nil
 }
+
+func (t *TxnsDB) MarkAsDead(txid chainhash.Hash) error {
+	t.lock.Lock()
+	defer t.lock.Unlock()
+	tx, err := t.db.Begin()
+	if err != nil {
+		return err
+	}
+	stmt, err := tx.Prepare("update txns set height=-1 where txid=?")
+	if err != nil {
+		return err
+	}
+	defer stmt.Close()
+	_, err = stmt.Exec(txid.String())
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
+}

repo/db/txns.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"github.com/btcsuite/btcd/wire"
 	"testing"
+	"time"
 )
 
 var txdb TxnsDB
@@ -25,7 +26,7 @@ func TestTxnsPut(t *testing.T) {
 	r := bytes.NewReader(raw)
 	tx.Deserialize(r)
 
-	err := txdb.Put(tx, 5, 1)
+	err := txdb.Put(tx, 5, 1, time.Now())
 	if err != nil {
 		t.Error(err)
 	}
@@ -56,11 +57,12 @@ func TestTxnsGet(t *testing.T) {
 	r := bytes.NewReader(raw)
 	tx.Deserialize(r)
 
-	err := txdb.Put(tx, 0, 1)
+	now := time.Now()
+	err := txdb.Put(tx, 0, 1, now)
 	if err != nil {
 		t.Error(err)
 	}
-	tx2, h, err := txdb.Get(tx.TxHash())
+	tx2, h, ts, err := txdb.Get(tx.TxHash())
 	if err != nil {
 		t.Error(err)
 	}
@@ -70,6 +72,9 @@ func TestTxnsGet(t *testing.T) {
 	if h != 1 {
 		t.Error("Txn db failed to get height")
 	}
+	if now.Unix() != ts.Unix() {
+		t.Error("Txn db failed to return correct time")
+	}
 }
 
 func TestTxnsGetAll(t *testing.T) {
@@ -79,7 +84,7 @@ func TestTxnsGetAll(t *testing.T) {
 	r := bytes.NewReader(raw)
 	tx.Deserialize(r)
 
-	err := txdb.Put(tx, 1, 5)
+	err := txdb.Put(tx, 1, 5, time.Now())
 	if err != nil {
 		t.Error(err)
 	}
@@ -99,7 +104,7 @@ func TestDeleteTxns(t *testing.T) {
 	r := bytes.NewReader(raw)
 	tx.Deserialize(r)
 
-	err := txdb.Put(tx, 0, 1)
+	err := txdb.Put(tx, 0, 1, time.Now())
 	if err != nil {
 		t.Error(err)
 	}
@@ -118,3 +123,24 @@ func TestDeleteTxns(t *testing.T) {
 		}
 	}
 }
+
+func TestTxnsDB_MarkAsDead(t *testing.T) {
+	tx := wire.NewMsgTx(wire.TxVersion)
+	txHex := "0100000001cbfe4948ebc9113244b802a96e4940fa063c0455a16ca1f39a1e1db03837d9c701000000da004830450221008994e3dba54cb0ea23ca008d0e361b4339ee7b44b5e9101f6837e6a1a89ce044022051be859c68a547feaf60ffacc43f528cf2963c088bde33424d859274505e3f450147304402206cd4ef92cc7f2862c67810479013330fcafe4d468f1370563d4dff6be5bcbedc02207688a09163e615bc82299a29e987e1d718cb99a91d46a1ab13d18c0f6e616a1601475221024760c9ba5fa6241da6ee8601f0266f0e0592f53735703f0feaae23eda6673ae821038cfa8e97caaafbe21455803043618440c28c501ec32d6ece6865003165a0d4d152aeffffffff029ae2c700000000001976a914f72f20a739ec3c3df1a1fd7eff122d13bd5ca39188acb64784240000000017a9140be09225644b4cfdbb472028d8ccaf6df736025c8700000000"
+	raw, _ := hex.DecodeString(txHex)
+	r := bytes.NewReader(raw)
+	tx.Deserialize(r)
+
+	err := txdb.Put(tx, 0, 1, time.Now())
+	if err != nil {
+		t.Error(err)
+	}
+	err = txdb.MarkAsDead(tx.TxHash())
+	if err != nil {
+		t.Error(err)
+	}
+	_, height, _, err := txdb.Get(tx.TxHash())
+	if height != -1 {
+		t.Error("Txn db failed to mark as dead")
+	}
+}