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

Reordering the deploy script for sanity #1304

Merged
merged 14 commits into from
Jun 3, 2021
Merged

Reordering the deploy script for sanity #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c5ff4b2
Reorganizing to deploy first, resolver import next, then config
jjgonecrypto May 28, 2021
30336b4
Bunch more fixes
jjgonecrypto May 28, 2021
75d0033
Adding skip-feed-checks
jjgonecrypto May 28, 2021
dfba60f
Relock
jjgonecrypto May 30, 2021
d4862a2
Fixing test by ensuring AddressResolver is set before adding to it
jjgonecrypto Jun 1, 2021
3845b6c
Merge branch 'develop' into reordering-the-deploy-script
jjgonecrypto Jun 1, 2021
abb2061
Merge branch 'develop' into reordering-the-deploy-script
jjgonecrypto Jun 1, 2021
f0916d0
Fixing the optionality of renBTC based on config flags
jjgonecrypto Jun 1, 2021
f8d8ad5
Merge branch 'develop' into reordering-the-deploy-script
jjgonecrypto Jun 1, 2021
7a6f1ae
Moving the deploy script to its own folder
jjgonecrypto Jun 2, 2021
66859f5
Minor fixes
jjgonecrypto Jun 2, 2021
54afd17
More refactoring
jjgonecrypto Jun 2, 2021
54f3bbe
Finishing up
jjgonecrypto Jun 2, 2021
e0e443f
Merge branch 'develop' into reordering-the-deploy-script
Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions publish/deployed/local-ovm/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@
"Liquidations": {
"deploy": true
},
"SupplySchedule": {
"deploy": true
},
"Synthetix": {
"deploy": true
},
Expand Down Expand Up @@ -139,8 +136,5 @@
},
"EtherWrapper": {
"deploy": true
},
"NativeEtherWrapper": {
"deploy": true
}
}
8 changes: 4 additions & 4 deletions publish/src/Deployer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class Deployer {
this.ignoreSafetyChecks = ignoreSafetyChecks;

/*
provider is defined here to hold backwards compatible web3 component as well as ethers
while the migration is completed. After all web3 references are replaced by ethers,
web3 provider will be removed. The aim is to get rid of all references to web3 and web3_utils
provider is defined here to hold backwards compatible web3 component as well as ethers
while the migration is completed. After all web3 references are replaced by ethers,
web3 provider will be removed. The aim is to get rid of all references to web3 and web3_utils
in the project.

web3 and/or ethers is needed to interact with the contracts and sing transactions
Expand Down Expand Up @@ -392,7 +392,7 @@ class Deployer {
arg.toLowerCase() === forbiddenAddress.toLowerCase()
) {
throw Error(
`new ${name}(): Cannot use the AddressResolver as a constructor arg. Use ReadProxyForResolver instead.`
`new ${name}(): Cannot use the AddressResolver as a constructor arg. Use ReadProxyAddressResolver instead.`
);
}
}
Expand Down
Loading