Skip to content

Conversation

@cygnusv
Copy link
Member

@cygnusv cygnusv commented Sep 29, 2022

No description provided.

pdyraga
pdyraga previously approved these changes Sep 29, 2022
nkuba
nkuba previously approved these changes Sep 29, 2022
@nkuba nkuba enabled auto-merge September 29, 2022 10:11
@pdyraga pdyraga added this to the v1.2.0 milestone Sep 29, 2022
…ayout

A previous commit in the TokenStaking contract (6eaf4d5) introduced a potential change in the contract storage layout that is detected by the OZ Upgrades tool:

Error: New storage layout is incompatible

contracts/staking/TokenStaking.sol:130: Upgraded `slashingQueue` to an incompatible type
  - In struct TokenStaking.SlashingEvent[]
    - Bad upgrade to struct TokenStaking.SlashingEvent
  - In struct TokenStaking.SlashingEvent
    - Deleted `application`
      > Keep the variable even if unused

The good news is that this struct is still unused since there are no real applications running yet, so there's no consequences. As a workaround, we decided to tweak the OZ Upgrades layout file to adapt to the new layout. Going forward we will implement automatic checks that verify the layout of any potential change to the staking contract.
@cygnusv cygnusv dismissed stale reviews from nkuba and pdyraga via d25839c September 29, 2022 10:34
@cygnusv cygnusv requested review from nkuba and pdyraga September 29, 2022 10:37
@nkuba nkuba merged commit 4b1e527 into main Sep 29, 2022
@nkuba nkuba deleted the oz_and_friends branch September 29, 2022 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants