|
12 | 12 | (define-non-fungible-token badge uint) |
13 | 13 |
|
14 | 14 | (define-read-only (get-current-day) |
15 | | - (/ block-height BLOCKS_PER_DAY) |
| 15 | + (/ stacks-block-height BLOCKS_PER_DAY) |
16 | 16 | ) |
17 | 17 |
|
18 | 18 | (define-read-only (get-streak (user principal)) |
|
46 | 46 | (define-public (claim) |
47 | 47 | (let ( |
48 | 48 | (current-day (get-current-day)) |
49 | | - (last-day (default-to u0 (map-get? last-claim-day tx-sender))) |
| 49 | + (last-day-opt (map-get? last-claim-day tx-sender)) |
50 | 50 | (current-streak (default-to u0 (map-get? streak tx-sender))) |
51 | 51 | ) |
52 | | - (if (is-eq current-day last-day) |
53 | | - (err ERR_ALREADY_CLAIMED) |
54 | | - (let ( |
55 | | - (new-streak (if (is-eq (+ last-day u1) current-day) |
56 | | - (+ current-streak u1) |
57 | | - u1)) |
58 | | - ) |
59 | | - (map-set last-claim-day tx-sender current-day) |
60 | | - (map-set streak tx-sender new-streak) |
61 | | - (let ((badge-result (if (is-eq new-streak BADGE_STREAK) |
62 | | - (mint-badge tx-sender) |
63 | | - (ok none)))) |
64 | | - (match badge-result |
65 | | - token-id |
66 | | - (ok { |
67 | | - streak: new-streak, |
68 | | - day: current-day, |
69 | | - badge-minted: (is-some token-id), |
70 | | - token-id: token-id |
71 | | - }) |
72 | | - err-code |
73 | | - (if (is-eq err-code ERR_BADGE_ALREADY_MINTED) |
74 | | - (ok { |
75 | | - streak: new-streak, |
76 | | - day: current-day, |
77 | | - badge-minted: false, |
78 | | - token-id: none |
79 | | - }) |
80 | | - (err err-code)) |
| 52 | + (match last-day-opt last-day |
| 53 | + (if (is-eq current-day last-day) |
| 54 | + (err ERR_ALREADY_CLAIMED) |
| 55 | + (let ( |
| 56 | + (new-streak (if (is-eq (+ last-day u1) current-day) |
| 57 | + (+ current-streak u1) |
| 58 | + u1)) |
| 59 | + ) |
| 60 | + (map-set last-claim-day tx-sender current-day) |
| 61 | + (map-set streak tx-sender new-streak) |
| 62 | + (let ((badge-result (if (is-eq new-streak BADGE_STREAK) |
| 63 | + (mint-badge tx-sender) |
| 64 | + (ok none)))) |
| 65 | + (match badge-result |
| 66 | + token-id |
| 67 | + (ok { |
| 68 | + streak: new-streak, |
| 69 | + day: current-day, |
| 70 | + badge-minted: (is-some token-id), |
| 71 | + token-id: token-id |
| 72 | + }) |
| 73 | + err-code |
| 74 | + (if (is-eq err-code ERR_BADGE_ALREADY_MINTED) |
| 75 | + (ok { |
| 76 | + streak: new-streak, |
| 77 | + day: current-day, |
| 78 | + badge-minted: false, |
| 79 | + token-id: none |
| 80 | + }) |
| 81 | + (err err-code)) |
| 82 | + ) |
81 | 83 | ) |
82 | 84 | ) |
| 85 | + ) |
| 86 | + (let ((new-streak u1)) |
| 87 | + (map-set last-claim-day tx-sender current-day) |
| 88 | + (map-set streak tx-sender new-streak) |
| 89 | + (let ((badge-result (if (is-eq new-streak BADGE_STREAK) |
| 90 | + (mint-badge tx-sender) |
| 91 | + (ok none)))) |
| 92 | + (match badge-result |
| 93 | + token-id |
| 94 | + (ok { |
| 95 | + streak: new-streak, |
| 96 | + day: current-day, |
| 97 | + badge-minted: (is-some token-id), |
| 98 | + token-id: token-id |
| 99 | + }) |
| 100 | + err-code |
| 101 | + (if (is-eq err-code ERR_BADGE_ALREADY_MINTED) |
| 102 | + (ok { |
| 103 | + streak: new-streak, |
| 104 | + day: current-day, |
| 105 | + badge-minted: false, |
| 106 | + token-id: none |
| 107 | + }) |
| 108 | + (err err-code)) |
| 109 | + ) |
83 | 110 | ) |
| 111 | + ) |
84 | 112 | ) |
85 | 113 | ) |
86 | 114 | ) |
0 commit comments