From 8d2e9b68bfd823e68256c773deb7a72281075d1e Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Fri, 24 Jul 2020 16:30:38 +0300
Subject: [PATCH 1/2] docker: fix privnet node config and compose file

---
 .docker/docker-compose.yml                | 2 +-
 config/protocol.privnet.docker.single.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 82b5e8f98..8102ef9a3 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -79,7 +79,7 @@ services:
     command: "node --config-path /config --privnet"
     volumes:
       - ../config/protocol.privnet.docker.single.yml:/config/protocol.privnet.yml
-      - ./wallets/wallet1.json:/wallet1.json
+      - ./wallets/wallet1_solo.json:/wallet1.json
       - volume_chain:/chains
     networks:
       neo_go_network:
diff --git a/config/protocol.privnet.docker.single.yml b/config/protocol.privnet.docker.single.yml
index ed03d2dca..e836404fb 100644
--- a/config/protocol.privnet.docker.single.yml
+++ b/config/protocol.privnet.docker.single.yml
@@ -39,6 +39,7 @@ ApplicationConfiguration:
   RPC:
     Enabled: true
     EnableCORSWorkaround: false
+    MaxGasInvoke: 10
     Port: 30333
   Prometheus:
     Enabled: true

From e013477bc9500e34657178e1466f52ed18224e0b Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Fri, 24 Jul 2020 16:34:46 +0300
Subject: [PATCH 2/2] rpc,cli: support multitransfer transactions

Allow to transfer single asset to multiple recepients
in a single transaction. It is currently a separate command in CLI
and can be merged in future.
---
 cli/wallet/nep5.go     | 110 ++++++++++++++++++++++++++++++++++++-----
 pkg/rpc/client/nep5.go |  38 ++++++++++++--
 2 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/cli/wallet/nep5.go b/cli/wallet/nep5.go
index da9f9c3c2..67c3d0c11 100644
--- a/cli/wallet/nep5.go
+++ b/cli/wallet/nep5.go
@@ -25,17 +25,25 @@ var (
 	gasToken = wallet.NewToken(client.GasContractHash, "GAS", "gas", 8)
 )
 
