kylefang/alex-dao
1
0
Fork 0
mirror of https://github.com/alexgo-io/alex-dao.git synced 2026-01-12 22:43:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from alexgo-io/fix/coinfabrik-audit

Browse Source 
fix: ME-01
This commit is contained in:
fiftyeightandeight
2022-02-21 11:15:26 +08:00
committed by GitHub
parent 8e69ad522d a98258e686
commit 460c281b6a
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Clarinet.toml
View File

@@ -1,7 +1,7 @@
[project]
name = "executor-dao"
requirements = []
costs_version = 2
repl.costs_version = 2
[contracts.age000-governance-token]
path = "contracts/extensions/age000-governance-token.clar"
@@ -298,8 +298,13 @@ depends_on = [
"age000-governance-token",
"fwp-wstx-alex-50-50-v1-01",
"fwp-wstx-wbtc-50-50-v1-01",
"trait-sip-010",
"trait-multisig-vote"
"trait-sip-010"
]
[contracts.agp019]
path = "alex-dao-proposals/agp019.clar"
depends_on = [
"token-apower"
]

2
alex-dao-proposals

Submodule alex-dao-proposals updated: 3710c50e99...62e118d77b

8
contracts/extensions/age003-emergency-execute.clar
View File

@@ -82,14 +82,14 @@
(let
(
(proposal-principal (contract-of proposal))
(signals (+ (get-signals proposal-principal) (if (has-signalled proposal-principal tx-sender) u0 u1)))
(signals (+ (get-signals proposal-principal) (if (has-signalled proposal-principal contract-caller) u0 u1)))
)
(asserts! (is-executive-team-member tx-sender) err-not-executive-team-member)
(asserts! (is-executive-team-member contract-caller) err-not-executive-team-member)
(asserts! (< block-height (var-get executive-team-sunset-height)) err-sunset-height-reached)
(and (>= signals (var-get executive-signals-required))
(try! (contract-call? .executor-dao execute proposal tx-sender))
(try! (contract-call? .executor-dao execute proposal contract-caller))
)
(map-set executive-action-signals {proposal: proposal-principal, team-member: tx-sender} true)
(map-set executive-action-signals {proposal: proposal-principal, team-member: contract-caller} true)
(map-set executive-action-signal-count proposal-principal signals)
(ok signals)
)

8
tests/dao_test.ts
View File

@@ -43,7 +43,9 @@ const agp015Address =
const agp017Address =
"ST1HTBVD3JG9C05J7HBJTHGR0GGW7KXW28M5JS8QE.agp017";
const agp018Address =
"ST1HTBVD3JG9C05J7HBJTHGR0GGW7KXW28M5JS8QE.agp018";
"ST1HTBVD3JG9C05J7HBJTHGR0GGW7KXW28M5JS8QE.agp018";
const agp019Address =
"ST1HTBVD3JG9C05J7HBJTHGR0GGW7KXW28M5JS8QE.agp019";
class DAO {
@@ -623,7 +625,7 @@ Clarinet.test({
Clarinet.test({
name: "DAO: agp014/15/18",
name: "DAO: agp014/15/18/19",
async fn(chain: Chain, accounts: Map<string, Account>) {
let deployer = accounts.get("deployer")!;
@@ -675,6 +677,8 @@ Clarinet.test({
// result.expectOk();
result = await DAOTest.executiveAction(deployer, agp018Address);
result.expectOk();
result = await DAOTest.executiveAction(deployer, agp019Address);
result.expectOk();
let call = chain.callReadOnlyFn(
"alex-reserve-pool",