Merge pull request #65 from aibtcdev/fix/rename-smart-wallet

Rename smart wallet

Author: whoabuddy

Clarinet.toml

@@ -52,15 +52,15 @@ path = 'contracts/aibtcdev-airdrop-2.clar'
 clarity_version = 2
 epoch = 3.0
 
-# smart wallet and traits
+# agent account and traits
 
-[contracts.aibtc-smart-wallet-traits]
-path = 'contracts/aibtc-smart-wallet-traits.clar'
+[contracts.aibtc-user-agent-account-traits]
+path = 'contracts/aibtc-user-agent-account-traits.clar'
 clarity_version = 3
 epoch = 3.1
 
-[contracts.aibtc-user-agent-smart-wallet]
-path = 'contracts/aibtc-user-agent-smart-wallet.clar'
+[contracts.aibtc-user-agent-account]
+path = 'contracts/aibtc-user-agent-account.clar'
 clarity_version = 3
 epoch = 3.1
 

contracts/aibtc-smart-wallet-traits.clar

@@ -1,6 +1,6 @@
-;; title: aibtc-smart-wallet-traits
-;; version: 2.0.0
-;; summary: A collection of traits for user agent smart wallets.
+;; title: aibtc-user-agent-account-traits
+;; version: 1.0.0
+;; summary: A collection of traits for user agent accounts.
 
 ;; IMPORTS
 (use-trait sip010-trait 'SP3FBR2AGK5H9QBDH3EEN6DF8EK8JY7RX8QJ5SVTE.sip-010-trait-ft-standard.sip-010-trait)
@@ -11,32 +11,32 @@
 (use-trait dao-faktory-dex .aibtc-dao-traits-v3.faktory-dex)
 (use-trait faktory-token .faktory-trait-v1.sip-010-trait)
 
-;; SMART WALLET TRAITS
+;; ACCOUNT TRAITS
 
-(define-trait aibtc-smart-wallet (
-  ;; deposit STX to the smart wallet
+(define-trait aibtc-account (
+  ;; deposit STX to the agent account
   ;; @param amount amount of microSTX to deposit
   ;; @returns (response bool uint)
   (deposit-stx (uint) (response bool uint))
-  ;; deposit FT to the smart wallet
+  ;; deposit FT to the agent account
   ;; @param ft the fungible token contract
   ;; @param amount amount of tokens to deposit
   ;; @returns (response bool uint)
   (deposit-ft (<sip010-trait> uint) (response bool uint))
-  ;; withdraw STX from the smart wallet (user only)
+  ;; withdraw STX from the agent account (owner only)
   ;; @param amount amount of microSTX to withdraw
   ;; @returns (response bool uint)
   (withdraw-stx (uint) (response bool uint))
-  ;; withdraw FT from the smart wallet (user only)
+  ;; withdraw FT from the agent account (owner only)
   ;; @param ft the fungible token contract
   ;; @param amount amount of tokens to withdraw
   ;; @returns (response bool uint)
   (withdraw-ft (<sip010-trait> uint) (response bool uint))
-  ;; approve an asset for deposit/withdrawal (user only)
+  ;; approve an asset for deposit/withdrawal (owner only)
   ;; @param asset the asset contract principal
   ;; @returns (response bool uint)
   (approve-asset (principal) (response bool uint))
-  ;; revoke approval for an asset (user only)
+  ;; revoke approval for an asset (owner only)
   ;; @param asset the asset contract principal
   ;; @returns (response bool uint)
   (revoke-asset (principal) (response bool uint))
@@ -48,12 +48,12 @@
   ;; @param action the action contract
   ;; @param parameters encoded action parameters
   ;; @returns (response bool uint)
-  (proxy-propose-action (<dao-action-proposals-trait> <dao-action-trait> (buff 2048) (optional (string-ascii 1024))) (response bool uint))
+  (acct-propose-action (<dao-action-proposals-trait> <dao-action-trait> (buff 2048) (optional (string-ascii 1024))) (response bool uint))
   ;; create a core proposal to the DAO (user or agent)
   ;; @param core-proposals the core proposals contract
   ;; @param proposal the proposal contract
   ;; @returns (response bool uint)
-  (proxy-create-proposal (<dao-core-proposals-trait> <dao-proposal-trait> (optional (string-ascii 1024))) (response bool uint))  
+  (acct-create-proposal (<dao-core-proposals-trait> <dao-proposal-trait> (optional (string-ascii 1024))) (response bool uint))  
   ;; vote on an action proposal (user or agent)
   ;; @param action-proposals the action proposals contract
   ;; @param proposalId the proposal ID
@@ -79,25 +79,28 @@
   (conclude-core-proposal (<dao-core-proposals-trait> <dao-proposal-trait>) (response bool uint))
 ))
 
+(define-trait faktory-dex-approval (
+  ;; approve a dex for trading an asset
+  ;; @param faktory-dex the faktory dex contract
+  ;; @returns (response bool uint)
+  (acct-approve-dex (<dao-faktory-dex>) (response bool uint))
+  ;; revoke approval for a dex
+  ;; @param faktory-dex the faktory dex contract
+  ;; @returns (response bool uint)
+  (acct-revoke-dex (<dao-faktory-dex>) (response bool uint))
+))
+
 (define-trait faktory-buy-sell (
   ;; buy an asset from a faktory dex
   ;; @param faktory-dex the faktory dex contract
   ;; @param asset the asset contract principal
   ;; @param amount amount of tokens to buy
   ;; @returns (response bool uint)
-  (buy-asset (<dao-faktory-dex> <faktory-token> uint) (response bool uint))
+  (acct-buy-asset (<dao-faktory-dex> <faktory-token> uint) (response bool uint))
   ;; sell an asset to a faktory dex
   ;; @param faktory-dex the faktory dex contract
   ;; @param asset the asset contract principal
   ;; @param amount amount of tokens to sell
   ;; @returns (response bool uint)
-  (sell-asset (<dao-faktory-dex> <faktory-token> uint) (response bool uint))
-  ;; approve a dex for trading an asset
-  ;; @param faktory-dex the faktory dex contract
-  ;; @returns (response bool uint)
-  (approve-dex (<dao-faktory-dex>) (response bool uint))
-  ;; revoke approval for a dex
-  ;; @param faktory-dex the faktory dex contract
-  ;; @returns (response bool uint)
-  (revoke-dex (<dao-faktory-dex>) (response bool uint))
+  (acct-sell-asset (<dao-faktory-dex> <faktory-token> uint) (response bool uint))
 ))