OETH Base deploy script #2061

PraneshASP · 2024-05-16T07:57:18Z

If you made a contract change, make sure to complete the checklist below before merging it in master.

Refer to our documentation for more details about contract security best practices.

Contract change checklist:

Code reviewed by 2 reviewers.
Copy & paste code review security checklist below this checklist.
Unit tests pass
Slither tests pass with no warning
Echidna tests pass if PR includes changes to OUSD contract (not automated, run manually on local)

sparrowDom · 2024-05-17T08:49:51Z

contracts/deploy/base/092_woeth_on_base.js

+  deployWithConfirmation,
+  withConfirmation,
+} = require("../../utils/deploy");
+const { getTxOpts } = require("../../utils/tx");


You can rename this file to 002_woeth_on_base.js

sparrowDom

Aside from a minor file rename, the CI seems to not work. Would be cool that before deployment the all the unit & fork tests in the CI succeed

codecov · 2024-05-17T10:42:24Z

Codecov Report

Attention: Patch coverage is 94.96403% with 7 lines in your changes are missing coverage. Please review.

Please upload report for BASE (PraneshASP/aerodrome-amo@4fbad41). Learn more about missing BASE report.

Files	Patch %	Lines
contracts/contracts/harvest/OETHBaseHarvester.sol	84.00%	4 Missing ⚠️
contracts/contracts/harvest/OETHHarvester.sol	97.29%	2 Missing ⚠️
...tracts/contracts/harvest/AbstractHarvesterBase.sol	95.65%	1 Missing ⚠️

Additional details and impacted files

@@                     Coverage Diff                     @@
##             PraneshASP/aerodrome-amo    #2061   +/-   ##
===========================================================
  Coverage                            ?   62.55%           
===========================================================
  Files                               ?       64           
  Lines                               ?     3213           
  Branches                            ?      823           
===========================================================
  Hits                                ?     2010           
  Misses                              ?     1199           
  Partials                            ?        4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

shahthepro

Few comments inline. Random question: Storage layout file isn't updated?

shahthepro · 2024-05-17T11:17:27Z

contracts/fork-test.sh

@@ -80,6 +80,10 @@ main()
            # Run all files with `.holesky.fork-test.js` suffix when no file name param is given
            # pass all other params along
            params+="test/**/*.holesky.fork-test.js"
+        elif [[ $FORK_NETWORK_NAME == "holesky" ]]; then


Should this be base?

good catch, changed.

shahthepro · 2024-05-17T11:17:42Z

contracts/fork-test.sh

@@ -101,7 +105,7 @@ main()
        FORK=true IS_TEST=true npx --no-install hardhat coverage --testfiles "${params[@]}"
    else
        echo "Running fork tests..."
-        FORK=true IS_TEST=true npx --no-install hardhat test ${params[@]}
+        FORK=true IS_TEST=true npx --no-install hardhat test ${params[@]} --show-stack-traces


why this change?

shahthepro · 2024-05-17T11:19:12Z

contracts/hardhat.config.js

