standardize updateIsApiEnabled API

cmd/cli/main.go

@@ -220,6 +220,7 @@ func updateActive(logger *zap.Logger, options *CLI) {
 	logger.Info(
 		"successfully updated node active",
 		zap.Uint32("node-id", uint32(options.UpdateActive.NodeId)),
+		zap.Bool("is-active", options.UpdateActive.IsActive),
 	)
 }
 
@@ -252,13 +253,15 @@ func updateApiEnabled(logger *zap.Logger, options *CLI) {
 	err = registryAdmin.UpdateIsApiEnabled(
 		ctx,
 		uint32(options.UpdateApiEnabled.NodeId),
+		options.UpdateApiEnabled.IsApiEnabled,
 	)
 	if err != nil {
 		logger.Fatal("could not update node api enabled", zap.Error(err))
 	}
 	logger.Info(
 		"successfully updated node api enabled",
 		zap.Uint32("node-id", uint32(options.UpdateApiEnabled.NodeId)),
+		zap.Bool("is-api-enabled", options.UpdateApiEnabled.IsApiEnabled),
 	)
 }
 
@@ -299,6 +302,7 @@ func updateReplicationEnabled(logger *zap.Logger, options *CLI) {
 	logger.Info(
 		"successfully updated node replication enabled",
 		zap.Uint32("node-id", uint32(options.UpdateReplicationEnabled.NodeId)),
+		zap.Bool("is-replication-enabled", options.UpdateReplicationEnabled.IsReplicationEnabled),
 	)
 }
 

contracts/src/Nodes.sol

@@ -118,11 +118,11 @@ contract Nodes is AccessControlDefaultAdminRules, ERC721, INodes {
     }
 
     /// @inheritdoc INodes
