Skip to content

Commit b20c442

Browse files
Updates github workflow and hardhat config, removes "legacy" info from governance contracts
Co-authored-by: Michalina <[email protected]>
1 parent e4ec5ae commit b20c442

File tree

5 files changed

+7
-24
lines changed

5 files changed

+7
-24
lines changed

.github/workflows/contracts.yml

-6
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,6 @@ jobs:
183183
- name: Install needed dependencies
184184
run: yarn install --frozen-lockfile
185185

186-
# If we don't remove the `keep-core` contracts from `node-modules`, the
187-
# `etherscan-verify` plugins tries to verify them, which is not desired.
188-
- name: Prepare for verification on Etherscan
189-
run: |
190-
rm -rf ./external/npm
191-
192186
- name: Verify contracts on Etherscan
193187
env:
194188
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}

.github/workflows/npm.yml

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
registry-url: "https://registry.npmjs.org"
2828
cache: "yarn"
2929

30+
- name: Install needed dependencies
31+
run: yarn install --frozen-lockfile
32+
3033
# Deploy contracts to a local network to generate deployment artifacts that
3134
# are required by dashboard compilation.
3235
- name: Deploy contracts

contracts/governance/StakerGovernorVotes.sol

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import "./GovernorParameters.sol";
1919
import "./IVotesHistory.sol";
2020

2121
/// @title StakerGovernorVotes
22-
/// @notice Staker DAO voting power extraction from staked T positions,
23-
// including legacy stakes (NU/KEEP).
22+
/// @notice Staker DAO voting power extraction from staked T positions.
2423
abstract contract StakerGovernorVotes is GovernorParameters {
2524
IVotesHistory public immutable staking;
2625

@@ -29,8 +28,7 @@ abstract contract StakerGovernorVotes is GovernorParameters {
2928
}
3029

3130
/// @notice Read the voting weight from the snapshot mechanism in the T
32-
/// staking contracts. Note that this also tracks legacy stakes
33-
/// (NU/KEEP).
31+
/// staking contracts.
3432
/// @param account Delegate account with T staking voting power
3533
/// @param blockNumber The block number to get the vote balance at
3634
/// @dev See {IGovernor-getVotes}

contracts/governance/TokenholderGovernorVotes.sol

+2-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import "./IVotesHistory.sol";
2020

2121
/// @title TokenholderGovernorVotes
2222
/// @notice Tokenholder DAO voting power extraction from both liquid and staked
23-
/// T token positions, including legacy stakes (NU/KEEP).
23+
/// T token positions.
2424
abstract contract TokenholderGovernorVotes is GovernorParameters {
2525
IVotesHistory public immutable token;
2626
IVotesHistory public immutable staking;
@@ -35,10 +35,6 @@ abstract contract TokenholderGovernorVotes is GovernorParameters {
3535
/// two voting power sources:
3636
/// - Liquid T, tracked by the T token contract
3737
/// - Stakes in the T network, tracked by the T staking contract.
38-
/// Note that this also tracks legacy stakes (NU/KEEP); legacy
39-
/// stakes count for tokenholders' voting power, but not for the
40-
/// total voting power of the Tokenholder DAO
41-
/// (see {_getPastTotalSupply}).
4238
/// @param account Tokenholder account in the T network
4339
/// @param blockNumber The block number to get the vote balance at
4440
/// @dev See {IGovernor-getVotes}
@@ -57,10 +53,7 @@ abstract contract TokenholderGovernorVotes is GovernorParameters {
5753
/// @notice Compute the total voting power for Tokenholder DAO. Note how it
5854
/// only uses the token total supply as source, as native T tokens
5955
/// that are staked continue existing, but as deposits in the
60-
/// staking contract. However, legacy stakes can't contribute to the
61-
/// total voting power as they're already implicitly counted as part
62-
/// of Vending Machines' liquid balance; hence, we only need to read
63-
/// total voting power from the token.
56+
/// staking contract.
6457
/// @param blockNumber The block number to get the vote power at
6558
function _getPastTotalSupply(uint256 blockNumber)
6659
internal

hardhat.config.ts

-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ const config: HardhatUserConfig = {
8080
// For hardhat environment we can fork the mainnet, so we need to point it
8181
// to the contract artifacts.
8282
hardhat: process.env.FORKING_URL ? ["./external/mainnet"] : [],
83-
sepolia: ["./external/sepolia"],
8483
mainnet: ["./external/mainnet"],
8584
},
8685
},
@@ -93,10 +92,6 @@ const config: HardhatUserConfig = {
9392
thresholdCouncil: {
9493
mainnet: "0x9F6e831c8F8939DC0C830C6e492e7cEf4f9C2F5f",
9594
},
96-
keepRegistryKeeper: {
97-
default: 1, // same as the deployer
98-
sepolia: "0x68ad60CC5e8f3B7cC53beaB321cf0e6036962dBc",
99-
},
10095
},
10196
mocha: {
10297
timeout: 60000,

0 commit comments

Comments
 (0)