solana: rename CHAIN_ID_SOLANA -> OUR_CHAIN_ID

this brave new multi-SVM world

solana: fix typo in constant name

solana/bridge/program/src/api/governance.rs

@@ -36,7 +36,7 @@ use crate::{
     },
     DeserializePayload,
     PayloadMessage,
-    CHAIN_ID_GOVERANCE,
+    CHAIN_ID_GOVERNANCE,
 };
 
 /// Fail if the emitter is not the known governance key, or the emitting chain is not Solana.
@@ -46,7 +46,7 @@ where
 {
     let expected_emitter = std::env!("EMITTER_ADDRESS");
     let current_emitter = format!("{}", Pubkey::new_from_array(vaa.meta().emitter_address));
-    if expected_emitter != current_emitter || vaa.meta().emitter_chain != CHAIN_ID_GOVERANCE {
+    if expected_emitter != current_emitter || vaa.meta().emitter_chain != CHAIN_ID_GOVERNANCE {
         Err(InvalidGovernanceKey.into())
     } else {
         Ok(())

solana/bridge/program/src/api/post_message.rs

@@ -16,7 +16,7 @@ use crate::{
     types::ConsistencyLevel,
     IsSigned::*,
     MessageData,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::{
     msg,
@@ -227,7 +227,7 @@ fn post_message_internal<'b>(
     // Initialize transfer
     trace!("Setting Message Details");
     message.submission_time = clock.unix_timestamp as u32;
-    message.emitter_chain = CHAIN_ID_SOLANA;
+    message.emitter_chain = OUR_CHAIN_ID;
     message.emitter_address = emitter.key.to_bytes();
     message.nonce = data.nonce;
     message.payload = data.payload;

solana/bridge/program/src/instructions.rs

@@ -44,7 +44,7 @@ use crate::{
     UpgradeContractData,
     UpgradeGuardianSetData,
     VerifySignaturesData,
-    CHAIN_ID_GOVERANCE,
+    CHAIN_ID_GOVERNANCE,
 };
 
 pub fn initialize(
@@ -254,7 +254,7 @@ pub fn upgrade_contract(
     let claim = Claim::<'_>::key(
         &ClaimDerivationData {
             emitter_address: emitter.to_bytes(),
-            emitter_chain: CHAIN_ID_GOVERANCE,
+            emitter_chain: CHAIN_ID_GOVERNANCE,
             sequence,
         },
         &program_id,
@@ -308,7 +308,7 @@ pub fn upgrade_guardian_set(
     let claim = Claim::<'_>::key(
         &ClaimDerivationData {
             emitter_address: emitter.to_bytes(),
-            emitter_chain: CHAIN_ID_GOVERANCE,
+            emitter_chain: CHAIN_ID_GOVERNANCE,
             sequence,
         },
         &program_id,
@@ -357,7 +357,7 @@ pub fn set_fees(
     let claim = Claim::<'_>::key(
         &ClaimDerivationData {
             emitter_address: emitter.to_bytes(),
-            emitter_chain: CHAIN_ID_GOVERANCE,
+            emitter_chain: CHAIN_ID_GOVERNANCE,
             sequence,
         },
         &program_id,
@@ -392,7 +392,7 @@ pub fn transfer_fees(
     let claim = Claim::<'_>::key(
         &ClaimDerivationData {
             emitter_address: emitter.to_bytes(),
-            emitter_chain: CHAIN_ID_GOVERANCE,
+            emitter_chain: CHAIN_ID_GOVERNANCE,
             sequence,
         },
         &program_id,

solana/bridge/program/src/lib.rs

@@ -5,8 +5,8 @@
 use solitaire::*;
 
 pub const MAX_LEN_GUARDIAN_KEYS: usize = 19;
-pub const CHAIN_ID_SOLANA: u16 = 1;
-pub const CHAIN_ID_GOVERANCE: u16 = 1;
+pub const OUR_CHAIN_ID: u16 = 1;
+pub const CHAIN_ID_GOVERNANCE: u16 = 1;
 
 #[cfg(feature = "instructions")]
 pub mod instructions;

solana/bridge/program/src/vaa.rs

@@ -10,7 +10,7 @@ use crate::{
     },
     PostedVAAData,
     Result,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use byteorder::{
     BigEndian,
@@ -74,7 +74,7 @@ pub trait SerializeGovernancePayload: SerializePayload {
         let module = module.as_bytes();
         c.write_all(module)?;
         c.write_u8(Self::ACTION)?;
-        c.write_u16::<BigEndian>(CHAIN_ID_SOLANA)?;
+        c.write_u16::<BigEndian>(OUR_CHAIN_ID)?;
         Ok(())
     }
 }
@@ -95,7 +95,7 @@ pub trait DeserializeGovernancePayload: DeserializePayload + SerializeGovernance
         }
 
         let chain = c.read_u16::<BigEndian>()?;
-        if chain != CHAIN_ID_SOLANA && chain != 0 {
+        if chain != OUR_CHAIN_ID && chain != 0 {
             return Err(InvalidGovernanceChain.into());
         }
 

solana/modules/nft_bridge/program/src/api/complete_transfer.rs

@@ -24,7 +24,7 @@ use bridge::{
         Claim,
     },
     PayloadMessage,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::{
     account_info::AccountInfo,
@@ -112,10 +112,10 @@ pub fn complete_native(
     if token_id_bytes != accs.mint.info().key.to_bytes() {
         return Err(InvalidMint.into());
     }
-    if accs.vaa.token_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.token_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
     if accs.vaa.to != accs.to.info().key.to_bytes() {
@@ -223,7 +223,7 @@ pub fn complete_wrapped(
         .verify_derivation(ctx.program_id, &derivation_data)?;
 
     // Verify VAA
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
     if accs.vaa.to != accs.to.info().key.to_bytes() {
@@ -358,7 +358,7 @@ pub fn complete_wrapped_meta(
         .verify_derivation(ctx.program_id, &derivation_data)?;
 
     // Verify VAA
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/nft_bridge/program/src/api/governance.rs

@@ -147,7 +147,7 @@ pub fn register_chain(
     verify_governance(&accs.vaa)?;
     claim::consume(ctx, accs.payer.key, &mut accs.claim, &accs.vaa)?;
 
-    if accs.vaa.chain == CHAIN_ID_SOLANA {
+    if accs.vaa.chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/token_bridge/program/src/api/attest.rs

@@ -16,7 +16,7 @@ use bridge::{
     api::PostMessageData,
     types::ConsistencyLevel,
     vaa::SerializePayload,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::{
     account_info::AccountInfo,
@@ -109,7 +109,7 @@ pub fn attest_token(
     // Create Asset Metadata
     let mut payload = PayloadAssetMeta {
         token_address: accs.mint.info().key.to_bytes(),
-        token_chain: CHAIN_ID_SOLANA,
+        token_chain: OUR_CHAIN_ID,
         decimals: accs.mint.decimals,
         symbol: "".to_string(),
         name: "".to_string(),

solana/modules/token_bridge/program/src/api/complete_transfer.rs

@@ -23,7 +23,7 @@ use bridge::{
         Claim,
     },
     PayloadMessage,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::account_info::AccountInfo;
 use solitaire::{
@@ -107,7 +107,7 @@ pub fn complete_native(
     if accs.vaa.token_chain != 1 {
         return Err(InvalidChain.into());
     }
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
     if accs.vaa.to != accs.to.info().key.to_bytes() {
@@ -234,7 +234,7 @@ pub fn complete_wrapped(
     }
 
     // Verify VAA
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
     if accs.vaa.to != accs.to.info().key.to_bytes() {

solana/modules/token_bridge/program/src/api/complete_transfer_payload.rs

@@ -22,7 +22,7 @@ use bridge::{
         Claim,
     },
     PayloadMessage,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::account_info::AccountInfo;
 use solitaire::{
@@ -169,7 +169,7 @@ pub fn complete_native_with_payload(
     if accs.vaa.token_chain != 1 {
         return Err(InvalidChain.into());
     }
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 
@@ -284,7 +284,7 @@ pub fn complete_wrapped_with_payload(
     }
 
     // Verify VAA
-    if accs.vaa.to_chain != CHAIN_ID_SOLANA {
+    if accs.vaa.to_chain != OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/token_bridge/program/src/api/create_wrapped.rs

@@ -25,7 +25,7 @@ use bridge::{
         Claim,
     },
     PayloadMessage,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use solana_program::{
     account_info::AccountInfo,
@@ -97,7 +97,7 @@ pub fn create_wrapped(
     data: CreateWrappedData,
 ) -> Result<()> {
     // Do not process attestations sourced from the current chain.
-    if accs.vaa.token_chain == CHAIN_ID_SOLANA {
+    if accs.vaa.token_chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/token_bridge/program/src/api/transfer.rs

@@ -26,7 +26,7 @@ use bridge::{
     api::PostMessageData,
     types::ConsistencyLevel,
     vaa::SerializePayload,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use primitive_types::U256;
 use solana_program::{
@@ -111,7 +111,7 @@ pub fn transfer_native(
     data: TransferNativeData,
 ) -> Result<()> {
     // Prevent transferring to the same chain.
-    if data.target_chain == CHAIN_ID_SOLANA {
+    if data.target_chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 
@@ -135,7 +135,7 @@ pub fn transfer_native(
     let payload = PayloadTransfer {
         amount: U256::from(amount),
         token_address: accs.mint.info().key.to_bytes(),
-        token_chain: CHAIN_ID_SOLANA,
+        token_chain: OUR_CHAIN_ID,
         to: data.target_address,
         to_chain: data.target_chain,
         fee: U256::from(fee),
@@ -312,7 +312,7 @@ pub fn transfer_wrapped(
     data: TransferWrappedData,
 ) -> Result<()> {
     // Prevent transferring to the same chain.
-    if data.target_chain == CHAIN_ID_SOLANA {
+    if data.target_chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/token_bridge/program/src/api/transfer_payload.rs

@@ -20,7 +20,7 @@ use bridge::{
     api::PostMessageData,
     types::ConsistencyLevel,
     vaa::SerializePayload,
-    CHAIN_ID_SOLANA,
+    OUR_CHAIN_ID,
 };
 use primitive_types::U256;
 use solana_program::{
@@ -183,7 +183,7 @@ pub fn transfer_native_with_payload(
     data: TransferNativeWithPayloadData,
 ) -> Result<()> {
     // Prevent transferring to the same chain.
-    if data.target_chain == CHAIN_ID_SOLANA {
+    if data.target_chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 
@@ -207,7 +207,7 @@ pub fn transfer_native_with_payload(
     let payload = PayloadTransferWithPayload {
         amount: U256::from(amount),
         token_address: accs.mint.info().key.to_bytes(),
-        token_chain: CHAIN_ID_SOLANA,
+        token_chain: OUR_CHAIN_ID,
         to: data.target_address,
         to_chain: data.target_chain,
         from_address: accs.sender.derive_sender_address(&data.cpi_program_id)?,
@@ -312,7 +312,7 @@ pub fn transfer_wrapped_with_payload(
     data: TransferWrappedWithPayloadData,
 ) -> Result<()> {
     // Prevent transferring to the same chain.
-    if data.target_chain == CHAIN_ID_SOLANA {
+    if data.target_chain == OUR_CHAIN_ID {
         return Err(InvalidChain.into());
     }
 

solana/modules/token_bridge/program/tests/integration.rs

@@ -54,7 +54,7 @@ const GOVERNANCE_KEY: [u8; 64] = [
     88, 97, 199,
 ];
 
-const CHAIN_ID_SOLANA: u16 = 1;
+const OUR_CHAIN_ID: u16 = 1;
 const CHAIN_ID_ETH: u16 = 2;
 
 struct Context {
@@ -583,9 +583,9 @@ async fn transfer_native_with_payload_in() {
     let payload = PayloadTransferWithPayload {
         amount: U256::from(100u128),
         token_address: mint.pubkey().to_bytes(),
-        token_chain: CHAIN_ID_SOLANA,
+        token_chain: OUR_CHAIN_ID,
         to: token_authority.pubkey().to_bytes(),
-        to_chain: CHAIN_ID_SOLANA,
+        to_chain: OUR_CHAIN_ID,
         from_address,
         payload,
     };