-    function updateIsApiEnabled(uint256 nodeId) external {
+    function updateIsApiEnabled(uint256 nodeId, bool isApiEnabled) external {
         require(_ownerOf(nodeId) == msg.sender, Unauthorized());
-        _nodes[nodeId].isApiEnabled = !_nodes[nodeId].isApiEnabled;
+        _nodes[nodeId].isApiEnabled = isApiEnabled;
 
-        if (!_nodes[nodeId].isApiEnabled && _nodes[nodeId].isActive) {
+        if (!isApiEnabled && _nodes[nodeId].isActive) {
             _deactivateNode(nodeId);
         }
 

contracts/src/interfaces/INodes.sol

@@ -220,7 +220,8 @@ interface INodes is IERC721 {
     /// @notice Toggles the API enabled flag for the node owned by the caller.
     /// @dev Only the owner of the node NFT may call this.
     /// @param nodeId The unique identifier of the node.
-    function updateIsApiEnabled(uint256 nodeId) external;
+    /// @param isApiEnabled The new API enabled flag.
+    function updateIsApiEnabled(uint256 nodeId, bool isApiEnabled) external;
 
     // ***************************************************************
     // *                     GETTER FUNCTIONS                      *

contracts/test/Nodes.sol

@@ -412,7 +412,7 @@ contract NodesTest is Test, Utils {
         _addNode();
         nodes.updateIsReplicationEnabled(nodeId, true);
         vm.prank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
         vm.expectEmit(address(nodes));
         emit INodes.NodeActivateUpdated(nodeId, true);
         nodes.updateActive(nodeId, true);
@@ -468,7 +468,7 @@ contract NodesTest is Test, Utils {
         _addNode();
         nodes.updateIsReplicationEnabled(nodeId, true);
         vm.prank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
 
         nodes.updateActive(nodeId, true);
         vm.recordLogs();
@@ -585,7 +585,7 @@ contract NodesTest is Test, Utils {
         _addNode();
         nodes.updateIsReplicationEnabled(nodeId, true);
         vm.prank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
 
         nodes.updateMaxActiveNodes(1);
         nodes.updateActive(nodeId, true);
@@ -676,11 +676,10 @@ contract NodesTest is Test, Utils {
         vm.expectEmit(address(nodes));
         emit INodes.ApiEnabledUpdated(nodeId, true);
         vm.startPrank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
         assertEq(nodes.getNode(nodeId).isApiEnabled, true);
 
-        /// @dev Toggle again
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, false);
         assertEq(nodes.getNode(nodeId).isApiEnabled, false);
         vm.stopPrank();
     }
@@ -690,7 +689,7 @@ contract NodesTest is Test, Utils {
         vm.recordLogs();
         vm.expectRevert(INodes.Unauthorized.selector);
         /// @dev Default user is admin
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
         _checkNoLogsEmitted();
     }
 
@@ -770,7 +769,7 @@ contract NodesTest is Test, Utils {
         _addNode();
         nodes.updateIsReplicationEnabled(nodeId, true);
         vm.prank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
         nodes.updateActive(nodeId, true);
         vm.assertEq(nodes.getActiveNodesCount(), 1);
 
@@ -800,7 +799,7 @@ contract NodesTest is Test, Utils {
         _addNode();
         nodes.updateIsReplicationEnabled(nodeId, true);
         vm.prank(nodeOperator);
-        nodes.updateIsApiEnabled(nodeId);
+        nodes.updateIsApiEnabled(nodeId, true);
 
         nodes.updateActive(nodeId, true);
         vm.assertEq(nodes.getNodeIsActive(nodeId), true);
@@ -866,7 +865,7 @@ contract NodesTest is Test, Utils {
         for (uint256 i = 0; i < nodeIds.length; i++) {
             nodes.updateIsReplicationEnabled(nodeIds[i], true);
             vm.prank(operators[i]);
-            nodes.updateIsApiEnabled(nodeIds[i]);
+            nodes.updateIsApiEnabled(nodeIds[i], true);
         }
     }
 

dev/register-local-node

@@ -19,7 +19,8 @@ NODE_ID=$(echo $ADD_NODE_RESPONSE | jq -r '."node-id"')
 
 dev/cli update-api-enabled \
     --node-id=$NODE_ID \
-    --operator-private-key=$OPERATOR_PRIVATE_KEY
+    --operator-private-key=$OPERATOR_PRIVATE_KEY \
+    --enable
 
 dev/cli update-replication-enabled \
     --node-id=$NODE_ID \
@@ -31,4 +32,4 @@ dev/cli update-active \
     --admin-private-key=$PRIVATE_KEY \
     --activate
 
-echo -e "\033[32m✔\033[0m Node $NODE_ID registered and activated"
+echo -e "\033[32m✔\033[0m Node $NODE_ID registered and activated\n"

dev/register-local-node-2

@@ -20,7 +20,8 @@ NODE_ID=$(echo $ADD_NODE_RESPONSE | jq -r '."node-id"')
 
 dev/cli update-api-enabled \
     --node-id=$NODE_ID \
-    --operator-private-key=$OPERATOR_PRIVATE_KEY
+    --operator-private-key=$OPERATOR_PRIVATE_KEY \
+    --enable
 
 dev/cli update-replication-enabled \
     --node-id=$NODE_ID \
@@ -32,4 +33,4 @@ dev/cli update-active \
     --admin-private-key=$PRIVATE_KEY \
     --activate
 
-echo -e "\033[32m✔\033[0m Node $NODE_ID registered and activated"
+echo -e "\033[32m✔\033[0m Node $NODE_ID registered and activated\n"

pkg/blockchain/interface.go

@@ -50,6 +50,7 @@ type NodeRegistry interface {
 	UpdateIsApiEnabled(
 		ctx context.Context,
 		nodeId uint32,
+		isApiEnabled bool,
 	) error
 	UpdateIsReplicationEnabled(
 		ctx context.Context,

pkg/blockchain/registryAdmin.go

@@ -141,6 +141,7 @@ func (n *NodeRegistryAdmin) UpdateActive(
 func (n *NodeRegistryAdmin) UpdateIsApiEnabled(
 	ctx context.Context,
 	nodeId uint32,
+	isApiEnabled bool,
 ) error {
 	if n.signer == nil {
 		return fmt.Errorf("no signer provided")
@@ -150,7 +151,7 @@ func (n *NodeRegistryAdmin) UpdateIsApiEnabled(
 		Context: ctx,
 		From:    n.signer.FromAddress(),
 		Signer:  n.signer.SignerFunc(),
-	}, big.NewInt(int64(nodeId)))
+	}, big.NewInt(int64(nodeId)), isApiEnabled)
 
 	if err != nil {
 		return err

pkg/blockchain/registryAdmin_test.go

@@ -139,7 +139,7 @@ func TestUpdateIsApiEnabled(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	err = registry.UpdateIsApiEnabled(ctx, nodeId)
+	err = registry.UpdateIsApiEnabled(ctx, nodeId, true)
 	require.NoError(t, err)
 }
 
@@ -150,7 +150,7 @@ func TestUpdateIsApiEnabledUnauthorized(t *testing.T) {
 	nodeId, _, err := addRandomNode(t, ctx, registry)
 	require.NoError(t, err)
 
-	err = registry.UpdateIsApiEnabled(ctx, nodeId)
+	err = registry.UpdateIsApiEnabled(ctx, nodeId, true)
 
 	// 0x82b42900 is the signature of Unauthorized() error
 	require.Equal(t, err.Error(), "execution reverted: custom error 0x82b42900")
@@ -160,7 +160,7 @@ func TestUpdateIsApiEnabledBadNodeId(t *testing.T) {
 	registry, _, ctx, cleanup := buildRegistry(t)
 	defer cleanup()
 
-	err := registry.UpdateIsApiEnabled(ctx, 1)
+	err := registry.UpdateIsApiEnabled(ctx, 1, true)
 	require.Equal(t, err.Error(), "execution reverted: custom error 0x82b42900")
 }
 
@@ -190,7 +190,7 @@ func TestUpdateActive(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	err = registry.UpdateIsApiEnabled(ctx, nodeId)
+	err = registry.UpdateIsApiEnabled(ctx, nodeId, true)
 	require.NoError(t, err)
 
 	err = registry.UpdateIsReplicationEnabled(ctx, nodeId, true)

pkg/config/cliOptions.go

@@ -41,6 +41,7 @@ type UpdateActiveOptions struct {
 type UpdateApiEnabledOptions struct {
 	NodeId             int64  `long:"node-id"              description:"NodeId to update"`
 	OperatorPrivateKey string `long:"operator-private-key" description:"Private key of the operator to update the node" required:"true"`
+	IsApiEnabled       bool   `long:"enable"               description:"Whether the node is api enabled"`
 }
 
 type UpdateReplicationEnabledOptions struct {