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

CCIP-019: Stack MIA Mining Treasury #76

Merged
merged 29 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0ead7f7
feat: add ccip-019
friedger Mar 22, 2024
324b2c1
Merge branch 'main' into ccip-019
friedger May 4, 2024
71265ba
chore: remove unused code
friedger May 4, 2024
0127f69
feat: add rewards-treasury
friedger May 4, 2024
f6df20b
chore: upgrade to support 2.5
friedger May 4, 2024
dcb97b6
Merge branch 'main' into ccip-019
friedger Jul 15, 2024
3372bc4
feat: add voting
friedger Jul 15, 2024
8d5e7d2
fix: use new clarinet toml for epoch 2.5+
friedger Jul 15, 2024
9496a7e
feat: add stxer simulation
friedger Jul 20, 2024
f0987f5
chore: rename simulation
friedger Jul 21, 2024
5e04323
fix: add permission to stack for stx rewards treasury
friedger Jul 21, 2024
cb6070f
fix: use testnet instead of mainnet addresses
whoabuddy Aug 1, 2024
4d799a0
chore: bump clarinet
whoabuddy Aug 7, 2024
40ef4fa
fix: make default clarinet latest version
whoabuddy Aug 7, 2024
a12f9f6
fix: use shorter contract name
whoabuddy Aug 7, 2024
03b0aa3
fix: update contract name and treasury name
whoabuddy Aug 7, 2024
081933b
fix: add ccip-015 trait
whoabuddy Aug 7, 2024
a8249ba
chore: add package lock and default deployment plan
whoabuddy Aug 7, 2024
80b09ea
fix: update stxer simulation with latest
whoabuddy Aug 7, 2024
43d7e79
fix: update support for stxer simulation
whoabuddy Aug 7, 2024
67382c9
fix: remove simnet plan, causes conflict with gh action
whoabuddy Aug 7, 2024
7fb0af5
fix: update all refs to mainnet except traits
whoabuddy Aug 7, 2024
212c65a
fix: update simulation until it passes
whoabuddy Aug 7, 2024
2840622
fix: print voter info after succesful vote
whoabuddy Aug 7, 2024
b24364f
fix: update link and hash for ccip-019
whoabuddy Aug 8, 2024
84ac617
fix: update name to match ccip, default cityId
whoabuddy Aug 8, 2024
a2db118
fix: use MIA_ID constant instead of fetching again during execution
whoabuddy Aug 8, 2024
417b7f5
fix: remove allow call for MIA in treasury
whoabuddy Aug 8, 2024
c85f110
chore: consistent spacing
whoabuddy Aug 8, 2024
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
1,484 changes: 1,484 additions & 0 deletions .cache/requirements/SP000000000000000000002Q6VF78.pox-4.clar

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .cache/requirements/SP000000000000000000002Q6VF78.pox-4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"epoch": "Epoch25",
"clarity_version": "Clarity2"
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"epoch": "Epoch25",
"clarity_version": "Clarity2"
}
4 changes: 2 additions & 2 deletions .github/workflows/clarinet-legacy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: "Check contract syntax (legacy)"
uses: docker://hirosystems/clarinet:1.8.0
with:
args: check
args: check -m Clarinet-legacy.toml
- name: "Run all contract tests (legacy)"
uses: docker://hirosystems/clarinet:1.8.0
with:
args: test --coverage
args: test --coverage -m Clarinet-legacy.toml
- name: "Upload code coverage"
uses: codecov/codecov-action@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clarinet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
mkdir -p ~/.clarinet
echo "enable_hints = false" >> ~/.clarinet/clarinetrc.toml
- name: "Check contract syntax"
uses: docker://hirosystems/clarinet:2.6.0
uses: docker://hirosystems/clarinet:2.8.0
with:
args: check
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
**/settings/Mainnet.toml
**/settings/Testnet.toml

dist

# removing to resolve issue with testnet reset
# will use files obtained locally beforehand
# .cache/
Expand All @@ -14,3 +16,4 @@
/coverage_report
history.txt
coverage.lcov
node_modules
Loading