Skip to content

Commit 3bb8c8c

Browse files
committed
chore: update limits and default values
1 parent db47c4d commit 3bb8c8c

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

contracts/xyz/XYZBroadcaster.vy

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ struct Message:
3838
MAX_BYTES: constant(uint256) = 1024
3939
MAX_MESSAGES: constant(uint256) = 8
4040

41+
DAY: constant(uint256) = 86400
42+
WEEK: constant(uint256) = 7 * DAY
4143

4244
admins: public(AdminSet)
4345
future_admins: public(AdminSet)
@@ -65,18 +67,25 @@ def __init__(_admins: AdminSet):
6567

6668

6769
@external
68-
def broadcast(_chain_id: uint256, _messages: DynArray[Message, MAX_MESSAGES], _ttl: uint256=7 * 86400):
70+
def broadcast(_chain_id: uint256, _messages: DynArray[Message, MAX_MESSAGES], _ttl: uint256=0):
6971
"""
70-
@notice Broadcast a sequence of messeages.
72+
@notice Broadcast a sequence of messages.
7173
@param _chain_id The chain id to have messages executed on.
7274
@param _messages The sequence of messages to broadcast.
73-
@param _ttl Time-to-leave for message if it's not executed.
75+
@param _ttl Time-to-leave for message if it's not executed. 0 will use default values.
7476
"""
7577
agent: Agent = self.agent[msg.sender]
7678
assert agent != empty(Agent) and len(_messages) > 0
77-
if agent != Agent.EMERGENCY: # Emergency votes should be emergent
78-
assert 86400 <= _ttl
79-
assert _ttl <= 21 * 86400
79+
ttl: uint256 = _ttl
80+
if agent == Agent.EMERGENCY:
81+
# Emergency votes should be brisk
82+
if ttl == 0:
83+
ttl = DAY # default
84+
assert ttl <= WEEK
85+
else:
86+
if ttl == 0:
87+
ttl = WEEK # default
88+
assert DAY <= ttl and ttl <= 3 * WEEK
8089

8190
digest: bytes32 = keccak256(_abi_encode(_messages))
8291
nonce: uint256 = self.nonce[agent][_chain_id]

0 commit comments

Comments
 (0)