fix(solana): be consistent with json manipulation

Signed-off-by: Guilherme Felipe da Silva <[email protected]>

Author: frenzox

solana/cli/src/gas_service.rs

@@ -1,7 +1,14 @@
 use clap::{Parser, Subcommand};
 use solana_sdk::{instruction::Instruction, pubkey::Pubkey};
 
-use crate::config::Config;
+use crate::{
+    config::Config,
+    types::ChainNameOnAxelar,
+    utils::{
+        read_json_file_from_path, write_json_to_file_path, ADDRESS_KEY, CHAINS_KEY,
+        CONFIG_ACCOUNT_KEY, CONTRACTS_KEY, GAS_SERVICE_KEY,
+    },
+};
 
 #[derive(Subcommand, Debug)]
 pub(crate) enum Commands {
@@ -21,19 +28,32 @@ pub(crate) struct InitArgs {
 pub(crate) async fn build_instruction(
     fee_payer: &Pubkey,
     command: Commands,
-    _config: &Config,
+    config: &Config,
 ) -> eyre::Result<Instruction> {
     match command {
-        Commands::Init(init_args) => init(fee_payer, init_args).await,
+        Commands::Init(init_args) => init(fee_payer, init_args, config).await,
     }
 }
 
-async fn init(fee_payer: &Pubkey, init_args: InitArgs) -> eyre::Result<Instruction> {
+async fn init(
+    fee_payer: &Pubkey,
+    init_args: InitArgs,
+    config: &Config,
+) -> eyre::Result<Instruction> {
     let program_id = axelar_solana_gas_service::id();
     let salt_hash = solana_sdk::keccak::hashv(&[init_args.salt.as_bytes()]).0;
     let (config_pda, _bump) =
         axelar_solana_gas_service::get_config_pda(&program_id, &salt_hash, &init_args.authority);
 
+    let mut chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
+    chains_info[CHAINS_KEY][ChainNameOnAxelar::from(config.network_type).0][CONTRACTS_KEY]
+        [GAS_SERVICE_KEY] = serde_json::json!({
+        ADDRESS_KEY: axelar_solana_gateway::id().to_string(),
+        CONFIG_ACCOUNT_KEY: config_pda.to_string(),
+    });
+
+    write_json_to_file_path(&chains_info, &config.chains_info_file)?;
+
     Ok(axelar_solana_gas_service::instructions::init_config(
         &program_id,
         fee_payer,

solana/cli/src/gateway.rs

@@ -16,7 +16,8 @@ use crate::config::Config;
 use crate::types::ChainNameOnAxelar;
 use crate::utils::{
     read_json_file_from_path, write_json_to_file_path, ADDRESS_KEY, AXELAR_KEY, CHAINS_KEY,
-    CONTRACTS_KEY, DOMAIN_SEPARATOR_KEY, GATEWAY_KEY, GRPC_KEY, MULTISIG_PROVER_KEY,
+    CONTRACTS_KEY, DOMAIN_SEPARATOR_KEY, GATEWAY_KEY, GRPC_KEY, MINIMUM_ROTATION_DELAY_KEY,
+    MULTISIG_PROVER_KEY, OPERATOR_KEY, PREVIOUS_SIGNERS_RETENTION_KEY, UPGRADE_AUTHORITY_KEY,
 };
 
 #[derive(Subcommand, Debug)]
@@ -187,12 +188,12 @@ async fn init(
 
     chains_info[CHAINS_KEY][ChainNameOnAxelar::from(config.network_type).0][CONTRACTS_KEY]
         [GATEWAY_KEY] = json!({
-        "address": bs58::encode(axelar_solana_gateway::id()).into_string(),
-        "deployer": fee_payer,
-        "operator": init_args.operator,
-        "minimumRotationDelay": init_args.minimum_rotation_delay,
-        "previousSignersRetention": init_args.previous_signers_retention,
-        "domainSeparator": domain_separator,
+        ADDRESS_KEY: axelar_solana_gateway::id().to_string(),
+        UPGRADE_AUTHORITY_KEY: fee_payer.to_string(),
+        OPERATOR_KEY: init_args.operator.to_string(),
+        MINIMUM_ROTATION_DELAY_KEY: init_args.minimum_rotation_delay,
+        PREVIOUS_SIGNERS_RETENTION_KEY: init_args.previous_signers_retention,
+        DOMAIN_SEPARATOR_KEY: domain_separator,
     });
 
     write_json_to_file_path(&chains_info, &config.chains_info_file)?;

solana/cli/src/its.rs

@@ -2,15 +2,16 @@ use std::{fs::File, io::Write, time::SystemTime};
 
 use axelar_solana_its::state;
 use clap::{Parser, Subcommand};
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use solana_sdk::instruction::Instruction;
 use solana_sdk::pubkey::Pubkey;
 
 use crate::config::Config;
 use crate::types::ChainNameOnAxelar;
 use crate::utils::{
-    self, read_json_file_from_path, ADDRESS_KEY, AXELAR_KEY, CHAINS_KEY, CONFIG_ACCOUNT_KEY,
-    CONTRACTS_KEY, GAS_SERVICE_KEY, ITS_KEY,
+    encode_its_destination, read_json_file_from_path, write_json_to_file_path, ADDRESS_KEY,
+    AXELAR_KEY, CHAINS_KEY, CONFIG_ACCOUNT_KEY, CONTRACTS_KEY, GAS_SERVICE_KEY, ITS_KEY,
+    OPERATOR_KEY, UPGRADE_AUTHORITY_KEY,
 };
 
 #[derive(Subcommand, Debug)]
@@ -656,15 +657,6 @@ pub(crate) async fn build_instruction(
     }
 }
 
-#[derive(Serialize, Deserialize, Debug)]
-struct ItsInfo {
-    address: String,
-    #[serde(rename = "configAccount")]
-    config_account: String,
-    #[serde(rename = "upgradeAuthority")]
-    upgrade_authority: String,
-}
-
 async fn init(
     fee_payer: &Pubkey,
     init_args: InitArgs,
@@ -673,21 +665,20 @@ async fn init(
     let mut chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
     let its_hub_address =
         String::deserialize(&chains_info[AXELAR_KEY][CONTRACTS_KEY][ITS_KEY][ADDRESS_KEY])?;
-
-    let its_info = ItsInfo {
-        address: axelar_solana_its::id().to_string(),
-        config_account: axelar_solana_its::find_its_root_pda(
-            &axelar_solana_gateway::get_gateway_root_config_pda().0,
-        )
-        .0
-        .to_string(),
-        upgrade_authority: fee_payer.to_string(),
-    };
+    let its_root_config = axelar_solana_its::find_its_root_pda(
+        &axelar_solana_gateway::get_gateway_root_config_pda().0,
+    )
+    .0;
 
     chains_info[CHAINS_KEY][ChainNameOnAxelar::from(config.network_type).0][CONTRACTS_KEY]
-        [ITS_KEY] = serde_json::json!(its_info);
+        [ITS_KEY] = serde_json::json!({
+        ADDRESS_KEY: axelar_solana_gateway::id().to_string(),
+        CONFIG_ACCOUNT_KEY: its_root_config.to_string(),
+        UPGRADE_AUTHORITY_KEY: fee_payer.to_string(),
+        OPERATOR_KEY: init_args.operator.to_string(),
+    });
 
-    utils::write_json_to_file_path(&chains_info, &config.chains_info_file)?;
+    write_json_to_file_path(&chains_info, &config.chains_info_file)?;
 
     Ok(axelar_solana_its::instruction::initialize(
         *fee_payer,
@@ -734,7 +725,7 @@ async fn approve_deploy_remote_interchain_token(
     config: &Config,
 ) -> eyre::Result<Instruction> {
     let chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
-    let destination_minter = utils::encode_its_destination(
+    let destination_minter = encode_its_destination(
         &chains_info,
         &args.destination_chain,
         args.destination_minter,
@@ -845,7 +836,7 @@ async fn deploy_remote_interchain_token_with_minter(
     let gas_service = try_infer_gas_service_id(args.gas_service, config)?;
     let gas_config_account = try_infer_gas_service_config_account(args.gas_config_account, config)?;
     let chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
-    let destination_minter = utils::encode_its_destination(
+    let destination_minter = encode_its_destination(
         &chains_info,
         &args.destination_chain,
         args.destination_minter,
@@ -932,7 +923,7 @@ async fn interchain_transfer(
         .try_into()?;
 
     let chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
-    let destination_address = utils::encode_its_destination(
+    let destination_address = encode_its_destination(
         &chains_info,
         &args.destination_chain,
         args.destination_address,
@@ -967,7 +958,7 @@ async fn call_contract_with_interchain_token(
         .as_secs()
         .try_into()?;
     let chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
-    let destination_address = utils::encode_its_destination(
+    let destination_address = encode_its_destination(
         &chains_info,
         &args.destination_chain,
         args.destination_address,
@@ -1004,7 +995,7 @@ async fn call_contract_with_interchain_token_offchain_data(
         .as_secs()
         .try_into()?;
     let chains_info: serde_json::Value = read_json_file_from_path(&config.chains_info_file)?;
-    let destination_address = utils::encode_its_destination(
+    let destination_address = encode_its_destination(
         &chains_info,
         &args.destination_chain,
         args.destination_address,

solana/cli/src/utils.rs

@@ -24,6 +24,10 @@ pub(crate) const GATEWAY_KEY: &str = "AxelarGateway";
 pub(crate) const GRPC_KEY: &str = "grpc";
 pub(crate) const ITS_KEY: &str = "InterchainTokenService";
 pub(crate) const MULTISIG_PROVER_KEY: &str = "MultisigProver";
+pub(crate) const UPGRADE_AUTHORITY_KEY: &str = "upgradeAuthority";
+pub(crate) const OPERATOR_KEY: &str = "operator";
+pub(crate) const MINIMUM_ROTATION_DELAY_KEY: &str = "minimumRotationDelay";
+pub(crate) const PREVIOUS_SIGNERS_RETENTION_KEY: &str = "previousSignersRetention";
 
 pub(crate) fn read_json_file<T: DeserializeOwned>(file: &File) -> Result<T> {
     let reader = std::io::BufReader::new(file);