EVM-720 Implement json output for all commands

command/json_output.go

@@ -29,7 +29,7 @@ func (jo *jsonOutput) WriteOutput() {
 
 // WriteCommandResult implements OutputFormatter interface
 func (jo *jsonOutput) WriteCommandResult(result CommandResult) {
-	_, _ = fmt.Fprintln(os.Stdout, result.GetOutput())
+	_, _ = fmt.Fprintln(os.Stdout, marshalJSONToString(result))
 }
 
 // WriteOutput implements OutputFormatter plus io.Writer interfaces

command/rootchain/deploy/deploy.go

@@ -337,7 +337,7 @@ func runCommand(cmd *cobra.Command, _ []string) {
 		}
 	}
 
-	rootchainCfg, supernetID, err := deployContracts(outputter, client,
+	rootchainCfg, supernetID, commandResults, err := deployContracts(outputter, client,
 		chainConfig.Params.ChainID, consensusCfg.InitialValidatorSet, cmd.Context())
 	if err != nil {
 		outputter.SetError(fmt.Errorf("failed to deploy rootchain contracts: %w", err))
@@ -378,31 +378,33 @@ func runCommand(cmd *cobra.Command, _ []string) {
 		return
 	}
 
-	outputter.SetCommandResult(&helper.MessageResult{
+	outputter.WriteCommandResult(&helper.MessageResult{
 		Message: fmt.Sprintf("%s finished. All contracts are successfully deployed and initialized.",
 			contractsDeploymentTitle),
 	})
+	outputter.SetCommandResult(command.Results(commandResults))
 }
 
 // deployContracts deploys and initializes rootchain smart contracts
 func deployContracts(outputter command.OutputFormatter, client *jsonrpc.Client, chainID int64,
-	initialValidators []*validator.GenesisValidator, cmdCtx context.Context) (*polybft.RootchainConfig, int64, error) {
+	initialValidators []*validator.GenesisValidator, cmdCtx context.Context) (
+	*polybft.RootchainConfig, int64, []command.CommandResult, error) {
 	txRelayer, err := txrelayer.NewTxRelayer(txrelayer.WithClient(client), txrelayer.WithWriter(outputter))
 	if err != nil {
-		return nil, 0, fmt.Errorf("failed to initialize tx relayer: %w", err)
+		return nil, 0, nil, fmt.Errorf("failed to initialize tx relayer: %w", err)
 	}
 
 	deployerKey, err := helper.DecodePrivateKey(params.deployerKey)
 	if err != nil {
-		return nil, 0, fmt.Errorf("failed to initialize deployer key: %w", err)
+		return nil, 0, nil, fmt.Errorf("failed to initialize deployer key: %w", err)
 	}
 
 	if params.isTestMode {
 		deployerAddr := deployerKey.Address()
 		txn := &ethgo.Transaction{To: &deployerAddr, Value: ethgo.Ether(1)}
 
 		if _, err = txRelayer.SendTransactionLocal(txn); err != nil {
-			return nil, 0, err
+			return nil, 0, nil, err
 		}
 	}
 
@@ -425,7 +427,7 @@ func deployContracts(outputter command.OutputFormatter, client *jsonrpc.Client,
 			// use existing root chain ERC20 token
 			if err := populateExistingTokenAddr(client.Eth(),
 				params.rootERC20TokenAddr, rootERC20Name, rootchainConfig); err != nil {
-				return nil, 0, err
+				return nil, 0, nil, err
 			}
 		} else {
 			// deploy MockERC20 as a root chain root native token
@@ -501,6 +503,7 @@ func deployContracts(outputter command.OutputFormatter, client *jsonrpc.Client,
 
 	g, ctx := errgroup.WithContext(cmdCtx)
 	results := make([]*deployContractResult, len(allContracts))
+	commandResults := make([]command.CommandResult, len(allContracts))
 
 	for i, contract := range allContracts {
 		i := i
@@ -546,18 +549,18 @@ func deployContracts(outputter command.OutputFormatter, client *jsonrpc.Client,
 			}
 		}
 
-		return nil, 0, err
+		return nil, 0, nil, err
 	}
 
-	for _, result := range results {
+	for i, result := range results {
 		populatorFn, ok := metadataPopulatorMap[result.Name]
 		if !ok {
-			return nil, 0, fmt.Errorf("rootchain metadata populator not registered for contract '%s'", result.Name)
+			return nil, 0, nil, fmt.Errorf("rootchain metadata populator not registered for contract '%s'", result.Name)
 		}
 
 		populatorFn(rootchainConfig, result.Address)
 
-		outputter.WriteCommandResult(result)
+		commandResults[i] = result
 	}
 
 	g, ctx = errgroup.WithContext(cmdCtx)
@@ -581,16 +584,16 @@ func deployContracts(outputter command.OutputFormatter, client *jsonrpc.Client,
 	}
 
 	if err := g.Wait(); err != nil {
-		return nil, 0, err
+		return nil, 0, nil, err
 	}
 
 	// register supernets manager on stake manager
 	supernetID, err := registerChainOnStakeManager(txRelayer, rootchainConfig, deployerKey)
 	if err != nil {
-		return nil, 0, err
+		return nil, 0, nil, err
 	}
 
-	return rootchainConfig, supernetID, nil
+	return rootchainConfig, supernetID, commandResults, nil
 }
 
 // populateExistingTokenAddr checks whether given token is deployed on the provided address.

command/rootchain/deploy/deploy_test.go

@@ -60,7 +60,7 @@ func TestDeployContracts_NoPanics(t *testing.T) {
 	}
 
 	require.NotPanics(t, func() {
-		_, _, err = deployContracts(outputter, client, 1, []*validator.GenesisValidator{}, context.Background())
+		_, _, _, err = deployContracts(outputter, client, 1, []*validator.GenesisValidator{}, context.Background())
 	})
 	require.NoError(t, err)
 }

consensus/polybft/system_state.go

@@ -13,11 +13,11 @@ import (
 // ValidatorInfo is data transfer object which holds validator information,
 // provided by smart contract
 type ValidatorInfo struct {
-	Address             ethgo.Address
-	Stake               *big.Int
-	WithdrawableRewards *big.Int
-	IsActive            bool
-	IsWhitelisted       bool
+	Address             ethgo.Address `json:"address"`
+	Stake               *big.Int      `json:"stake"`
+	WithdrawableRewards *big.Int      `json:"withdrawableRewards"`
+	IsActive            bool          `json:"isActive"`
+	IsWhitelisted       bool          `json:"isWhitelisted"`
 }
 
 // SystemState is an interface to interact with the consensus system contracts in the chain