wasp-cli nonce fix

dessaya · Dec 16, 2021 · e5de5f7 · e5de5f7
1 parent d48e2e3
commit e5de5f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/client/chainclient/chainclient.go b/client/chainclient/chainclient.go
@@ -1,8 +1,6 @@
 package chainclient
 
 import (
-	"time"
-
 	"github.com/iotaledger/goshimmer/packages/ledgerstate"
 	"github.com/iotaledger/hive.go/crypto/ed25519"
 	"github.com/iotaledger/wasp/client"
@@ -23,6 +21,7 @@ type Client struct {
 	WaspClient      *client.WaspClient
 	ChainID         *iscp.ChainID
 	KeyPair         *ed25519.KeyPair
+	nonces          map[ed25519.PublicKey]uint64
 }
 
 // New creates a new chainclient.Client
@@ -37,6 +36,7 @@ func New(
 		WaspClient:      waspClient,
 		ChainID:         chainID,
 		KeyPair:         keyPair,
+		nonces:          make(map[ed25519.PublicKey]uint64),
 	}
 }
 
@@ -79,7 +79,8 @@ func (c *Client) PostOffLedgerRequest(
 		par = params[0]
 	}
 	if par.Nonce == 0 {
-		par.Nonce = uint64(time.Now().UnixNano())
+		c.nonces[c.KeyPair.PublicKey]++
+		par.Nonce = c.nonces[c.KeyPair.PublicKey]
 	}
 	offledgerReq := request.NewOffLedger(c.ChainID, contractHname, entrypoint, par.Args).WithTransfer(par.Transfer)
 	offledgerReq.WithNonce(par.Nonce)

diff --git a/tools/wasp-cli/chain/postrequest.go b/tools/wasp-cli/chain/postrequest.go
@@ -3,6 +3,7 @@ package chain
 import (
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/iotaledger/goshimmer/packages/ledgerstate"
 	"github.com/iotaledger/wasp/client/chainclient"
@@ -34,6 +35,7 @@ func postRequestCmd() *cobra.Command {
 			scClient := SCClient(iscp.Hn(args[0]))
 
 			if offLedger {
+				params.Nonce = uint64(time.Now().UnixNano())
 				util.WithOffLedgerRequest(GetCurrentChainID(), func() (*request.OffLedger, error) {
 					return scClient.PostOffLedgerRequest(fname, params)
 				})