Skip to content

Commit 5ae137d

Browse files
committed
use immutables
1 parent c81dbdc commit 5ae137d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

contracts/main/LiquidityGauge.vy

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ balanceOf: public(HashMap[address, uint256])
112112
totalSupply: public(uint256)
113113
allowance: public(HashMap[address, HashMap[address, uint256]])
114114

115-
name: public(String[64])
116-
symbol: public(String[40])
115+
name: public(immutable(String[64]))
116+
symbol: public(immutable(String[40]))
117117

118118
# ERC2612
119119
nonces: public(HashMap[address, uint256])
120120

121121
# Gauge
122-
factory: public(address)
122+
factory: public(immutable(address))
123+
lp_token: public(immutable(address))
123124
manager: public(address)
124-
lp_token: public(address)
125125

126126
is_killed: public(bool)
127127

@@ -170,23 +170,23 @@ def __init__(_lp_token: address):
170170
@notice Contract constructor
171171
@param _lp_token Liquidity Pool contract address
172172
"""
173-
self.lp_token = _lp_token
174-
self.factory = msg.sender
173+
lp_token = _lp_token
174+
factory = msg.sender
175175
self.manager = msg.sender
176176

177-
symbol: String[32] = ERC20Extended(_lp_token).symbol()
178-
name: String[64] = concat("Curve.fi ", symbol, " Gauge Deposit")
177+
_symbol: String[32] = ERC20Extended(_lp_token).symbol()
178+
_name: String[64] = concat("Curve.fi ", symbol, " Gauge Deposit")
179179

180-
self.name = name
181-
self.symbol = concat(symbol, "-gauge")
180+
name = _name
181+
symbol = concat(_symbol, "-gauge")
182182

183183
self.period_timestamp[0] = block.timestamp
184184
self.inflation_params = (
185185
(CRV20(CRV).future_epoch_time_write() << 216)
186186
+ CRV20(CRV).rate()
187187
)
188188

189-
NAME_HASH = keccak256(name)
189+
NAME_HASH = keccak256(_name)
190190
salt = block.prevhash
191191
CACHED_CHAIN_ID = chain.id
192192
CACHED_DOMAIN_SEPARATOR = keccak256(
@@ -426,7 +426,7 @@ def deposit(_value: uint256, _addr: address = msg.sender, _claim_rewards: bool =
426426

427427
self._update_liquidity_limit(_addr, new_balance, total_supply)
428428

429-
ERC20(self.lp_token).transferFrom(msg.sender, self, _value)
429+
ERC20(lp_token).transferFrom(msg.sender, self, _value)
430430

431431
log Deposit(_addr, _value)
432432
log Transfer(empty(address), _addr, _value)
@@ -455,7 +455,7 @@ def withdraw(_value: uint256, _claim_rewards: bool = False):
455455

456456
self._update_liquidity_limit(msg.sender, new_balance, total_supply)
457457

458-
ERC20(self.lp_token).transfer(msg.sender, _value)
458+
ERC20(lp_token).transfer(msg.sender, _value)
459459

460460
log Withdraw(msg.sender, _value)
461461
log Transfer(msg.sender, empty(address), _value)
@@ -669,7 +669,7 @@ def set_gauge_manager(_gauge_manager: address):
669669
method, but only for the gauge which they are the manager of.
670670
@param _gauge_manager The account to set as the new manager of the gauge.
671671
"""
672-
assert msg.sender in [self.manager, Factory(self.factory).admin()] # dev: only manager or factory admin
672+
assert msg.sender in [self.manager, Factory(factory).admin()] # dev: only manager or factory admin
673673

674674
self.manager = _gauge_manager
675675
log SetGaugeManager(_gauge_manager)
@@ -719,7 +719,7 @@ def add_reward(_reward_token: address, _distributor: address):
719719
@param _reward_token The token to add as an additional reward
720720
@param _distributor Address permitted to fund this contract with the reward token
721721
"""
722-
assert msg.sender in [self.manager, Factory(self.factory).admin()] # dev: only manager or factory admin
722+
assert msg.sender in [self.manager, Factory(factory).admin()] # dev: only manager or factory admin
723723
assert _distributor != empty(address) # dev: distributor cannot be zero address
724724

725725
reward_count: uint256 = self.reward_count
@@ -740,7 +740,7 @@ def set_reward_distributor(_reward_token: address, _distributor: address):
740740
"""
741741
current_distributor: address = self.reward_data[_reward_token].distributor
742742

743-
assert msg.sender in [current_distributor, Factory(self.factory).admin(), self.manager]
743+
assert msg.sender in [current_distributor, Factory(factory).admin(), self.manager]
744744
assert current_distributor != empty(address)
745745
assert _distributor != empty(address)
746746

@@ -754,7 +754,7 @@ def set_killed(_is_killed: bool):
754754
@dev When killed, the gauge always yields a rate of 0 and so cannot mint CRV
755755
@param _is_killed Killed status to set
756756
"""
757-
assert msg.sender == Factory(self.factory).admin() # dev: only owner
757+
assert msg.sender == Factory(factory).admin() # dev: only owner
758758

759759
self.is_killed = _is_killed
760760

0 commit comments

Comments
 (0)