iamchrissmith commented 2 years ago

Description

Contribution Checklist

[ ] PR title starts with (PE-<TICKET_NUMBER>)
[ ] Code approved
[ ] Tests approved
[ ] CI Tests pass

Checklist

[ ] Every contract variable/method declared as public/external private/internal
[x] Consider if this PR needs the officeHours modifier
[ ] Verify expiration (4 days monthly and 30 days for the rest)
[ ] Verify hash in the description matches here
[ ] Validate all addresses used are in changelog or known
[ ] Notify any external teams affected by the spell so they have the opportunity to review
[ ] Deploy spell ETH_GAS="XXX" ETH_GAS_PRICE="YYY" make deploy
[ ] Verify mainnet contract on etherscan
[ ] Change test to use mainnet spell address and deploy timestamp
[ ] Run make date="YYYY-MM-DD" archive-spell to make an archive directory and copy DssSpell.sol, DssSpell.t.sol, and DssSpell.t.base.sol
[ ] squash and merge this PR

iamchrissmith commented 2 years ago

@krzkaczor tagging you for the Optimism Dai recovery to make sure I understood things correctly

https://github.com/makerdao/spells-mainnet/pull/214/files#diff-c9c3998420c475f01de841ca5283ea49ce6c99080a8c6a3fdae77b097bef6778R86-R92

and test

https://github.com/makerdao/spells-mainnet/pull/214/files#diff-cd597c47b9a6e2bae57aab767ee9e3d5bb3d8edeb3a2248b4519b9af791cb468R64-R83

talbaneth commented 2 years ago

Tests pass: Running 14 tests for src/DssSpell.t.sol:DssSpellTest [PASS] testFail_notScheduled() (gas: 4661) [PASS] test_auth_in_sources() (gas: 281473904839054) [PASS] test_use_eta() (gas: 324298) [PASS] testOnTime() (gas: 990152) [PASS] test_nextCastTime() (gas: 325171) [PASS] testFailTooEarly() (gas: 3595) [PASS] test_bytecode_matches() (gas: 1494324) [PASS] test_auth() (gas: 281473913170777) [PASS] testSpellIsCast_GENERAL() (gas: 8484169) [PASS] testFailWrongDay() (gas: 3528) [PASS] testCastCost() (gas: 991719) [PASS] testDelegatePayments() (gas: 1014269) [PASS] testFailTooLate() (gas: 3527) [PASS] testOptimismRecovery() (gas: 1000229)

julienmartinlevrai commented 2 years ago

:heavy_check_mark: good for deployment

dapp-test: rpc block: latest
Running 14 tests for src/DssSpell.t.sol:DssSpellTest
[PASS] testFail_notScheduled() (gas: 4736)
[PASS] test_auth_in_sources() (gas: 281473904814750)
[PASS] test_use_eta() (gas: 323931)
[PASS] testOnTime() (gas: 989773)
[PASS] test_nextCastTime() (gas: 324773)
[PASS] testFailTooEarly() (gas: 3457)
[PASS] test_bytecode_matches() (gas: 1237845)
[PASS] test_auth() (gas: 281473912900233)
[PASS] testSpellIsCast_GENERAL() (gas: 8157650)
[PASS] testFailWrongDay() (gas: 3677)
[PASS] testCastCost() (gas: 991637)
[PASS] testDelegatePayments() (gas: 1013213)
[PASS] testFailTooLate() (gas: 3853)
[PASS] testOptimismRecovery() (gas: 999987)

(tested with dapptools and optimizations on)

brianmcmichael commented 2 years ago

dapp-test: rpc block: latest
Running 14 tests for src/DssSpell.t.sol:DssSpellTest
[PASS] testFail_notScheduled() (gas: 4780)
[PASS] test_auth_in_sources() (gas: 281473904814750)
[PASS] test_use_eta() (gas: 323975)
[PASS] testOnTime() (gas: 989861)
[PASS] test_nextCastTime() (gas: 324861)
[PASS] testFailTooEarly() (gas: 3545)
[PASS] test_bytecode_matches() (gas: 1265615)
[PASS] test_auth() (gas: 281473912900233)
[PASS] testSpellIsCast_GENERAL() (gas: 8185548)
[PASS] testFailWrongDay() (gas: 3765)
[PASS] testCastCost() (gas: 991725)
[PASS] testDelegatePayments() (gas: 1013301)
[PASS] testFailTooLate() (gas: 3941)
[PASS] testOptimismRecovery() (gas: 1000075)

julienmartinlevrai commented 2 years ago

Tests pass but contract is not verified: https://etherscan.io/address/0xdd5052bfc4d281793653b0037d46cc2d8d1fd1b5#code

dapp-test: rpc block: latest
Running 14 tests for src/DssSpell.t.sol:DssSpellTest
[PASS] testFail_notScheduled() (gas: 12280)
[PASS] test_auth_in_sources() (gas: 281473904816812)
[PASS] test_use_eta() (gas: 333475)
[PASS] testOnTime() (gas: 1001861)
[PASS] test_nextCastTime() (gas: 334361)
[PASS] testFailTooEarly() (gas: 8545)
[PASS] test_bytecode_matches() (gas: 1281615)
[PASS] test_auth() (gas: 281473912902296)
[PASS] testSpellIsCast_GENERAL() (gas: 9464158)
[PASS] testFailWrongDay() (gas: 8765)
[PASS] testCastCost() (gas: 1003725)
[PASS] testDelegatePayments() (gas: 1025301)
[PASS] testFailTooLate() (gas: 8941)
[PASS] testOptimismRecovery() (gas: 1012075)

brianmcmichael commented 2 years ago

dapp-test: rpc block: latest
Running 14 tests for src/DssSpell.t.sol:DssSpellTest
[PASS] testFail_notScheduled() (gas: 12280)
[PASS] test_auth_in_sources() (gas: 281473904816812)
[PASS] test_use_eta() (gas: 333475)
[PASS] testOnTime() (gas: 1001861)
[PASS] test_nextCastTime() (gas: 334361)
[PASS] testFailTooEarly() (gas: 8545)
[PASS] test_bytecode_matches() (gas: 1281615)
[PASS] test_auth() (gas: 281473912902296)
[PASS] testSpellIsCast_GENERAL() (gas: 9464158)
[PASS] testFailWrongDay() (gas: 8765)
[PASS] testCastCost() (gas: 1003725)
[PASS] testDelegatePayments() (gas: 1025301)
[PASS] testFailTooLate() (gas: 8941)
[PASS] testOptimismRecovery() (gas: 1012075)

There seems to be an issue with the verify script and the new structure. It's now verified manually.

brianmcmichael commented 2 years ago

https://www.diffchecker.com/9oCezcqH

makerdao / spells-mainnet

(PE-805) Jan 14 2022 #214

Description

Contribution Checklist

Checklist