Skip to content

Commit

Permalink
Staking (mstable#195)
Browse files Browse the repository at this point in the history
* feat: Add StakedToken and Quest mechanism
* feat: Add hook into emission dials
* chore: Audit fixes
* chore: Test suite for StakedToken
* chore: Import historic vault deployments for upgrade

Co-authored-by: Nicholas Addison <[email protected]>
  • Loading branch information
superduck35 and naddison36 authored Sep 7, 2021
1 parent 5efc000 commit d93b0cc
Show file tree
Hide file tree
Showing 100 changed files with 22,349 additions and 1,305 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["push", "pull_request"]
on: ["push"]
name: Coverage
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-sol.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["push", "pull_request"]
on: ["push"]
name: Lint Solidity
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-ts.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["push", "pull_request"]
on: ["push"]
name: Lint Typescript
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-feeders.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Feeders
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-governance.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Governance
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-masset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Masset
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-polygon.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Polygon
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rewards.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Rewards
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-savings.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Savings
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-shared.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
on: ["pull_request_review"]
on: ["push"]
name: Test-Peripheral
jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .solcover.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ module.exports = {
"peripheral",
"savings/peripheral",
"upgradability",
"legacy",
],
}
4 changes: 3 additions & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"avoid-suicide": "error",
"avoid-sha3": "warn",
"compiler-version": ["warn", "^0.8.6"],
"func-visibility": ["warn", { "ignoreConstructors": true }]
"func-visibility": ["warn", { "ignoreConstructors": true }],
"not-rely-on-time": "off",
"no-empty-blocks": "off"
}
}
2 changes: 1 addition & 1 deletion contracts/feeders/FeederPool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { IMasset } from "../interfaces/IMasset.sol";
// Internal
import "../masset/MassetStructs.sol";
import { IFeederPool } from "../interfaces/IFeederPool.sol";
import { Initializable } from "@openzeppelin/contracts/utils/Initializable.sol";
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
import { InitializableToken } from "../shared/InitializableToken.sol";
import { PausableModule } from "../shared/PausableModule.sol";
import { InitializableReentrancyGuard } from "../shared/InitializableReentrancyGuard.sol";
Expand Down
Loading

0 comments on commit d93b0cc

Please sign in to comment.