Use CreateActionID to give simulated actions unique actionID (#1644)

ava-labs · Oct 10, 2024 · 725a589 · 725a589
1 parent 0a2d991
commit 725a589
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/api/jsonrpc/client.go b/api/jsonrpc/client.go
@@ -194,8 +194,8 @@ func (cli *JSONRPCClient) GetABI(ctx context.Context) (abi.ABI, error) {
 	return resp.ABI, err
 }
 
-func (cli *JSONRPCClient) Execute(ctx context.Context, actor codec.Address, actions []chain.Action) ([][]byte, error) {
-	actionsMarshaled := make([][]byte, 0)
+func (cli *JSONRPCClient) ExecuteActions(ctx context.Context, actor codec.Address, actions []chain.Action) ([][]byte, error) {
+	actionsMarshaled := make([][]byte, 0, len(actions))
 	for _, action := range actions {
 		actionBytes, err := chain.MarshalTyped(action)
 		if err != nil {
@@ -212,7 +212,7 @@ func (cli *JSONRPCClient) Execute(ctx context.Context, actor codec.Address, acti
 	resp := new(ExecuteActionReply)
 	err := cli.requester.SendRequest(
 		ctx,
-		"execute",
+		"executeActions",
 		args,
 		resp,
 	)

diff --git a/api/jsonrpc/server.go b/api/jsonrpc/server.go
@@ -26,6 +26,8 @@ const (
 	Endpoint = "/coreapi"
 )
 
+var errNoActionsToExecute = errors.New("no actions to execute")
+
 var _ api.HandlerFactory[api.VM] = (*JSONRPCServerFactory)(nil)
 
 var (
@@ -171,7 +173,7 @@ type ExecuteActionReply struct {
 	Error   string   `json:"error"`
 }
 
-func (j *JSONRPCServer) Execute(
+func (j *JSONRPCServer) ExecuteActions(
 	req *http.Request,
 	args *ExecuteActionArgs,
 	reply *ExecuteActionReply,
@@ -180,7 +182,13 @@ func (j *JSONRPCServer) Execute(
 	defer span.End()
 
 	actionCodec := j.vm.ActionCodec()
-	actions := make([]chain.Action, 0)
+	if len(args.Actions) == 0 {
+		return errNoActionsToExecute
+	}
+	if maxActionsPerTx := int(j.vm.Rules(time.Now().Unix()).GetMaxActionsPerTx()); len(args.Actions) > maxActionsPerTx {
+		return fmt.Errorf("exceeded max actions per simulation: %d", maxActionsPerTx)
+	}
+	actions := make([]chain.Action, 0, len(args.Actions))
 	for _, action := range args.Actions {
 		action, err := actionCodec.Unmarshal(codec.NewReader(action, len(action)))
 		if err != nil {
@@ -194,12 +202,12 @@ func (j *JSONRPCServer) Execute(
 	storage := make(map[string][]byte)
 	ts := tstate.New(1)
 
-	for _, action := range actions {
+	for actionIndex, action := range actions {
 		// Get expected state keys
 		stateKeysWithPermissions := action.StateKeys(args.Actor)
 
 		// flatten the map to a slice of keys
-		storageKeysToRead := make([][]byte, 0)
+		storageKeysToRead := make([][]byte, 0, len(stateKeysWithPermissions))
 		for key := range stateKeysWithPermissions {
 			storageKeysToRead = append(storageKeysToRead, []byte(key))
 		}
@@ -225,7 +233,7 @@ func (j *JSONRPCServer) Execute(
 			tsv,
 			now,
 			args.Actor,
-			ids.Empty,
+			chain.CreateActionID(ids.Empty, uint8(actionIndex)),
 		)
 		if err != nil {
 			reply.Error = fmt.Sprintf("failed to execute action: %s", err)