Merge pull request #4 from Ackee-Blockchain/update-trident

Update trident

Author: lukacan

.github/workflows/trident-fuzz.yaml

@@ -10,7 +10,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   SOLANA_VERSION: "v3.1.9"
-  TRIDENT_VERSION: "0.13.0-rc.2"
+  TRIDENT_VERSION: "0.13.0-rc.3"
 
 jobs:
   build:
@@ -67,6 +67,8 @@ jobs:
             target: "fuzz_pbpp"
           - name: "fuzz_mint_governor"
             target: "fuzz_mint_governor"
+          - name: "fuzz_ppv2"
+            target: "fuzz_ppv2"
 
     steps:
       - uses: actions/checkout@v4

trident-tests/Cargo.lock

@@ -14,7 +14,7 @@ borsh = "1.5.3"
 squads-multisig = { git = "https://github.com/Squads-Protocol/v4", rev = "05f23726a094b6a5a0d97eaccf22af72373ac9c6" }
 
 [dependencies.trident-fuzz]
-version = "0.13.0-rc.2"
+version = "0.13.0-rc.3"
 features = ["token"]
 
 [lib]

trident-tests/Cargo.toml

@@ -36,7 +36,7 @@ pub fn initialize_question(
 
     let res = trident.process_transaction(&[init_question], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 
     question
 }
@@ -87,7 +87,7 @@ pub fn initialize_conditional_vault(
 
     let res = trident.process_transaction(&[init_cond_vault], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 
     vault
 }
@@ -144,7 +144,7 @@ pub fn split_tokens(
 
     let res = trident.process_transaction(&[split_ix], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 pub fn merge_tokens(
@@ -198,5 +198,5 @@ pub fn merge_tokens(
 
     let res = trident.process_transaction(&[merge_ix], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }

trident-tests/common/conditional_vault.rs

@@ -4,8 +4,8 @@ use super::types::futarchy::StakeToProposalInstructionAccounts;
 use super::types::futarchy::StakeToProposalInstructionData;
 use super::types::*;
 
+use trident_fuzz::fuzzing::prelude::TridentTransactionResult;
 use trident_fuzz::fuzzing::*;
-use trident_fuzz::trident::transaction_result::TransactionResult;
 
 use super::constants::*;
 use super::types::futarchy::InitializeDaoParams;
@@ -65,7 +65,7 @@ pub fn initialize_dao(
 
     let res = trident.process_transaction(&[init_dao], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 
     (dao, squads_multisig)
 }
@@ -108,7 +108,7 @@ pub fn initialize_proposal(
 
     let res = trident.process_transaction(&[init_prop], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 
     proposal
 }
@@ -155,7 +155,7 @@ pub fn stake_to_proposal(
 
     let res = trident.process_transaction(&[stake_to_proposal_ix], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -222,7 +222,7 @@ pub fn launch_proposal(
 
     let res = trident.process_transaction(&[launch_ix], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 pub fn spot_swap(
@@ -231,7 +231,7 @@ pub fn spot_swap(
     user: Pubkey,
     params: futarchy::SpotSwapParams,
     message: Option<&str>,
-) -> TransactionResult {
+) -> TridentTransactionResult {
     let dao_data = trident
         .get_account_with_type::<futarchy::Dao>(&dao, None)
         .expect("Dao not found");
@@ -273,7 +273,7 @@ pub fn add_liqidity(
     liquidity_provider: Pubkey,
     params: futarchy::ProvideLiquidityParams,
     message: Option<&str>,
-) -> TransactionResult {
+) -> TridentTransactionResult {
     let dao_data = trident
         .get_account_with_type::<futarchy::Dao>(&dao, None)
         .expect("Dao not found");
@@ -328,7 +328,7 @@ pub fn withdraw_liquidity(
     liquidity_provider: Pubkey,
     params: futarchy::WithdrawLiquidityParams,
     message: Option<&str>,
-) -> TransactionResult {
+) -> TridentTransactionResult {
     let dao_data = trident
         .get_account_with_type::<futarchy::Dao>(&dao, None)
         .expect("Dao not found");
@@ -395,7 +395,7 @@ pub fn conditional_swap(
     quote_vault: Pubkey,
     params: futarchy::ConditionalSwapParams,
     message: Option<&str>,
-) -> TransactionResult {
+) -> TridentTransactionResult {
     let dao_data = trident
         .get_account_with_type::<futarchy::Dao>(&dao, None)
         .expect("Dao not found");
@@ -488,7 +488,7 @@ pub fn finalize_proposal(
     base_vault: Pubkey,
     quote_vault: Pubkey,
     message: Option<&str>,
-) -> TransactionResult {
+) -> TridentTransactionResult {
     let dao_data = trident
         .get_account_with_type::<futarchy::Dao>(&dao, None)
         .expect("Dao not found");

trident-tests/common/futarchy.rs

@@ -34,7 +34,7 @@ pub fn initialize_vault_transaction(
 
     let res = trident.process_transaction(&[vault_tx_create], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 pub fn initialize_squads_proposal(
@@ -66,7 +66,7 @@ pub fn initialize_squads_proposal(
 
     let res = trident.process_transaction(&[create_proposal], message);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 
     squads_proposal
 }

trident-tests/common/squads.rs

@@ -14,7 +14,7 @@ pub fn initialize_mint(
 ) {
     let ix = trident.initialize_mint(&payer, &mint, decimals, &owner, freeze_authority);
     let res = trident.process_transaction(&ix, message);
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 pub fn initialize_associated_token_account(
@@ -33,7 +33,7 @@ pub fn initialize_associated_token_account(
             let ix = trident.initialize_associated_token_account(&payer, &mint, &owner);
             let res = trident.process_transaction(&[ix], None);
 
-            assert!(res.is_success());
+            invariant!(res.is_success());
         }
     }
 
@@ -56,7 +56,7 @@ pub fn mint_to(
 
     let res = trident.process_transaction(&[mint], None);
 
-    assert!(res.is_success());
+    invariant!(res.is_success());
 }
 
 pub fn get_or_initialize_associated_token_account(
@@ -70,7 +70,7 @@ pub fn get_or_initialize_associated_token_account(
     if trident.get_token_account(ata).is_err() {
         let ix = trident.initialize_associated_token_account(&payer, &mint, &owner);
         let res = trident.process_transaction(&[ix], None);
-        assert!(res.is_success());
+        invariant!(res.is_success());
     }
 
     ata