Skip to content

Closes #652 #798

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

Open
mansur-codes wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Closes #652 #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93774dc
feat(admin): add ContractUpgradeTarget mapping for contract ID to WAS…
mansur-codes Aug 26, 2026
575ff95
test(admin): add missing test snapshots for ContractUpgradeTarget map…
mansur-codes Aug 26, 2026
b100ae1
Ci issues fix
mansur-codes Aug 26, 2026
fb93614
Fix flaky CI test: pin Rust toolchain, refresh auth mocks, strict ass…
mansur-codes Aug 26, 2026
3f4629d
Merge branch 'main' into main
mansur-codes Aug 26, 2026
56fd941
Fix: move ensure_not_paused before reentrancy_guard in mint, batch_mi…
mansur-codes Aug 26, 2026
5f8eeee
Merge remote-tracking branch 'upstream/main'
mansur-codes Aug 26, 2026
0c75775
chore: sync with upstream main
mansur-codes Aug 26, 2026
7af16cc
fix(admin): simplify boolean expression to satisfy clippy
mansur-codes Aug 26, 2026
01ac86e
chore: sync with upstream main, resolve token and snapshot conflicts
mansur-codes Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.96.0
targets: wasm32-unknown-unknown
components: rustfmt, clippy

Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/src/tests/proptest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ proptest! {
}

for (i, role) in GRANTABLE_ROLES.iter().enumerate() {
let still_held = (mask >> i) & 1 == 1 && !((revoke_mask >> i) & 1 == 1);
let still_held = (mask >> i) & 1 == 1 && ((revoke_mask >> i) & 1 != 1);
prop_assert_eq!(client.has_role(role, &holder), still_held);
}
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.100.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.23.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.27.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.28.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.30.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.35.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Admin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.37.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -287,7 +288,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.39.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "SuperAdmin"
"symbol": "Pauser"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.41.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Pauser"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.42.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.43.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
3 changes: 1 addition & 2 deletions contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.44.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -260,7 +259,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Admin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "SuperAdmin"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.47.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "Minter"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.48.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"vec": [
{
"symbol": "Minter"
"symbol": "Pauser"
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion contracts/admin/test_snapshots/tests/proptest/fuzz_admin_implicitly_has_all_roles.51.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"nonce": 0
},
"auth": [
[],
[],
[],
[
Expand Down Expand Up @@ -259,7 +260,7 @@
{
"vec": [
{
"symbol": "Admin"
"symbol": "SuperAdmin"
}
]
},
Expand Down
Loading
Loading