Skip to content

updated refund func using a more robust solution (filter) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whoabuddy merged 2 commits into from
Mar 13, 2025
Merged

updated refund func using a more robust solution (filter) #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db8f518
updated remove func for refunds using filter more robust
Rapha-btc Mar 13, 2025
fa4c455
clean up
Rapha-btc Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions contracts/dao/token/aibtc-pre-dex.clar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
(define-constant ERR-NOT-EXPIRED (err u306))
(define-constant ERR-CONTRACT-INSUFFICIENT-FUNDS (err u307))
(define-constant ERR-INVALID-SEAT-COUNT (err u308))
(define-constant ERR-SLICE-FAILED (err u309))
(define-constant ERR-TOO-LONG (err u310))
(define-constant ERR-REMOVING-HOLDER (err u311))
(define-constant ERR-DISTRIBUTION-ALREADY-SET (err u312))
(define-constant ERR-DISTRIBUTION-NOT-INITIALIZED (err u314))
Expand Down Expand Up @@ -141,15 +139,12 @@
{found: false, index: (+ (get index state) u1)})))

(define-private (remove-seat-holder)
(let ((position (find-holder-position (var-get seat-holders)))
(current-list (var-get seat-holders)))
(match position
pos (let ((before-slice (unwrap! (slice? current-list u0 pos) ERR-SLICE-FAILED))
(after-slice (unwrap! (slice? current-list (+ pos u1) (len current-list)) ERR-SLICE-FAILED))
(updated-list (unwrap! (as-max-len? (concat before-slice after-slice) u20) ERR-TOO-LONG)))
(var-set seat-holders updated-list)
(ok true))
(ok false)))) ;; If position not found, do nothing
(let ((filtered-list (filter not-matching-owner (var-get seat-holders))))
(var-set seat-holders filtered-list)
(ok true)))

(define-private (not-matching-owner (entry {owner: principal, seats: uint}))
(not (is-eq (get owner entry) (var-get target-owner))))

;; Main functions
;; Buy seats in Period 1
Expand Down Expand Up @@ -312,7 +307,14 @@
is-period-1-expired: (is-period-1-expired),
is-distribution-period: (> (var-get distribution-height) u0),
total-users: (var-get total-users),
total-seats-taken: (var-get total-seats-taken)
total-seats-taken: (var-get total-seats-taken),
deployment-height: (var-get deployment-height),
expiration-period: EXPIRATION-PERIOD,
distribution-height: (var-get distribution-height),
accelerated-vesting: (var-get accelerated-vesting),
market-open: (var-get market-open),
governance-active: (var-get governance-active),
seat-holders: (var-get seat-holders)
}))

(define-read-only (get-user-info (user principal))
Expand Down
Loading