Code

Add support for pox-3#59

Code

Merged

whoabuddy merged 48 commits intomaincitycoins/protocol:mainfrom fix/support-pox-2citycoins/protocol:fix/support-pox-2Copy head branch name to clipboardAug 31, 2023

+6,305-62

Commits

Commits on Mar 30, 2023

• fix: add template for new contracts based on originals

  Show description for a053d6f
  whoabuddy

  committed
  a053d6f

  Copy full SHA for a053d6f

Commits on May 5, 2023

• fix: update delegate/revoke to pox-3

  whoabuddy

  committed
  30802fb

  Copy full SHA for 30802fb

• fix: update mining cityinfo call to mining-v2

  whoabuddy

  committed
  0fee8c6

  Copy full SHA for 0fee8c6

• fix: update ccip-014 proposal name and code

  whoabuddy

  committed
  c13c516

  Copy full SHA for c13c516

Commits on May 10, 2023

• fix: add mining-v2 and fix ccip014 in toml

  whoabuddy

  committed
  28e79b4

  Copy full SHA for 28e79b4

• fix: add mock pox-3 contract

  Show description for 105afd9
  whoabuddy

  committed
  105afd9

  Copy full SHA for 105afd9

Commits on May 12, 2023

• fix: add mining shutdown to ccip-014

  Show description for 295c640
  whoabuddy

  committed
  295c640

  Copy full SHA for 295c640

Commits on May 16, 2023

• fix: add mainnet/testnet constants

  whoabuddy

  committed
  db5bcb1

  Copy full SHA for db5bcb1

• fix: update to use testnet pox3 and fix check errors

  Show description for c7d5d1d
  whoabuddy

  committed
  c7d5d1d

  Copy full SHA for c7d5d1d

• chore: bump clarinet version in tests

  whoabuddy

  committed
  34eed16

  Copy full SHA for 34eed16

Commits on May 18, 2023

• fix: add voting fn similar to ccip-011

  Show description for f53389e
  whoabuddy

  committed
  f53389e

  Copy full SHA for f53389e

• fix: add voting block heights

  whoabuddy

  committed
  2322ab5

  Copy full SHA for 2322ab5

Commits on May 19, 2023

• chore: incorporate upstream changes

  whoabuddy

  committed
  62d8b66

  Copy full SHA for 62d8b66

• Merge branch 'fix/support-pox-2' of github.com:citycoins/protocol into fix/support-pox-2

  whoabuddy

  committed
  2642b73

  Copy full SHA for 2642b73

• fix: make clarinet check pass

  whoabuddy

  committed
  479fbff

  Copy full SHA for 479fbff

• fix: update mining tests for claims

  Show description for 204b259
  whoabuddy

  committed
  204b259

  Copy full SHA for 204b259

Commits on May 23, 2023

• fix: bump epoch in Clarinet.toml to 2.4

  whoabuddy

  committed
  f826fcb

  Copy full SHA for f826fcb

• fix: add mia and nyc voting calculations

  whoabuddy

  committed
  0568700

  Copy full SHA for 0568700

• fix: correct block heights and add BTC/STX equiv

  whoabuddy

  committed
  81067f9

  Copy full SHA for 81067f9

• fix: add check that vote passed to execute

  whoabuddy

  committed
  a7d7f60

  Copy full SHA for a7d7f60

• fix: clone mining models and test for v2

  whoabuddy

  committed
  b121315

  Copy full SHA for b121315

• fix: update mining tests to use same model

  Show description for 941e8fd
  whoabuddy

  committed
  941e8fd

  Copy full SHA for 941e8fd

• fix: clone test proposals and update utils

  whoabuddy

  committed
  773475d

  Copy full SHA for 773475d

Commits on May 24, 2023

• fix: remove checks for before vote starts

  Show description for 01fdf62
  whoabuddy

  committed
  01fdf62

  Copy full SHA for 01fdf62

• fix: add trait for ccip-011 vote function

  Show description for 866d44d
  whoabuddy

  committed
  866d44d

  Copy full SHA for 866d44d

• fix: update ccip-011 ref to ccip-015

  Show description for 2f349c8
  whoabuddy

  committed
  2f349c8

  Copy full SHA for 2f349c8

Commits on May 25, 2023

• fix: minor cleanup/changes

  whoabuddy

  committed
  e013b98

  Copy full SHA for e013b98

• fix: add var to track vote active

  whoabuddy

  committed
  5f12ade

  Copy full SHA for 5f12ade

Commits on May 26, 2023

• fix: add idea for test abstraction

  whoabuddy

  committed
  6b0ae28

  Copy full SHA for 6b0ae28

Commits on May 27, 2023

• fix: prep model and common for ccip014 tests

  whoabuddy

  committed
  62fb43d

  Copy full SHA for 62fb43d

• fix: add initial ccip-014 tests

  Show description for 9b3e4f3
  whoabuddy

  committed
  9b3e4f3

  Copy full SHA for 9b3e4f3

• fix: add ccip-014 tests, fixes #62

  whoabuddy

  committed
  e58dff1

  Copy full SHA for e58dff1

• fix: add tests for mining before/after

  whoabuddy

  committed
  835dd3f

  Copy full SHA for 835dd3f

• fix: add missed cycle payouts and related tests

  whoabuddy

  committed
  d2855e5

  Copy full SHA for d2855e5

• fix: update pool operator for payouts

  whoabuddy

  committed
  66786a2

  Copy full SHA for 66786a2

• fix: skip mining-v2 check since not enabled yet

  whoabuddy

  committed
  7f7eccd

  Copy full SHA for 7f7eccd

• fix: remove v2 mining tests in favor of ccip-014 testing

  Show description for 188d41c
  whoabuddy

  committed
  188d41c

  Copy full SHA for 188d41c

• fix: add commit hash for ccip-014

  whoabuddy

  committed
  2da6808

  Copy full SHA for 2da6808

• fix: disable ccd006-v2 until ccip014 activates

  whoabuddy

  committed
  cf74cd2

  Copy full SHA for cf74cd2

Commits on May 29, 2023

• fix: create clone of ccip-014 as v2

  Show description for 70ec80c
  whoabuddy

  committed
  70ec80c

  Copy full SHA for 70ec80c

• chore: use latest version of code

  whoabuddy

  committed
  c5d60f4

  Copy full SHA for c5d60f4

• fix: remove past cycle payout code

  whoabuddy

  committed
  366fe99

  Copy full SHA for 366fe99

• fix: remove vote related code

  whoabuddy

  committed
  1ab5334

  Copy full SHA for 1ab5334

• fix: cleanup code and add check to ccip014 voting data

  whoabuddy

  committed
  a5d3056

  Copy full SHA for a5d3056

Commits on Aug 30, 2023

• fix: add models and tests for ccip014-pox-3-v2

  whoabuddy

  committed
  4b043b6

  Copy full SHA for 4b043b6

• fix: add ccd006-citycoin-mining-v2 tests

  whoabuddy

  committed
  f1ff69e

  Copy full SHA for f1ff69e

• fix: add ccd002-treasury-v2 tests

  whoabuddy

  committed
  478dc48

  Copy full SHA for 478dc48

• fix: add read-only tests to ccip014-pox-3

  whoabuddy

  committed
  da0d488

  Copy full SHA for da0d488