Merge pull request #62 from insolar/develop

Develop: platform v0.9.6 -> v0.9.8
insolar · Sep 27, 2019 · d32f052 · d32f052
2 parents 93f937d + a015c4c
commit d32f052
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 47 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -27,7 +27,7 @@
 
 [[constraint]]
   name = "github.com/insolar/insolar"
-  version = "v0.9.6"
+  version = "v0.9.8"
 
 [[constraint]]
   name = "google.golang.org/grpc"

diff --git a/internal/beauty/member/member.go b/internal/beauty/member/member.go
@@ -49,15 +49,15 @@ func (b *memberBuilder) build() (*beauty.Member, error) {
 	}
 	params := memberStatus(b.res)
 	balance := account.AccountBalance(b.act)
-	ref, err := insolar.NewReferenceFromBase58(params.reference)
+	id, err := insolar.NewIDFromBase58(params.reference)
 	if err != nil {
-		return nil, errors.New("invalid member reference")
+		return nil, errors.Wrapf(err, "failed to make reference from %s", params.reference)
 	}
 	return &beauty.Member{
-		MemberRef:        ref.String(),
+		MemberRef:        id.Bytes(),
 		Balance:          balance,
 		MigrationAddress: params.migrationAddress,
-		AccountState:     b.act.ID.String(),
+		AccountState:     b.act.ID.Bytes(),
 		Status:           string(params.status),
 	}, nil
 }

diff --git a/internal/beauty/member/update_balance.go b/internal/beauty/member/update_balance.go
@@ -60,16 +60,16 @@ func (u *BalanceUpdater) processAccountAmend(id insolar.ID, rec *record.Material
 	if amd.PrevState.Pulse() == insolar.GenesisPulse.PulseNumber {
 		randomRef := gen.Reference()
 		u.technicalAccounts = append(u.technicalAccounts, &beauty.Member{
-			MemberRef:    randomRef.String(),
+			MemberRef:    randomRef.Bytes(),
 			Balance:      balance,
-			AccountState: id.String(),
+			AccountState: id.Bytes(),
 			Status:       "INTERNAL",
 		})
 		return
 	}
 	u.cache = append(u.cache, &beauty.BalanceUpdate{
-		ID:        id.String(),
-		PrevState: amd.PrevState.String(),
+		ID:        id.Bytes(),
+		PrevState: amd.PrevState.Bytes(),
 		Balance:   balance,
 	})
 }

diff --git a/internal/beauty/migration/deposit/deposit.go b/internal/beauty/migration/deposit/deposit.go
@@ -61,16 +61,20 @@ func (b *depositBuilder) build() (*beauty.Deposit, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to convert deposit create pulse (%d) to time", b.act.ID.Pulse())
 	}
+	memberID, err := insolar.NewIDFromBase58(callResult.memberRef)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to create ID from string %s", callResult.memberRef)
+	}
 
 	return &beauty.Deposit{
 		EthHash:         strings.ToLower(deposit.TxHash),
-		DepositRef:      act.Request.String(),
-		MemberRef:       callResult.memberRef,
+		DepositRef:      act.Request.GetLocal().Bytes(),
+		MemberRef:       memberID.Bytes(),
 		TransferDate:    transferDate.Unix(),
 		HoldReleaseDate: 0,
 		Amount:          deposit.Amount,
 		Balance:         deposit.Balance,
-		DepositState:    id.String(),
+		DepositState:    id.Bytes(),
 	}, nil
 }
 

diff --git a/internal/beauty/migration/deposit/deposit_update.go b/internal/beauty/migration/deposit/deposit_update.go
@@ -50,11 +50,11 @@ func (k *DepositKeeper) Process(rec *record.Material) {
 			releaseTimestamp = holdReleadDate.Unix()
 		}
 		k.cache = append(k.cache, &beauty.DepositUpdate{
-			ID:              rec.ID.String(),
+			ID:              rec.ID.Bytes(),
 			HoldReleaseDate: releaseTimestamp,
 			Amount:          d.Amount,
 			Balance:         d.Balance,
-			PrevState:       amd.PrevState.String(),
+			PrevState:       amd.PrevState.Bytes(),
 		})
 	}
 }

diff --git a/internal/beauty/transfer/transfer.go b/internal/beauty/transfer/transfer.go
@@ -59,37 +59,37 @@ func build(req *record.Material, res *record.Material) (*beauty.Transfer, error)
 	}
 	resultValue := &transferResult{Fee: "0"}
 	result.ParseFirstPayloadValue(resultValue)
-	memberFrom, err := insolar.NewReferenceFromBase58(callArguments.Params.Reference)
+	memberFrom, err := insolar.NewIDFromBase58(callArguments.Params.Reference)
 	if err != nil {
 		return nil, errors.New("invalid fromMemberReference")
 	}
