Combine timed vault actions, fully support sbtc and dao tokens

Clarinet.toml

@@ -103,60 +103,100 @@ path = 'contracts/dao/extensions/aibtc-onchain-messaging.clar'
 clarity_version = 3
 epoch = 3.1
 
-[contracts.aibtc-payments-invoices]
-path = 'contracts/dao/extensions/aibtc-payments-invoices.clar'
-clarity_version = 2
+[contracts.aibtc-payment-processor-dao]
+path = 'contracts/dao/extensions/aibtc-payment-processor-dao.clar'
+clarity_version = 3
 epoch = 3.1
 
-[contracts.aibtc-timed-vault]
-path = 'contracts/dao/extensions/aibtc-timed-vault.clar'
-clarity_version = 2
+[contracts.aibtc-payment-processor-sbtc]
+path = 'contracts/dao/extensions/aibtc-payment-processor-sbtc.clar'
+clarity_version = 3
+epoch = 3.1
+
+[contracts.aibtc-payment-processor-stx]
+path = 'contracts/dao/extensions/aibtc-payment-processor-stx.clar'
+clarity_version = 3
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao]
+path = 'contracts/dao/extensions/aibtc-timed-vault-dao.clar'
+clarity_version = 3
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc]
+path = 'contracts/dao/extensions/aibtc-timed-vault-sbtc.clar'
+clarity_version = 3
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-stx]
+path = 'contracts/dao/extensions/aibtc-timed-vault-stx.clar'
+clarity_version = 3
 epoch = 3.1
 
 [contracts.aibtc-token-owner]
 path = 'contracts/dao/extensions/aibtc-token-owner.clar'
-clarity_version = 2
+clarity_version = 3
 epoch = 3.1
 
 [contracts.aibtc-treasury]
 path = 'contracts/dao/extensions/aibtc-treasury.clar'
-clarity_version = 2
+clarity_version = 3
 epoch = 3.1
 
 # dao actions (as extensions)
 
-[contracts.aibtc-action-add-resource]
-path = 'contracts/dao/extensions/actions/aibtc-action-add-resource.clar'
+[contracts.aibtc-action-pmt-dao-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-allow-asset]
-path = 'contracts/dao/extensions/actions/aibtc-action-allow-asset.clar'
+[contracts.aibtc-action-pmt-dao-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-dao-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-send-message]
-path = 'contracts/dao/extensions/actions/aibtc-action-send-message.clar'
+[contracts.aibtc-action-pmt-sbtc-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-add-resource.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-action-pmt-sbtc-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-sbtc-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-set-account-holder]
-path = 'contracts/dao/extensions/actions/aibtc-action-set-account-holder.clar'
+[contracts.aibtc-action-pmt-stx-add-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-set-withdrawal-amount]
-path = 'contracts/dao/extensions/actions/aibtc-action-set-withdrawal-amount.clar'
+[contracts.aibtc-action-pmt-stx-toggle-resource]
+path = 'contracts/dao/extensions/actions/aibtc-action-pmt-stx-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-set-withdrawal-period]
-path = 'contracts/dao/extensions/actions/aibtc-action-set-withdrawal-period.clar'
+[contracts.aibtc-action-treasury-allow-asset]
+path = 'contracts/dao/extensions/actions/aibtc-action-treasury-allow-asset.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-action-toggle-resource-by-name]
-path = 'contracts/dao/extensions/actions/aibtc-action-toggle-resource-by-name.clar'
+[contracts.aibtc-action-send-message]
+path = 'contracts/dao/extensions/actions/aibtc-action-send-message.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-action-configure-timed-vault-dao]
+path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-dao.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-action-configure-timed-vault-sbtc]
+path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-sbtc.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-action-configure-timed-vault-stx]
+path = 'contracts/dao/extensions/actions/aibtc-action-configure-timed-vault-stx.clar'
 clarity_version = 2
 epoch = 3.1
 
@@ -167,33 +207,33 @@ path = 'contracts/dao/proposals/aibtc-action-proposals-set-proposal-bond.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-initialize-new-account]
-path = 'contracts/dao/proposals/aibtc-timed-vault-initialize-new-account.clar'
+[contracts.aibtc-timed-vault-stx-initialize-new-vault]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-initialize-new-vault.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-override-last-withdrawal-block]
-path = 'contracts/dao/proposals/aibtc-timed-vault-override-last-withdrawal-block.clar'
+[contracts.aibtc-timed-vault-stx-override-last-withdrawal-block]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-override-last-withdrawal-block.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-set-account-holder]
-path = 'contracts/dao/proposals/aibtc-timed-vault-set-account-holder.clar'
+[contracts.aibtc-timed-vault-stx-set-account-holder]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-set-account-holder.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-set-withdrawal-amount]
-path = 'contracts/dao/proposals/aibtc-timed-vault-set-withdrawal-amount.clar'
+[contracts.aibtc-timed-vault-stx-set-withdrawal-amount]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-set-withdrawal-amount.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-set-withdrawal-period]
-path = 'contracts/dao/proposals/aibtc-timed-vault-set-withdrawal-period.clar'
+[contracts.aibtc-timed-vault-stx-set-withdrawal-period]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-set-withdrawal-period.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-timed-vault-withdraw-stx]
-path = 'contracts/dao/proposals/aibtc-timed-vault-withdraw-stx.clar'
+[contracts.aibtc-timed-vault-stx-withdraw]
+path = 'contracts/dao/proposals/aibtc-timed-vault-stx-withdraw.clar'
 clarity_version = 2
 epoch = 3.1
 
