Skip to content
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.

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

Vote for aggregated public key #4116

Closed
Closed
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a1a6a4c
feat: add check-not-prepare-phase to pox-4
friedger Sep 20, 2023
5ef133e
feat: add check-not-prepare-phase
friedger Nov 23, 2023
03e482f
chore: update boot/pox-4
friedger Nov 23, 2023
6f31254
feat: add event for revoke-delegate-stx
friedger Nov 23, 2023
a99cd10
fix(bns): adjust lease timings for epoch 2.4 simnet compatibility
moodmosaic Nov 24, 2023
8021824
Merge pull request #4087 from moodmosaic/feat/pox-4-simnet-lease-timi…
friedger Nov 28, 2023
097830c
chore: update boot/pox-4
friedger Nov 28, 2023
02ba907
chore: synthesise events for revoke-delegate-stx
friedger Nov 29, 2023
3757a97
feat: add unit tests in clarity
friedger Nov 29, 2023
6f3f983
chore: add log file for flow tests
friedger Nov 30, 2023
915fba7
chore: rename synthesize_pox_event_info, fix prepare phase length
friedger Nov 30, 2023
14c25bd
Merge branch 'next' into feat/pox-4-disallow-stacking-during-prepare-…
friedger Nov 30, 2023
486366b
chore: update pox-4-testnet
friedger Nov 30, 2023
7a3a8f7
chore: add revoke-delegate-stx to get_stacker
friedger Nov 30, 2023
7abb389
chore: push package-lock.json
friedger Dec 1, 2023
c4b0ba7
feat: add pox-4-aggregated-public-key.clar (WIP)
friedger Dec 1, 2023
3068fea
Merge branch 'feat/clarinet-flow-tests' into feat/pox-4-aggregated-pu…
friedger Dec 1, 2023
0304f2c
feat: add number of slots to vote
friedger Dec 3, 2023
117c02a
chore: add second state record
friedger Dec 3, 2023
347804a
chore: replace code with pox-4 contract
friedger Dec 9, 2023
64dbe25
feat: add check-not-prepare-phase to pox-4
friedger Sep 20, 2023
6ed2a25
chore: add check for stacking during prepare phase
friedger Dec 12, 2023
70e8d32
chore: re-add deleted code
friedger Dec 12, 2023
6b603a5
Merge branch 'feat/pox-4-disallow-stacking-during-prepare-phase' into…
friedger Dec 13, 2023
d7459a3
chore: fix typo
friedger Dec 13, 2023
07074b0
chore: move vote clar to pox-4
friedger Dec 15, 2023
9966053
chore: improve use of pox-4 boot code
friedger Dec 16, 2023
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
Prev Previous commit
Next Next commit
chore: update pox-4-testnet
friedger committed Nov 30, 2023
commit 486366b01376f7f5a414c9e6e4d83abc21210e15
19 changes: 19 additions & 0 deletions contrib/core-contract-tests/contracts/pox/pox-4-testnet.clar
Original file line number Diff line number Diff line change
@@ -225,6 +225,10 @@
{ amount: uint }
)

;; The stackers' aggregate public key
;; for the given reward cycle
(define-map aggregate-public-keys uint (buff 33))

;; Getter for stacking-rejectors
(define-read-only (get-pox-rejection (stacker principal) (reward-cycle uint))
(map-get? stacking-rejectors { stacker: stacker, reward-cycle: reward-cycle }))
@@ -1351,3 +1355,18 @@
u0
)
)

;; What is the given reward cycle's stackers' aggregate public key?
;; *New in Stacks 3.0*
(define-read-only (get-aggregate-public-key (reward-cycle uint))
(map-get? aggregate-public-keys reward-cycle)
)

;; Set the aggregate public key to the provided value
;; TODO: https://github.com/stacks-network/stacks-core/issues/4101
;; *New in Stacks 3.0*
(define-public (set-aggregate-public-key (reward-cycle uint) (aggregate-public-key (buff 33)))
(begin
(ok (map-set aggregate-public-keys reward-cycle aggregate-public-key))
)
)
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ describe("test pox-4 source code for testnet", () => {
)
.toString();
const concatPox4Testnet = poxTestnet + "\n" + pox4;
// uncomment next line to update pox-4-testnet.clar
// fs.writeFileSync("contracts/pox/pox-4-testnet.clar", concatPox4Testnet);
expect(concatPox4Testnet).toBe(pox4Testnet);
});
});