@@ -195,6 +205,8 @@ module.exports = {
        process.env.FORK === "true"
          ? isHoleskyFork
            ? HOLESKY_DEPLOYER
+            : isBaseFork
+            ? BASE_DEPLOYER


I don't agree with this change personally. If we change the governor on fork, we are deploying/testing the contracts in a state that's gonna be completely different from mainnet.

Agreed, this has been removed.

shahthepro · 2024-05-17T11:20:31Z

contracts/test/_global-hooks.js

+    const isArbTestFile = s.file.endsWith(".arb.fork-test.js");
+    const isBaseTestFile = s.file.endsWith(".base.fork-test.js");
+
+    if (isMainnetForkTest) {


I think I changed the order and fixed it in some PR. isMainnetForkTestFile should always be at the end and should always be fully spread like isMainnetForkTestFile && !isHoleskeyTestFile && !isArbTestFile

Thanks for the fix

shahthepro · 2024-05-17T11:21:16Z

contracts/utils/hardhat-helpers.js

@@ -5,14 +5,19 @@ const isFork = process.env.FORK === "true";
 const isArbitrumFork = process.env.FORK_NETWORK_NAME === "arbitrumOne";
 const isHoleskyFork = process.env.FORK_NETWORK_NAME === "holesky";
 const isHolesky = process.env.NETWORK_NAME === "holesky";
+const isBase = process.env.NETWORK_NAME === "base";


checking chainId would be much better here

Yup agreed, much safer

…nProtocol/origin-dollar into PraneshASP/oethbase-deploy

github-actions · 2024-05-17T13:45:59Z

	Warnings
⚠️	👀 This PR needs at least 2 reviewers

Generated by 🚫 dangerJS against 409946a

…nProtocol/origin-dollar into PraneshASP/oethbase-deploy

* wip * refactor: update deploy scripts to use guardian

PraneshASP added 2 commits May 16, 2024 13:26

feat: oethcore deployment

d808477

chore: fix deployment setup

2cfb600

PraneshASP marked this pull request as ready for review May 16, 2024 11:03

PraneshASP requested review from sparrowDom, DanielVF, naddison36 and shahthepro as code owners May 16, 2024 11:03

sparrowDom reviewed May 17, 2024

View reviewed changes

sparrowDom and others added 3 commits May 17, 2024 14:32

chore: update global hook

5708edf

config: update defi.yml

d61eddc

config: add base fork tests to defi.yml

1ba92ec

shahthepro reviewed May 17, 2024

View reviewed changes

shahthepro and others added 5 commits May 17, 2024 15:50

Fix order of comparison

4b27348

Minor tweaks

2897cf6

Fund correct deployer on fork

6029036

fix: tests

2422588

Merge branch 'PraneshASP/oethbase-deploy' of https://github.com/Origi…

5bd9678

…nProtocol/origin-dollar into PraneshASP/oethbase-deploy

PraneshASP added 6 commits May 17, 2024 19:24

chore: fix tests

d3587b2

chore: remove stack trace flag

71220cf

chore: fix typo

53915ec

chore: fix test

d4bf243

fix: base fork test fixture

92925ec

chore: rename deployment file

c124257

PraneshASP requested review from sparrowDom and shahthepro May 17, 2024 15:40

PraneshASP marked this pull request as draft May 20, 2024 09:26

feat: OETHBase Vault base fork tests

c03aa17

PraneshASP and others added 16 commits May 21, 2024 17:13

fix: unit tests

52b6b9d

feat: add more fork tests

abf546d

feat: refactor deploy actions, fixture and fork test

5a7f85a

chore: minor optimization

f9c17b4

refactor: fix deploy actions and fixtures

3fabd3f

refactor: fork tests

74a97ad

Merge branch 'PraneshASP/aerodrome-amo' into PraneshASP/oethbase-deploy

f91e164

refactor: harvester contracts

bd09e83

Merge branch 'PraneshASP/oethbase-deploy' of https://github.com/Origi…

1b5a893

…nProtocol/origin-dollar into PraneshASP/oethbase-deploy

refactor: tests and deploy action

e994d67

chore: more refactoring

ac3e009

Update deploy scripts to use Guardian address (#2075)

b379f15

* wip * refactor: update deploy scripts to use guardian

chore: rename AeroHarvester -> OETHBaseHarvester

660aa4f

refactor: abstract oracle contract

826361f

chore: fmt

4d1cc4c

refactor: base harvester aerodrome route

409946a

PraneshASP marked this pull request as ready for review May 28, 2024 13:16

PraneshASP merged commit 1522fe1 into PraneshASP/aerodrome-amo May 28, 2024
12 of 16 checks passed

PraneshASP deleted the PraneshASP/oethbase-deploy branch May 28, 2024 13:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OETH Base deploy script #2061

OETH Base deploy script #2061

PraneshASP commented May 16, 2024

sparrowDom May 17, 2024

PraneshASP May 17, 2024

sparrowDom left a comment

codecov bot commented May 17, 2024 •

edited

shahthepro left a comment

shahthepro May 17, 2024

PraneshASP May 17, 2024

shahthepro May 17, 2024

PraneshASP May 17, 2024

shahthepro May 17, 2024

PraneshASP May 17, 2024

shahthepro May 17, 2024

PraneshASP May 17, 2024

shahthepro May 17, 2024

sparrowDom May 17, 2024

github-actions bot commented May 17, 2024 •

edited

OETH Base deploy script #2061

OETH Base deploy script #2061

Conversation

PraneshASP commented May 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sparrowDom left a comment

Choose a reason for hiding this comment

codecov bot commented May 17, 2024 • edited

Codecov Report

shahthepro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented May 17, 2024 • edited

codecov bot commented May 17, 2024 •

edited

github-actions bot commented May 17, 2024 •

edited