dev/api.go

@@ -27,7 +27,7 @@ const (
 	pubKeyLen int = 20
 	hashLen int = 32
 	defaultDecimals = 6
-	zeroAddress string = "0x0000000000000000000000000000000000000000"
+	zeroAccount string = "0x0000000000000000000000000000000000000000"
 )
 
 type Tx struct {
@@ -89,12 +89,7 @@ func NewDevAccountService(ctx context.Context, d string) *DevAccountService {
 		txs: make(map[string]Tx),
 		txsTrack: make(map[string]string),
 		autoVoucherValue: make(map[string]int),
-		defaultAccount: zeroAddress,
 	}
-	acc := Account{
-		Address: zeroAddress,
-	}
-	svc.accounts[acc.Address] = acc
 	err := svc.db.Connect(ctx, d)
 	if err != nil {
 		panic(err)
@@ -122,18 +117,6 @@ func (das *DevAccountService) loadAccount(ctx context.Context, pubKey string, v
 	return nil
 }
 
-func (das *DevAccountService) loadTx(ctx context.Context, hsh string, v []byte) error {
-	var mytx Tx
-
-	err := json.Unmarshal(v, &mytx)
-	if err != nil {
-		return fmt.Errorf("malformed tx: %v", hsh)
-	}
-	das.txs[hsh] = mytx
-	das.txsTrack[mytx.Track] = hsh
-	return nil
-}
-
 func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte) error {
 	var err error
 	s := string(k)
@@ -143,8 +126,6 @@ func (das *DevAccountService) loadItem(ctx context.Context, k []byte, v []byte)
 	}
 	if ss[0] == "account" {
 		err = das.loadAccount(ctx, ss[1], v)
-	} else if ss[0] == "tx" {
-		err = das.loadTx(ctx, ss[1], v)
 	}
 	return err
 }
@@ -277,16 +258,12 @@ func (das *DevAccountService) CreateAccount(ctx context.Context) (*models.Accoun
 
 	das.accounts[pubKey] = acc
 	das.accountsTrack[uid.String()] = pubKey
-	err = das.balanceAuto(ctx, pubKey)
+	das.balanceAuto(ctx, pubKey)
-	if err != nil {
-		return nil, err
-	}
 
-	if das.defaultAccount == zeroAddress {
+	if das.defaultAccount == zeroAccount {
 		das.defaultAccount = pubKey
 	}
 
-	logg.InfoCtxf(ctx, "account created", "account", acc)
 
 	return &models.AccountResult{
 		PublicKey: pubKey,
@@ -375,15 +352,6 @@ func (das *DevAccountService) VoucherData(ctx context.Context, address string) (
 	}, nil
 }
 
-func (das *DevAccountService) saveTokenTransfer(ctx context.Context, mytx Tx) error {
-	k := "tx_" + mytx.Hsh
-	v, err := json.Marshal(mytx)
-	if err != nil {
-		return err
-	}
-	return das.db.Put(ctx, []byte(k), v)
-}
-
 func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, to, tokenAddress string) (*models.TokenTransferResponse, error) {
 	var b [hashLen]byte
 	value, err := strconv.Atoi(amount)
@@ -394,7 +362,7 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
 	if !ok {
 		return nil, fmt.Errorf("sender account %v not found", from)	
 	}
-	accTo, ok := das.accounts[to]
+	accTo, ok := das.accounts[from]
 	if !ok {
 		if !das.toAutoCreate {
 			return nil, fmt.Errorf("recipient account %v not found, and not creating", from)	
@@ -422,7 +390,7 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
 		return nil, fmt.Errorf("tx hash short read: %d", c)
 	}
 	hsh := fmt.Sprintf("0x%x", b)
-	mytx := Tx{
+	das.txs[hsh] = Tx{
 		Hsh: hsh,
 		To: accTo.Address,
 		From: accFrom.Address,
@@ -431,12 +399,6 @@ func (das *DevAccountService) TokenTransfer(ctx context.Context, amount, from, t
 		Track: uid.String(),
 		When: time.Now(),
 	}
-	err = das.saveTokenTransfer(ctx, mytx)
-	if err != nil {
-		return nil, err
-	}
-	das.txs[hsh] = mytx
-	logg.InfoCtxf(ctx, "token transfer created", "tx", mytx)
 	return &models.TokenTransferResponse{
 		TrackingId: uid.String(),
 	}, nil