Merge pull request #71 from vegaprotocol/65-submit-transaction-v2

Switch to SubmitTransactionV2 (#65)

bot/bot.go

@@ -27,7 +27,7 @@ type PricingEngine interface {
 }
 
 // New returns a new Bot instance.
-func New(config config.BotConfig, pe PricingEngine, ws wallet.WalletHandler) (b Bot, err error) {
+func New(config config.BotConfig, pe PricingEngine, ws *wallet.Handler) (b Bot, err error) {
 	switch config.Strategy {
 	case "normal":
 		b, err = normal.New(config, pe, ws)

bot/normal/datarequests.go

@@ -53,7 +53,7 @@ func (b *Bot) lookupInitialValues() error {
 func (b *Bot) getAccountGeneral() error {
 	response, err := b.node.PartyAccounts(&api.PartyAccountsRequest{
 		// MarketId: general account is not per market
-		PartyId: b.walletPubKeyHex,
+		PartyId: b.walletPubKey,
 		Asset:   b.settlementAssetID,
 		Type:    proto.AccountType_ACCOUNT_TYPE_GENERAL,
 	})
@@ -73,7 +73,7 @@ func (b *Bot) getAccountGeneral() error {
 // getAccountMargin get this bot's margin account balance.
 func (b *Bot) getAccountMargin() error {
 	response, err := b.node.PartyAccounts(&api.PartyAccountsRequest{
-		PartyId:  b.walletPubKeyHex,
+		PartyId:  b.walletPubKey,
 		MarketId: b.market.Id,
 		Asset:    b.settlementAssetID,
 		Type:     proto.AccountType_ACCOUNT_TYPE_MARGIN,
@@ -95,7 +95,7 @@ func (b *Bot) getAccountMargin() error {
 func (b *Bot) getAccountBond() error {
 	b.balanceBond = 0
 	response, err := b.node.PartyAccounts(&api.PartyAccountsRequest{
-		PartyId:  b.walletPubKeyHex,
+		PartyId:  b.walletPubKey,
 		MarketId: b.market.Id,
 		Asset:    b.settlementAssetID,
 		Type:     proto.AccountType_ACCOUNT_TYPE_BOND,
@@ -116,7 +116,7 @@ func (b *Bot) getAccountBond() error {
 // getPositions get this bot's positions.
 func (b *Bot) getPositions() ([]*proto.Position, error) {
 	response, err := b.node.PositionsByParty(&api.PositionsByPartyRequest{
-		PartyId:  b.walletPubKeyHex,
+		PartyId:  b.walletPubKey,
 		MarketId: b.market.Id,
 	})
 	if err != nil {

bot/normal/helpers.go

@@ -1,8 +1,6 @@
 package normal
 
 import (
-	"encoding/hex"
-	"fmt"
 	"math"
 	"time"
 
@@ -13,18 +11,6 @@ import (
 	"gonum.org/v1/gonum/stat/distuv"
 )
 
-func hexToRaw(hexBytes []byte) ([]byte, error) {
-	raw := make([]byte, hex.DecodedLen(len(hexBytes)))
-	n, err := hex.Decode(raw, hexBytes)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to decode hex")
-	}
-	if n != len(raw) {
-		return nil, fmt.Errorf("failed to decode hex: decoded %d bytes, expected to decode %d bytes", n, len(raw))
-	}
-	return raw, nil
-}
-
 func max(a, b uint64) uint64 {
 	if a > b {
 		return a