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

Contract v1.2.0 #126

Merged
merged 31 commits into from
Jan 7, 2021
Merged

Contract v1.2.0 #126

merged 31 commits into from
Jan 7, 2021

Conversation

germartinez
Copy link
Member

Use Gnosis Safe contract v1.2.0

@germartinez
Upsate safe-contracts dependencies to v1.2.0
f463f63
@germartinez
Update Safe Abi with isModuleEnabled
dad7cbb
@germartinez
Update CPK contracts with new Safe contract names
bc50547
@germartinez
Rename Safe contract names form v1.2.0 in the CPK
bcff00b
@germartinez
Replace masterCopyAddress with v1.2.0
7372e40
@germartinez
Refactor isModuleEnabled method
da71d3b
@germartinez
Create a contract manager
a821bd0
@germartinez
Code formatting
629603d
@germartinez
Calculate proxy contract in ContractManager
9f89285
@germartinez
Add Safe module methods to ContractManager
4326af7
@germartinez
Add structure to support different contract versions
a23ddc0
@germartinez
Add a Safe ABI for each contract version
f13eb1d
@germartinez
Add a version list of masterCopy addresses
a5ff65d
@germartinez
Calculate the contract version manager
9952203
@germartinez
Organize imports
ee60aef
@germartinez
Add a second GnosisSafe contract in tests
ff1389d
@germartinez
Update networks structure with multiple versions of masterCopy
572999f
@germartinez
Format code
9acf5e3
@germartinez
Fix Gnosis Safe setup parameter type
5f81257
@germartinez
Add VERSION function to GnosisSafe ABIs
4222c62
@germartinez
Fix contract version calculus
c62503c
@germartinez
Uncomment Safe Relay tests
972e4e6
@germartinez germartinez self-assigned this Oct 27, 2020
@germartinez germartinez added the ts This issues is related to ts lib changes label Oct 27, 2020
@hexyls
Copy link

hexyls commented Oct 29, 2020 •
edited
Loading

It would be cool to make createProxyAndExecTransaction payable to match the change to execTransaction in Gnosis Safe v1.2.0 (useful for deploying a new proxy and wrapping ether in one transaction).

@hexyls hexyls mentioned this pull request Oct 30, 2020
Merged
@germartinez
Copy link
Member Author

Hello @hexyls,
That is a planned feature that will be included in the vew version of the CPKFactory contract
You can track the progress here: #106

@germartinez germartinez changed the base branch from development to fix-txresult November 2, 2020 01:14
@germartinez germartinez mentioned this pull request Nov 5, 2020
Merged
@cag cag changed the base branch from fix-txresult to development November 9, 2020 20:05
@cag
Copy link
Contributor

cag commented Nov 9, 2020 •
edited
Loading

Just a note about the merge conflict: in the xdai branch that got merged, the file migrations/1-deploy-contracts.js got removed from the index, since it is a compilation output of migrations-ts/1-deploy-contracts.ts. Since this branch is currently a merge target of #130, we should wait for that PR to resolve before considering this one.

Basically, avoid rebasing until then.

@hexyls hexyls mentioned this pull request Nov 9, 2020
Closed
@germartinez germartinez requested a review from cag December 30, 2020 17:07
cag
cag approved these changes Jan 1, 2021
View reviewed changes
Copy link
Contributor

@cag cag left a comment

Choose a reason for hiding this comment

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

LGTM

@germartinez germartinez force-pushed the contract-v1.2.0 branch 2 times, most recently from 3461f59 to 0aeb665 Compare January 7, 2021 11:37
@germartinez germartinez merged commit 7d7f3af into development Jan 7, 2021
@germartinez germartinez deleted the contract-v1.2.0 branch February 19, 2021 14:34
@germartinez germartinez mentioned this pull request Feb 22, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cag cag cag approved these changes

Assignees

@germartinez germartinez

Labels
ts This issues is related to ts lib changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@germartinez @hexyls @cag