initial testnet deploy

Author: Prometheo

src/claim.rs

@@ -17,18 +17,50 @@ pub enum ClaimType {
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Claim {
     pub claim_type: ClaimType,
-    pub amount: u128, // For NEAR and FTs. Ignored for NFTs
+    pub amount: NearToken, // For NEAR and FTs. Ignored for NFTs
     pub tipper: AccountId,
     pub timestamp: u64,
     pub expires_at: u64,
     pub claimed: bool,
 }
 
+#[near(serializers=[borsh, json])]
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct ClaimExternal {
+    pub id: ClaimId,
+    pub claim_type: String,
+    pub amount: U128, // For NEAR and FTs. Ignored for NFTs
+    pub tipper: AccountId,
+    pub timestamp: u64,
+    pub expires_at: u64,
+    pub claimed: bool,
+}
+
+pub(crate) fn format_claim(claim_id: &ClaimId, claim: &Claim) -> ClaimExternal {
+    let claim_type = match &claim.claim_type {
+        ClaimType::Near => "Near".to_string(),
+        ClaimType::FungibleToken { contract_id } => format!("FT({})", contract_id),
+        ClaimType::NonFungibleToken {
+            contract_id,
+            token_id,
+        } => format!("NFT({}, {})", contract_id, token_id),
+    };
+    ClaimExternal {
+        id: claim_id.clone(),
+        claim_type,
+        amount: claim.amount.as_yoctonear().into(),
+        tipper: claim.tipper.clone(),
+        timestamp: claim.timestamp,
+        expires_at: claim.expires_at,
+        claimed: claim.claimed,
+    }
+}
+
 impl Claim {
     pub fn new_near(tipper: AccountId, amount: u128) -> Self {
         Self {
             claim_type: ClaimType::Near,
-            amount,
+            amount: NearToken::from_yoctonear(amount),
             tipper,
             timestamp: env::block_timestamp(),
             expires_at: env::block_timestamp() + crate::CLAIM_EXPIRATION_PERIOD,
@@ -39,7 +71,7 @@ impl Claim {
     pub fn new_ft(tipper: AccountId, contract_id: AccountId, amount: u128) -> Self {
         Self {
             claim_type: ClaimType::FungibleToken { contract_id },
-            amount,
+            amount: NearToken::from_yoctonear(amount),
             tipper,
             timestamp: env::block_timestamp(),
             expires_at: env::block_timestamp() + crate::CLAIM_EXPIRATION_PERIOD,
@@ -53,7 +85,7 @@ impl Claim {
                 contract_id,
                 token_id,
             },
-            amount: 0, // Not used for NFTs
+            amount: NearToken::from_yoctonear(0), // Not used for NFTs
             tipper,
             timestamp: env::block_timestamp(),
             expires_at: env::block_timestamp() + crate::CLAIM_EXPIRATION_PERIOD,
@@ -66,7 +98,7 @@ impl Claim {
     }
 
     pub fn amount(&self) -> u128 {
-        self.amount
+        self.amount.as_yoctonear()
     }
 
     pub fn tipper(&self) -> &AccountId {

src/events.rs

@@ -29,7 +29,7 @@ pub fn log_account_linked_event(platform: &str, handle: &str, account_id: &Accou
 pub fn log_tip_transferred_event(
     platform: &str,
     handle: &str,
-    amount: u128,
+    amount: U128,
     token_type: &str,
     recipient: &AccountId,
 ) {
@@ -45,7 +45,7 @@ pub fn log_tip_transferred_event(
                     {
                         "platform": platform,
                         "handle": handle,
-                        "amount": amount.to_string(),
+                        "amount": amount,
                         "token_type": token_type,
                         "recipient": recipient,
                     }
@@ -59,7 +59,7 @@ pub fn log_tip_transferred_event(
 pub fn log_claim_created_event(
     platform: &str,
     handle: &str,
-    amount: u128,
+    amount: U128,
     token_type: &str,
     tipper: &AccountId,
 ) {
@@ -75,7 +75,7 @@ pub fn log_claim_created_event(
                     {
                         "platform": platform,
                         "handle": handle,
-                        "amount": amount.to_string(),
+                        "amount": amount,
                         "token_type": token_type,
                         "tipper": tipper,
                     }
@@ -89,7 +89,7 @@ pub fn log_claim_created_event(
 pub fn log_claim_processed_event(
     platform: &str,
     handle: &str,
-    amount: u128,
+    amount: U128,
     token_type: &str,
     claimer: &AccountId,
 ) {
@@ -105,7 +105,7 @@ pub fn log_claim_processed_event(
                     {
                         "platform": platform,
                         "handle": handle,
-                        "amount": amount.to_string(),
+                        "amount": amount,
                         "token_type": token_type,
                         "claimer": claimer,
                     }
@@ -119,7 +119,7 @@ pub fn log_claim_processed_event(
 pub fn log_tip_reclaimed_event(
     platform: &str,
     handle: &str,
-    amount: u128,
+    amount: U128,
     token_type: &str,
     tipper: &AccountId,
 ) {
@@ -135,7 +135,7 @@ pub fn log_tip_reclaimed_event(
                     {
                         "platform": platform,
                         "handle": handle,
-                        "amount": amount.to_string(),
+                        "amount": amount,
                         "token_type": token_type,
                         "tipper": tipper,
                     }