Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contract/src/common/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ mod test {
#[rstest]
fn test_contract_version(admin: AccountId) {
let context = Context::new(admin);
assert_eq!(context.contract().contract_version(), "sweat_jar-4.0.7");
assert_eq!(context.contract().contract_version(), "sweat_jar-4.1.0");
}

#[test]
Expand All @@ -260,7 +260,7 @@ mod test {
.to_json_event_string();
let json = r#"EVENT_JSON:{
"standard": "sweat_jar",
"version": "4.0.7",
"version": "4.1.0",
"event": "claim",
"data": [
"someone.near",
Expand All @@ -276,7 +276,7 @@ mod test {
let event = SweatJarEvent::from(EventKind::OldScoreWarning((111, Local(5)))).to_json_event_string();
let json = r#"EVENT_JSON:{
"standard": "sweat_jar",
"version": "4.0.7",
"version": "4.1.0",
"event": "old_score_warning",
"data": [ 111, 5 ]
}"#;
Expand Down
29 changes: 28 additions & 1 deletion contract/src/feature/account/verification/model.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use near_sdk::{env, env::panic_str, json_types::Base64VecU8, require, AccountId};
use sweat_jar_model::{
data::{
deposit::{DepositMessage, DepositTicket, Purpose},
deposit::{AirdropMessage, DepositMessage, DepositTicket, Purpose},
product::ProductModelApi,
},
signer::MessageVerifier,
Expand Down Expand Up @@ -42,6 +42,33 @@ impl Contract {
MessageVerifier::new(pk).verify(message.material(), &message.sha256(), &signature.0);
}
}

pub(crate) fn verify_airdrop(
&self,
ticket: &DepositTicket,
amount: TokenAmount,
receivers: &[AccountId],
signature: Option<&Base64VecU8>,
) {
let product = self.get_product(&ticket.product_id);

if let Some(pk) = &product.get_public_key() {
let Some(signature) = signature else {
panic_str("Signature is required");
};
ticket.verify_expiration_date();

let message = AirdropMessage::new(
&env::current_account_id(),
&ticket.product_id,
amount,
receivers,
ticket.valid_until.0,
);

MessageVerifier::new(pk).verify(message.material(), &message.sha256(), &signature.0);
}
}
}

trait JarTicketVerifier {
Expand Down
Loading
Loading