Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add state diff proposal example #9

Merged
merged 5 commits into from
Aug 21, 2024
Merged

add state diff proposal example #9

merged 5 commits into from
Aug 21, 2024

Conversation

prateek105
Copy link
Collaborator

No description provided.

anajuliabit
anajuliabit requested changes Aug 1, 2024
View reviewed changes
src/mocks/state-diff/TokenWrapper.sol
import "@openzeppelin/token/ERC20/ERC20.sol";
import "@openzeppelin/access/Ownable.sol";

contract TokenWrapper is Ownable {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to avoid adding extra mocks to the repo you could use MockERC20Votes.sol

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have made this contract so that there are both ETH and ERC20 token actions. I don't think MockERC20Votes involves any ETH transfers.

src/proposals/state-diff/StateDiffTimelockProposal_01.sol
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of adding a new folder, could you please create a _03 proposal to simple-vault-timelock?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two reasons I added a new folder:

  1. This proposal is not related to a simple vault contract
  2. Integration tests assume that all the proposals before the latest proposal are executed on chain and only the latest proposal is simulated for running the tests. Also these integration tests are unrelated to the state diff proposal that I have created.

anajuliabit
anajuliabit previously approved these changes Aug 6, 2024
View reviewed changes
Copy link
Member

@anajuliabit anajuliabit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

ElliotFriedman
ElliotFriedman reviewed Aug 13, 2024
View reviewed changes
src/proposals/state-diff/StateDiffTimelockProposal_01.sol

function validate() public view override {
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

files needs a lint and then it should be good to merge!

@github-actions GitHub Actions
Copy link

Proposal output for src/proposals/arbitrum/ArbitrumProposal_02.sol:

------------------ Proposal Actions ------------------
  1). calling ARBITRUM_L1_UPGRADE_EXECUTOR @0x3ffFbAdAF827559da092217e474760E2b2c3CeDd with 0 eth and 0x1cff79cd000000000000000000000000a98dec0c8e0326756c956033bbf091081986d0ed00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000064e17f52e90000000000000000000000009ad46fac0cf7f790e5be05a0f15223935a0c0ada000000000000000000000000d92023e9d9911199a6711321d1277285e6d4e2db0000000000000000000000006801e4888a91180238a8c36594ec65797ec2dddf00000000000000000000000000000000000000000000000000000000 data.
  target: ARBITRUM_L1_UPGRADE_EXECUTOR @0x3ffFbAdAF827559da092217e474760E2b2c3CeDd
payload
  0x1cff79cd000000000000000000000000a98dec0c8e0326756c956033bbf091081986d0ed00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000064e17f52e90000000000000000000000009ad46fac0cf7f790e5be05a0f15223935a0c0ada000000000000000000000000d92023e9d9911199a6711321d1277285e6d4e2db0000000000000000000000006801e4888a91180238a8c36594ec65797ec2dddf00000000000000000000000000000000000000000000000000000000
  

  
----------------- Proposal Changes ---------------
  

 ARBITRUM_L1_UPGRADE_EXECUTOR @0x3ffFbAdAF827559da092217e474760E2b2c3CeDd:
  
 State Changes:
  Slot: 0x0000000000000000000000000000000000000000000000000000000000000097
  -  0x0000000000000000000000000000000000000000000000000000000000000001
  +  0x0000000000000000000000000000000000000000000000000000000000000002
  Slot: 0x0000000000000000000000000000000000000000000000000000000000000097
  -  0x0000000000000000000000000000000000000000000000000000000000000002
  +  0x0000000000000000000000000000000000000000000000000000000000000001
  

 ARBITRUM_L1_WETH_GATEWAY_PROXY @0xd92023E9d9911199a6711321D1277285e6d4e2db:
  
 State Changes:
  Slot: 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc
  -  0x0000000000000000000000004b8e9b3f253e68837bf719997b1eeb9e8f1960e2
  +  0x0000000000000000000000006801e4888a91180238a8c36594ec65797ec2dddf
  

------------------ Proposal Calldata ------------------
  0x7d5e81e2000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000264928c169a000000000000000000000000e6841d92b0c345144506576ec13ecf5103ac7f49000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001e401d5062a0000000000000000000000003fffbadaf827559da092217e474760e2b2c3cedd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000bb89aca7edae8f1a257ce58392bd8d38e7443210ca91e86d2b3d4384bfcc8a14000000000000000000000000000000000000000000000000000000000003f48000000000000000000000000000000000000000000000000000000000000000e41cff79cd000000000000000000000000a98dec0c8e0326756c956033bbf091081986d0ed00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000064e17f52e90000000000000000000000009ad46fac0cf7f790e5be05a0f15223935a0c0ada000000000000000000000000d92023e9d9911199a6711321d1277285e6d4e2db0000000000000000000000006801e4888a91180238a8c36594ec65797ec2dddf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a546869732070726f706f73616c20757067726164657320746865204c312077657468206761746577617900000000000000000000000000000000000000000000

## Setting up 1 EVM.

==========================

Chain 1

Estimated gas price: 3.201720778 gwei

Estimated total gas used for script: 298671

Estimated amount required: 0.000956261146486038 ETH

==========================

SIMULATION COMPLETE. To broadcast these transactions, add --broadcast and wallet configuration(s) to the previous command. See forge script --help for more.

Transactions saved to: /home/runner/work/fps-example-repo/fps-example-repo/broadcast/ArbitrumProposal_02.sol/1/dry-run/run-latest.json

Sensitive values saved to: /home/runner/work/fps-example-repo/fps-example-repo/cache/ArbitrumProposal_02.sol/1/dry-run/run-latest.json

@prateek105 prateek105 marked this pull request as ready for review August 13, 2024 14:53
ElliotFriedman
ElliotFriedman approved these changes Aug 21, 2024
View reviewed changes
Copy link
Contributor

@ElliotFriedman ElliotFriedman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@ElliotFriedman ElliotFriedman merged commit c1a8dcf into main Aug 21, 2024
4 checks passed
@ElliotFriedman ElliotFriedman deleted the feat/state-diff-proposal-example branch August 21, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ElliotFriedman ElliotFriedman ElliotFriedman approved these changes

@anajuliabit anajuliabit Awaiting requested review from anajuliabit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@prateek105 @ElliotFriedman @anajuliabit