Skip to content

xDai deployment #121

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

Merged
germartinez merged 7 commits into from
Nov 5, 2020
Merged

xDai deployment #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9e9da8
Fix migration
cag Oct 21, 2020
02478be
Remove typechain migration build output from git index
cag Oct 21, 2020
45823c7
Remove unused Migrations.sol
cag Oct 21, 2020
a83e9cd
Add POA networks to Truffle config
cag Oct 21, 2020
3b71bb9
Add xDai config
cag Oct 21, 2020
a874562
Remove Sokol network
germartinez Nov 5, 2020
c5e158c
Update fallback handlers to v1.1.1
germartinez Nov 5, 2020
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
31 changes: 0 additions & 31 deletions contracts/Migrations.sol
View file
Open in desktop

This file was deleted.

16 changes: 7 additions & 9 deletions migrations-ts/1-deploy-contracts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module.exports = function(deployer: Truffle.Deployer, network: string) {
const deploy = (
name: string
): Truffle.Deployer => deployer.deploy(artifacts.require(name as any));
module.exports = function (deployer: Truffle.Deployer, network: string) {
const deploy = (name: any): Truffle.Deployer => deployer.deploy(artifacts.require(name))

['Migrations', 'CPKFactory'].forEach(deploy);
deploy('CPKFactory')

if (network === 'test' || network === 'local') {
[
;[
'GnosisSafe',
'ProxyFactory',
'MultiSend',
Expand All @@ -15,8 +13,8 @@ module.exports = function(deployer: Truffle.Deployer, network: string) {
'DailyLimitModule',
'ERC20Mintable',
'ConditionalTokens'
].forEach(deploy);
].forEach(deploy)
}
} as Truffle.Migration;
} as Truffle.Migration

export {};
export {}
19 changes: 0 additions & 19 deletions migrations/1-deploy-contracts.js
View file
Open in desktop

This file was deleted.

15 changes: 11 additions & 4 deletions src/config/networks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,34 @@ export const defaultNetworks: NetworksConfig = {
masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
proxyFactoryAddress: '0x0fB4340432e56c014fa96286de17222822a9281b',
multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980'
fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
},
// rinkeby
4: {
masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980'
fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
},
// goerli
5: {
masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980'
fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
},
// kovan
42: {
masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980'
fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
},
// xdai
100: {
masterCopyAddress: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185',
Copy link
Member

@rmeissner rmeissner Oct 22, 2020

Choose a reason for hiding this comment

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

Why do we not use the official mastercopy on xdai?

Copy link
Contributor Author

@cag cag Nov 3, 2020

Choose a reason for hiding this comment

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

Wait, those are not the official addresses? I got them from https://github.com/gnosis/safe-contracts/blob/development/networks.json

Copy link
Member

@rmeissner rmeissner Nov 3, 2020

Choose a reason for hiding this comment

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

Ahhh you use the v1.2.0 address ... then I would update this everywhere, not just for xdai. You should check by tag

Copy link
Contributor

@germartinez germartinez Nov 5, 2020

Choose a reason for hiding this comment

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

It's fine. The rest of the networks are updated here: #126

proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
Copy link
Member

@rmeissner rmeissner Oct 22, 2020

Choose a reason for hiding this comment

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

Why do we not use the official fallback handler on xdai?

Copy link
Contributor

@germartinez germartinez Nov 5, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@rmeissner Is not this the right one? https://github.com/gnosis/safe-contracts/blob/v1.2.0/networks.json#L118
From where did we get the fallback handler at 0x40A930851BD2e590Bd5A5C981b436de25742E980 for the other networks?

Copy link
Member

@rmeissner rmeissner Nov 5, 2020

Choose a reason for hiding this comment

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

so this seems to be the 1.1.1 fallback handler and the other is 1.1.0 (as mentioned on etherscan). Note 1.1.1 is the current. Code wise 1.1.0 and 1.1.1 should be the same.

See https://etherscan.io/address/0x40A930851BD2e590Bd5A5C981b436de25742E980
and https://etherscan.io/address/0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44

}
}
5 changes: 3 additions & 2 deletions truffle-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ const networks = Object.assign(...[
[4, 'rinkeby'],
[5, 'goerli', `${2e9}`],
[42, 'kovan'],
].map(([networkId, network, gasPrice]) => ({
[100, 'dai',, true],
].map(([networkId, network, gasPrice, isPoa]) => ({
[network]: {
network_id: networkId,
gasPrice,
provider: () => new HDWalletProvider(
seed,
`https://${network}.infura.io/v3/17d5bb5953564f589d48d535f573e486`,
isPoa ? `https://${network}.poa.network` : `https://${network}.infura.io/v3/17d5bb5953564f589d48d535f573e486`,
),
},
})), {
Expand Down