chore: clean up

pyth-network · Nov 14, 2023 · fbea80f · fbea80f
1 parent 8437687
commit fbea80f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 84 deletions.
diff --git a/frontend/claim_sdk/eventSubscriber.ts b/frontend/claim_sdk/eventSubscriber.ts
@@ -95,10 +95,6 @@ export class TokenDispenserEventSubscriber {
     })
 
     const txnEvents = validTxns.map((txnLog) => {
-      console.log(`
-        signature: ${txnLog.signature}
-        logs: ${JSON.stringify(txnLog.logs)}
-      `)
       const eventGen = this.eventParser.parseLogs(txnLog.logs)
       const events = []
       let event = eventGen.next()
@@ -188,10 +184,7 @@ export function formatTxnEventInfo(txnEvnInfo: TxnEventInfo) {
   if (txnEvnInfo.event) {
     formattedEvent = {
       ...formattedEvent,
-      ...txnEvnInfo.event,
-      leafBuffer: txnEvnInfo.event.leafBuffer.toString('hex'),
       claimant: txnEvnInfo.event.claimant.toBase58(),
-      claimAmount: txnEvnInfo.event.claimAmount.toNumber(),
       remainingBalance: txnEvnInfo.event.remainingBalance.toNumber(),
       claimInfo: txnEvnInfo.event.claimInfo,
     }

diff --git a/frontend/claim_sdk/idl/token_dispenser.json b/frontend/claim_sdk/idl/token_dispenser.json
@@ -604,21 +604,11 @@
           "type": "u64",
           "index": false
         },
-        {
-          "name": "claimAmount",
-          "type": "u64",
-          "index": false
-        },
         {
           "name": "claimant",
           "type": "publicKey",
           "index": false
         },
-        {
-          "name": "leafBuffer",
-          "type": "bytes",
-          "index": false
-        },
         {
           "name": "claimInfo",
           "type": {

diff --git a/frontend/claim_sdk/idl/token_dispenser.ts b/frontend/claim_sdk/idl/token_dispenser.ts
@@ -605,21 +605,11 @@ export type TokenDispenser =
           "type": "u64",
           "index": false
         },
-        {
-          "name": "claimAmount",
-          "type": "u64",
-          "index": false
-        },
         {
           "name": "claimant",
           "type": "publicKey",
           "index": false
         },
-        {
-          "name": "leafBuffer",
-          "type": "bytes",
-          "index": false
-        },
         {
           "name": "claimInfo",
           "type": {
@@ -1285,21 +1275,11 @@ export const IDL: TokenDispenser =
           "type": "u64",
           "index": false
         },
-        {
-          "name": "claimAmount",
-          "type": "u64",
-          "index": false
-        },
         {
           "name": "claimant",
           "type": "publicKey",
           "index": false
         },
-        {
-          "name": "leafBuffer",
-          "type": "bytes",
-          "index": false
-        },
         {
           "name": "claimInfo",
           "type": {

diff --git a/frontend/integration/integrationTest.test.ts b/frontend/integration/integrationTest.test.ts
@@ -218,7 +218,9 @@ describe('integration test', () => {
         },
       })
       expect(
-        new anchor.BN(evmClaimEvent.claimAmount.toString()).eq(claimInfo.amount)
+        new anchor.BN(evmClaimEvent.claimInfo.amount.toString()).eq(
+          claimInfo.amount
+        )
       ).toBeTruthy()
       expectedTreasuryBalance = expectedTreasuryBalance.sub(claimInfo.amount)
       const eventRemainingBalance = new anchor.BN(
@@ -229,8 +231,6 @@ describe('integration test', () => {
           expectedTreasuryBalance
         )
       ).toBeTruthy()
-      const expectedLeafBuffer = claimInfo.toBuffer()
-      expect(evmClaimEvent.leafBuffer).toEqual(expectedLeafBuffer)
     }, 40000)
 
     it('submits a cosmwasm claim', async () => {
@@ -279,7 +279,7 @@ describe('integration test', () => {
         cosmwasm: { address: testWallets.cosmwasm[0].address() },
       })
       expect(
-        new anchor.BN(cosmClaimEvent.claimAmount.toString()).eq(
+        new anchor.BN(cosmClaimEvent.claimInfo.amount.toString()).eq(
           claimInfo.amount
         )
       ).toBeTruthy()
@@ -289,8 +289,6 @@ describe('integration test', () => {
           expectedTreasuryBalance
         )
       ).toBeTruthy()
-      const expectedLeafBuffer = claimInfo.toBuffer()
-      expect(cosmClaimEvent.leafBuffer).toEqual(expectedLeafBuffer)
     }, 40000)
 
     it('submits multiple claims at once', async () => {

diff --git a/token-dispenser/programs/token-dispenser/src/ecosystems/aptos.rs b/token-dispenser/programs/token-dispenser/src/ecosystems/aptos.rs
@@ -61,10 +61,6 @@ pub struct AptosAddress([u8; 32]);
 
 impl AptosAddress {
     pub const LEN: usize = 32;
-
-    pub fn as_bytes(&self) -> [u8; Self::LEN] {
-        self.0
-    }
 }
 
 impl From<Ed25519Pubkey> for AptosAddress {

diff --git a/token-dispenser/programs/token-dispenser/src/ecosystems/cosmos.rs b/token-dispenser/programs/token-dispenser/src/ecosystems/cosmos.rs
@@ -232,12 +232,6 @@ impl From<[u8; Self::LEN]> for UncompressedSecp256k1Pubkey {
 #[derive(AnchorDeserialize, AnchorSerialize, Clone, Debug)]
 pub struct CosmosBech32Address(String);
 
-impl CosmosBech32Address {
-    pub fn as_string(&self) -> String {
-        self.0.to_owned()
-    }
-}
-
 impl From<EvmPubkey> for CosmosBech32Address {
     fn from(value: EvmPubkey) -> Self {
         CosmosBech32Address(

diff --git a/token-dispenser/programs/token-dispenser/src/lib.rs b/token-dispenser/programs/token-dispenser/src/lib.rs
@@ -171,9 +171,7 @@ pub mod token_dispenser {
 
         emit!(ClaimEvent {
             remaining_balance: treasury.amount,
-            claim_amount: claim_info.amount,
             claimant: *ctx.accounts.claimant.key,
-            leaf_buffer: leaf_vector,
             claim_info,
         });
 
@@ -260,33 +258,6 @@ pub enum Identity {
     Injective { address: CosmosBech32Address },
 }
 
-// impl Identity {
-//     fn ecosystem(&self) -> String {
-//         let ecosystem = match self {
-//             Identity::Discord { .. } => "discord",
-//             Identity::Solana { .. } => "solana",
-//             Identity::Evm { .. } => "evm",
-//             Identity::Sui { .. } => "sui",
-//             Identity::Aptos { .. } => "aptos",
-//             Identity::Cosmwasm { .. } => "cosmwasm",
-//             Identity::Injective { .. } => "injective",
-//         };
-//         ecosystem.to_owned()
-//     }
-//
-//     fn address(&self) -> String {
-//         match self {
-//             Identity::Discord { username } => username.to_string(),
-//             Identity::Solana { pubkey } => Pubkey::from(pubkey.to_bytes()).to_string(),
-//             Identity::Evm { pubkey } => hex::encode(pubkey.as_bytes()),
-//             Identity::Sui { address } => hex::encode(address.as_bytes()),
-//             Identity::Aptos { address } => hex::encode(address.as_bytes()),
-//             Identity::Cosmwasm { address } => address.as_string(),
-//             Identity::Injective { address } => address.as_string(),
-//         }
-//     }
-// }
-
 #[derive(AnchorDeserialize, AnchorSerialize, Clone)]
 pub enum IdentityCertificate {
     Discord {
@@ -683,8 +654,6 @@ impl crate::accounts::Claim {
 #[event]
 pub struct ClaimEvent {
     pub remaining_balance: u64,
-    pub claim_amount:      u64,
     pub claimant:          Pubkey,
-    pub leaf_buffer:       Vec<u8>,
     pub claim_info:        ClaimInfo,
 }