+var (
+	tokenFlag = cli.StringFlag{
+		Name:  "token",
+		Usage: "Token to use",
+	}
+	gasFlag = flags.Fixed8Flag{
+		Name:  "gas",
+		Usage: "Amount of GAS to attach to a tx",
+	}
+)
+
 func newNEP5Commands() []cli.Command {
 	balanceFlags := []cli.Flag{
 		walletPathFlag,
+		tokenFlag,
 		cli.StringFlag{
 			Name:  "addr",
 			Usage: "Address to use",
 		},
-		cli.StringFlag{
-			Name:  "token",
-			Usage: "Token to use",
-		},
 	}
 	balanceFlags = append(balanceFlags, options.RPC...)
 	importFlags := []cli.Flag{
@@ -51,20 +59,22 @@ func newNEP5Commands() []cli.Command {
 		outFlag,
 		fromAddrFlag,
 		toAddrFlag,
-		cli.StringFlag{
-			Name:  "token",
-			Usage: "Token to use",
-		},
+		tokenFlag,
+		gasFlag,
 		cli.StringFlag{
 			Name:  "amount",
 			Usage: "Amount of asset to send",
 		},
-		flags.Fixed8Flag{
-			Name:  "gas",
-			Usage: "Amount of GAS to attach to a tx",
-		},
 	}
 	transferFlags = append(transferFlags, options.RPC...)
+	multiTransferFlags := []cli.Flag{
+		walletPathFlag,
+		outFlag,
+		fromAddrFlag,
+		tokenFlag,
+		gasFlag,
+	}
+	multiTransferFlags = append(multiTransferFlags, options.RPC...)
 	return []cli.Command{
 		{
 			Name:      "balance",
@@ -114,6 +124,14 @@ func newNEP5Commands() []cli.Command {
 			Action:    transferNEP5,
 			Flags:     transferFlags,
 		},
+		{
+			Name:  "multitransfer",
+			Usage: "transfer NEP5 tokens to multiple recepients",
+			UsageText: `multitransfer --wallet <path> --rpc-endpoint <node> --timeout <time> --from <addr>` +
+				` --token <hash> <addr1>:<amount1> [<addr2>:<amount2> [...]]`,
+			Action: multiTransferNEP5,
+			Flags:  multiTransferFlags,
+		},
 	}
 }
 
@@ -317,6 +335,64 @@ func removeNEP5Token(ctx *cli.Context) error {
 	return nil
 }
 
+func multiTransferNEP5(ctx *cli.Context) error {
+	wall, err := openWallet(ctx.String("wallet"))
+	if err != nil {
+		return cli.NewExitError(err, 1)
+	}
+	defer wall.Close()
+
+	fromFlag := ctx.Generic("from").(*flags.Address)
+	from := fromFlag.Uint160()
+	acc := wall.GetAccount(from)
+	if acc == nil {
+		return cli.NewExitError(fmt.Errorf("can't find account for the address: %s", fromFlag), 1)
+	}
+
+	gctx, cancel := options.GetTimeoutContext(ctx)
+	defer cancel()
+
+	c, err := options.GetRPCClient(gctx, ctx)
+	if err != nil {
+		return err
+	}
+
+	token, err := getMatchingToken(wall, ctx.String("token"))
+	if err != nil {
+		fmt.Println("Can't find matching token in the wallet. Querying RPC-node for balances.")
+		token, err = getMatchingTokenRPC(c, from, ctx.String("token"))
+		if err != nil {
+			return cli.NewExitError(err, 1)
+		}
+	}
+
+	if ctx.NArg() == 0 {
+		return cli.NewExitError("empty recepients list", 1)
+	}
+	var recepients []client.AddrAndAmount
+	for i := 0; i < ctx.NArg(); i++ {
+		arg := ctx.Args().Get(i)
+		ss := strings.SplitN(arg, ":", 2)
+		if len(ss) != 2 {
+			return cli.NewExitError("invalid recepient format", 1)
+		}
+		addr, err := address.StringToUint160(ss[0])
+		if err != nil {
+			return cli.NewExitError(fmt.Errorf("invalid address: '%s'", ss[0]), 1)
+		}
+		amount, err := util.FixedNFromString(ss[1], int(token.Decimals))
+		if err != nil {
+			return cli.NewExitError(fmt.Errorf("invalid amount: %v", err), 1)
+		}
+		recepients = append(recepients, client.AddrAndAmount{
+			Address: addr,
+			Amount:  amount,
+		})
+	}
+
+	return signAndSendTransfer(ctx, c, acc, token, recepients)
+}
+
 func transferNEP5(ctx *cli.Context) error {
 	wall, err := openWallet(ctx.String("wallet"))
 	if err != nil {
@@ -355,6 +431,14 @@ func transferNEP5(ctx *cli.Context) error {
 		return cli.NewExitError(fmt.Errorf("invalid amount: %v", err), 1)
 	}
 
+	return signAndSendTransfer(ctx, c, acc, token, []client.AddrAndAmount{{
+		Address: to,
+		Amount:  amount,
+	}})
+}
+
+func signAndSendTransfer(ctx *cli.Context, c *client.Client, acc *wallet.Account, token *wallet.Token,
+	recepients []client.AddrAndAmount) error {
 	gas := flags.Fixed8FromContext(ctx, "gas")
 
 	if pass, err := readPassword("Password > "); err != nil {
@@ -363,7 +447,7 @@ func transferNEP5(ctx *cli.Context) error {
 		return cli.NewExitError(err, 1)
 	}
 
-	tx, err := c.CreateNEP5TransferTx(acc, to, token.Hash, amount, int64(gas))
+	tx, err := c.CreateNEP5MultiTransferTx(acc, token.Hash, int64(gas), recepients...)
 	if err != nil {
 		return cli.NewExitError(err, 1)
 	}
diff --git a/pkg/rpc/client/nep5.go b/pkg/rpc/client/nep5.go
index 1d7d6de3c..4d99b313d 100644
--- a/pkg/rpc/client/nep5.go
+++ b/pkg/rpc/client/nep5.go
@@ -15,6 +15,12 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/wallet"
 )
 
+// AddrAndAmount represents target address and token amount for transfer.
+type AddrAndAmount struct {
+	Address util.Uint160
+	Amount  int64
+}
+
 var (
 	// NeoContractHash is a hash of the NEO native contract.
 	NeoContractHash, _ = util.Uint160DecodeStringLE("9bde8f209c88dd0e7ca3bf0af0f476cdd8207789")
@@ -104,15 +110,25 @@ func (c *Client) NEP5TokenInfo(tokenHash util.Uint160) (*wallet.Token, error) {
 // (in FixedN format using contract's number of decimals) to given account and
 // returns it. The returned transaction is not signed.
 func (c *Client) CreateNEP5TransferTx(acc *wallet.Account, to util.Uint160, token util.Uint160, amount int64, gas int64) (*transaction.Transaction, error) {
+	return c.CreateNEP5MultiTransferTx(acc, token, gas, AddrAndAmount{
+		Address: to,
+		Amount:  amount,
+	})
+}
+
+// CreateNEP5MultiTransferTx creates an invocation transaction for performing NEP5 transfers
+// from a single sender to multiple recepients.
+func (c *Client) CreateNEP5MultiTransferTx(acc *wallet.Account, token util.Uint160, gas int64, recepients ...AddrAndAmount) (*transaction.Transaction, error) {
 	from, err := address.StringToUint160(acc.Address)
 	if err != nil {
 		return nil, fmt.Errorf("bad account address: %v", err)
 	}
-	// Note: we don't use invoke function here because it requires
-	// 2 round trips instead of one.
 	w := io.NewBufBinWriter()
-	emit.AppCallWithOperationAndArgs(w.BinWriter, token, "transfer", from, to, amount)
-	emit.Opcode(w.BinWriter, opcode.ASSERT)
+	for i := range recepients {
+		emit.AppCallWithOperationAndArgs(w.BinWriter, token, "transfer", from,
+			recepients[i].Address, recepients[i].Amount)
+		emit.Opcode(w.BinWriter, opcode.ASSERT)
+	}
 
 	script := w.Bytes()
 	result, err := c.InvokeScript(script, []transaction.Cosigner{
@@ -162,6 +178,20 @@ func (c *Client) TransferNEP5(acc *wallet.Account, to util.Uint160, token util.U
 	return c.SendRawTransaction(tx)
 }
 
+// MultiTransferNEP5 is similar to TransferNEP5, buf allows to have multiple recepients.
+func (c *Client) MultiTransferNEP5(acc *wallet.Account, token util.Uint160, gas int64, recepients ...AddrAndAmount) (util.Uint256, error) {
+	tx, err := c.CreateNEP5MultiTransferTx(acc, token, gas, recepients...)
+	if err != nil {
+		return util.Uint256{}, err
+	}
+
+	if err := acc.SignTx(tx); err != nil {
+		return util.Uint256{}, fmt.Errorf("can't sign tx: %v", err)
+	}
+
+	return c.SendRawTransaction(tx)
+}
+
 func topIntFromStack(st []smartcontract.Parameter) (int64, error) {
 	index := len(st) - 1 // top stack element is last in the array
 	var decimals int64