@@ -247,23 +287,63 @@ path = 'contracts/dao/proposals/aibtc-onchain-messaging-send.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-payments-invoices-add-resource]
-path = 'contracts/dao/proposals/aibtc-payments-invoices-add-resource.clar'
+[contracts.aibtc-pmt-stx-add-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-stx-add-resource.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-stx-set-payment-address]
+path = 'contracts/dao/proposals/aibtc-pmt-stx-set-payment-address.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-stx-toggle-resource-by-name]
+path = 'contracts/dao/proposals/aibtc-pmt-stx-toggle-resource-by-name.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-payments-invoices-set-payment-address]
-path = 'contracts/dao/proposals/aibtc-payments-invoices-set-payment-address.clar'
+[contracts.aibtc-pmt-stx-toggle-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-stx-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-payments-invoices-toggle-resource-by-name]
-path = 'contracts/dao/proposals/aibtc-payments-invoices-toggle-resource-by-name.clar'
+[contracts.aibtc-pmt-sbtc-add-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-sbtc-add-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
-[contracts.aibtc-payments-invoices-toggle-resource]
-path = 'contracts/dao/proposals/aibtc-payments-invoices-toggle-resource.clar'
+[contracts.aibtc-pmt-sbtc-set-payment-address]
+path = 'contracts/dao/proposals/aibtc-pmt-sbtc-set-payment-address.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-sbtc-toggle-resource-by-name]
+path = 'contracts/dao/proposals/aibtc-pmt-sbtc-toggle-resource-by-name.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-sbtc-toggle-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-sbtc-toggle-resource.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-dao-add-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-dao-add-resource.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-dao-set-payment-address]
+path = 'contracts/dao/proposals/aibtc-pmt-dao-set-payment-address.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-dao-toggle-resource-by-name]
+path = 'contracts/dao/proposals/aibtc-pmt-dao-toggle-resource-by-name.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-pmt-dao-toggle-resource]
+path = 'contracts/dao/proposals/aibtc-pmt-dao-toggle-resource.clar'
 clarity_version = 2
 epoch = 3.1
 
@@ -282,6 +362,11 @@ path = 'contracts/dao/proposals/aibtc-treasury-allow-asset.clar'
 clarity_version = 2
 epoch = 3.1
 
+[contracts.aibtc-treasury-allow-assets]
+path = 'contracts/dao/proposals/aibtc-treasury-allow-assets.clar'
+clarity_version = 2
+epoch = 3.1
+
 [contracts.aibtc-treasury-delegate-stx]
 path = 'contracts/dao/proposals/aibtc-treasury-delegate-stx.clar'
 clarity_version = 2
@@ -312,8 +397,78 @@ path = 'contracts/dao/proposals/aibtc-treasury-withdraw-stx.clar'
 clarity_version = 2
 epoch = 3.1
 
+[contracts.aibtc-timed-vault-sbtc-initialize-new-vault]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-initialize-new-vault.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc-override-last-withdrawal-block]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-override-last-withdrawal-block.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc-set-account-holder]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-set-account-holder.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc-set-withdrawal-amount]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-set-withdrawal-amount.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc-set-withdrawal-period]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-set-withdrawal-period.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-sbtc-withdraw]
+path = 'contracts/dao/proposals/aibtc-timed-vault-sbtc-withdraw.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-initialize-new-vault]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-initialize-new-vault.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-override-last-withdrawal-block]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-override-last-withdrawal-block.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-set-account-holder]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-set-account-holder.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-set-withdrawal-amount]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-set-withdrawal-amount.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-set-withdrawal-period]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-set-withdrawal-period.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-timed-vault-dao-withdraw]
+path = 'contracts/dao/proposals/aibtc-timed-vault-dao-withdraw.clar'
+clarity_version = 2
+epoch = 3.1
+
 # dao traits
 
+[contracts.aibtc-dao-traits-v3]
+path = 'contracts/dao/traits/aibtc-dao-traits-v3.clar'
+clarity_version = 2
+epoch = 3.1
+
+[contracts.aibtc-dao-v3]
+path = 'contracts/dao/traits/aibtc-dao-v3.clar'
+clarity_version = 2
+epoch = 3.1
+
 [contracts.aibtc-dao-traits-v2]
 path = 'contracts/dao/traits/aibtc-dao-traits-v2.clar'
 clarity_version = 2

codecov.yml

@@ -5,12 +5,10 @@ coverage:
   precision: 2
   round: down
   range: "70...100"
-  status:
-
   status:
     project:
       default:
-        target: 50% # 95% goal
+        target: 60% # 95% goal
         threshold: 10% # 5% goal
         base: auto
         if_ci_failed: error
@@ -32,4 +30,6 @@ comment:
   require_head: true
 
 ignore:
-  - "contracts/test/**/*"  # Ignore everything in contracts/test directory
+  - "contracts/test"
+  - "aibtcdev-airdrop-1.clar"
+  - "aibtcdev-airdrop-2.clar"