-	to := ""
+	to := []byte{}
 	switch callArguments.Params.CallSite {
 	case "member.transfer":
-		memberTo, err := insolar.NewReferenceFromBase58(callParams.ToMemberReference)
+		memberTo, err := insolar.NewIDFromBase58(callParams.ToMemberReference)
 		if err != nil {
 			return nil, errors.New("invalid toMemberReference")
 		}
-		to = memberTo.String()
+		to = memberTo.Bytes()
 	case "deposit.transfer":
-		to = memberFrom.String()
+		to = memberFrom.Bytes()
 	}
 
 	transferDate, err := pulse.Number(pn).AsApproximateTime()
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to convert transfer pulse to time")
 	}
 	return &beauty.Transfer{
-		TxID:          insolar.NewReference(req.ID).String(),
+		TxID:          req.ID.Bytes(),
 		Status:        string(status),
 		Amount:        callParams.Amount,
-		MemberFromRef: memberFrom.String(),
+		MemberFromRef: memberFrom.Bytes(),
 		MemberToRef:   to,
 		PulseNum:      pn,
 		TransferDate:  transferDate.Unix(),
 		Fee:           resultValue.Fee,
-		WalletFromRef: "TODO",
-		WalletToRef:   "TODO",
+		WalletFromRef: []byte{},
+		WalletToRef:   []byte{},
 		EthHash:       callParams.EthTxHash,
 	}, nil
 }

diff --git a/internal/dto/result.go b/internal/dto/result.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/insolar/insolar/insolar"
 	"github.com/insolar/insolar/insolar/record"
-	"github.com/insolar/insolar/log"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/insolar/observer/internal/model/raw"
 )

diff --git a/internal/dto/result_payload.go b/internal/dto/result_payload.go
@@ -21,8 +21,8 @@ import (
 	"runtime/debug"
 
 	"github.com/insolar/insolar/insolar"
-	"github.com/insolar/insolar/log"
 	"github.com/insolar/insolar/logicrunner/builtin/foundation"
+	log "github.com/sirupsen/logrus"
 )
 
 func (r *Result) ParsePayload() foundation.Result {

diff --git a/internal/model/beauty/deposit.go b/internal/model/beauty/deposit.go
@@ -27,13 +27,13 @@ type Deposit struct {
 	tableName struct{} `sql:"deposits"`
 
 	EthHash         string `sql:",pk"`
-	DepositRef      string `sql:",notnull"`
-	MemberRef       string `sql:",notnull"`
+	DepositRef      []byte `sql:",notnull"`
+	MemberRef       []byte `sql:",notnull"`
 	TransferDate    int64  `sql:",notnull"`
 	HoldReleaseDate int64  `sql:",notnull"`
 	Amount          string `sql:",notnull"`
 	Balance         string `sql:",notnull"`
-	DepositState    string `sql:",notnull"`
+	DepositState    []byte `sql:",notnull"`
 }
 
 func (d *Deposit) Dump(tx orm.DB, errorCounter prometheus.Counter) error {

diff --git a/internal/model/beauty/deposit_update.go b/internal/model/beauty/deposit_update.go
@@ -22,11 +22,11 @@ import (
 )
 
 type DepositUpdate struct {
-	ID              string
+	ID              []byte
 	HoldReleaseDate int64
 	Amount          string
 	Balance         string
-	PrevState       string
+	PrevState       []byte
 }
 
 func (u *DepositUpdate) Dump(tx orm.DB) error {

diff --git a/internal/model/beauty/member.go b/internal/model/beauty/member.go
@@ -26,11 +26,11 @@ import (
 type Member struct {
 	tableName struct{} `sql:"members"`
 
-	MemberRef        string `sql:",pk"`
+	MemberRef        []byte `sql:",pk"`
 	Balance          string `sql:",notnull"`
 	MigrationAddress string
-	WalletRef        string
-	AccountState     string `sql:",notnull"`
+	WalletRef        []byte
+	AccountState     []byte `sql:",notnull"`
 	Status           string
 }
 

diff --git a/internal/model/beauty/member_update.go b/internal/model/beauty/member_update.go
@@ -22,8 +22,8 @@ import (
 )
 
 type BalanceUpdate struct {
-	ID        string
-	PrevState string
+	ID        []byte
+	PrevState []byte
 	Balance   string
 }
 

diff --git a/internal/model/beauty/transfer.go b/internal/model/beauty/transfer.go
@@ -29,16 +29,16 @@ type Transfer struct {
 	tableName struct{} `sql:"transactions"`
 
 	ID            uint                `sql:",pk_id"`
-	TxID          string              `sql:",notnull"`
+	TxID          []byte              `sql:",notnull"`
 	Amount        string              `sql:",notnull"`
 	Fee           string              `sql:",notnull"`
 	TransferDate  int64               `sql:",notnull"`
 	PulseNum      insolar.PulseNumber `sql:",notnull"`
 	Status        string              `sql:",notnull"`
-	MemberFromRef string              `sql:",notnull"`
-	MemberToRef   string              `sql:",notnull"`
-	WalletFromRef string              `sql:",notnull"`
-	WalletToRef   string              `sql:",notnull"`
+	MemberFromRef []byte              `sql:",notnull"`
+	MemberToRef   []byte              `sql:",notnull"`
+	WalletFromRef []byte              `sql:",notnull"`
+	WalletToRef   []byte              `sql:",notnull"`
 	EthHash       string              `sql:",notnull"`
 }