chore: bring back helpers for add_mapping

program/rust/src/utils.rs

@@ -57,6 +57,26 @@ pub fn check_valid_funding_account(account: &AccountInfo) -> Result<(), ProgramE
     )
 }
 
+pub fn valid_signable_account(
+    program_id: &Pubkey,
+    account: &AccountInfo,
+) -> Result<bool, ProgramError> {
+    Ok(account.is_signer
+        && account.is_writable
+        && account.owner == program_id
+        && get_rent()?.is_exempt(account.lamports(), account.data_len()))
+}
+
+pub fn check_valid_signable_account(
+    program_id: &Pubkey,
+    account: &AccountInfo,
+) -> Result<(), ProgramError> {
+    pyth_assert(
+        valid_signable_account(program_id, account)?,
+        OracleError::InvalidSignableAccount.into(),
+    )
+}
+
 /// Check that `account` is a valid signable pyth account or
 /// that `funding_account` is a signer and is permissioned by the `permission_account`
 pub fn check_permissioned_funding_account(
@@ -80,6 +100,34 @@ pub fn check_permissioned_funding_account(
     check_valid_writable_account(program_id, account)
 }
 
+/// Check that `account` is a valid signable pyth account or
+/// that `funding_account` is a signer and is permissioned by the `permission_account`
+pub fn check_valid_signable_account_or_permissioned_funding_account(
+    program_id: &Pubkey,
+    account: &AccountInfo,
+    funding_account: &AccountInfo,
+    permissions_account_option: Option<&AccountInfo>,
+    cmd_hdr: &CommandHeader,
+) -> Result<(), ProgramError> {
+    if let Some(permissions_account) = permissions_account_option {
+        check_valid_permissions_account(program_id, permissions_account)?;
+        let permissions_account_data =
+            load_checked::<PermissionAccount>(permissions_account, cmd_hdr.version)?;
+        check_valid_funding_account(funding_account)?;
+        pyth_assert(
+            permissions_account_data.is_authorized(
+                funding_account.key,
+                OracleCommand::from_i32(cmd_hdr.command)
+                    .ok_or(OracleError::UnrecognizedInstruction)?,
+            ),
+            OracleError::PermissionViolation.into(),
+        )?;
+        check_valid_writable_account(program_id, account)
+    } else {
+        check_valid_signable_account(program_id, account)
+    }
+}
+
 /// Returns `true` if the `account` is fresh, i.e., its data can be overwritten.
 /// Use this check to prevent accidentally overwriting accounts whose data is already populated.
 pub fn valid_fresh_account(account: &AccountInfo) -> bool {