Skip to content

Commit 37d088c

Browse files
committed
refactor: integrate faktory as token and dex
Instead of keeping separate contracts and duplicating efforts, we can make the faktory format the defaults for the token and dex since that is what will be used on deploys moving forward. We have git history and on-chain data if we need to access older contracts, or can bring them in as add-ons when testing out ideas.
1 parent a723154 commit 37d088c

13 files changed

+291
-639
lines changed

Clarinet.toml

-10
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,11 @@ path = 'contracts/dao/extensions/aibtc-token.clar'
9393
clarity_version = 2
9494
epoch = 3.0
9595

96-
[contracts.aibtc-token-faktory]
97-
path = 'contracts/dao/extensions/aibtc-token-faktory.clar'
98-
clarity_version = 2
99-
epoch = 3.0
100-
10196
[contracts.aibtc-token-dex]
10297
path = 'contracts/dao/extensions/aibtc-token-dex.clar'
10398
clarity_version = 2
10499
epoch = 3.0
105100

106-
[contracts.aibtc-token-faktory-dex]
107-
path = 'contracts/dao/extensions/aibtc-token-faktory-dex.clar'
108-
clarity_version = 2
109-
epoch = 3.0
110-
111101
[contracts.aibtc-token-owner]
112102
path = 'contracts/dao/extensions/aibtc-token-owner.clar'
113103
clarity_version = 2

contracts/dao/extensions/aibtc-token-dex.clar

+177-185
Large diffs are not rendered by default.

contracts/dao/extensions/aibtc-token-faktory-dex.clar

-184
This file was deleted.

contracts/dao/extensions/aibtc-token-faktory.clar

-119
This file was deleted.

contracts/dao/extensions/aibtc-token-owner.clar

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
)
3030
)
3131

32+
;; keeping old format for trait adherance
3233
(define-public (transfer-ownership (new-owner principal))
3334
(begin
3435
;; check if caller is authorized
3536
(try! (is-dao-or-extension))
3637
;; transfer ownership
37-
(try! (as-contract (contract-call? .aibtc-token transfer-ownership new-owner)))
38+
(try! (as-contract (contract-call? .aibtc-token set-contract-owner new-owner)))
3839
(ok true)
3940
)
4041
)

0 commit comments

Comments
 (0)