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

feat(protocol-kit): Migrate Safe Contract v1.1.1 to Abitype #643

Merged
merged 11 commits into from
Jan 11, 2024
Merged

feat(protocol-kit): Migrate Safe Contract v1.1.1 to Abitype #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff257cc
Rename old 1.1.1 Safe contract implementations (for Ethers.js + Web3.js)
tmjssz Dec 14, 2023
51f6d58
Create Types for the v1.1.1 Safe contract
tmjssz Dec 14, 2023
396fa33
Implement `SafeContract_v1_1_1_Web3` class
tmjssz Dec 14, 2023
0555693
Implement `SafeContract_v1_1_1_Ethers` class
tmjssz Dec 14, 2023
9fed27a
Various fixes in Safe contract v1.1.1 implementations
tmjssz Dec 14, 2023
d57fee4
Update `contractInstancesEthers.ts` to use the new class
tmjssz Dec 14, 2023
1b32bde
Update `contractInstancesWeb3.ts` to use the new class
tmjssz Dec 14, 2023
f9d7bc0
Remove contract 1.1.1 from typechain generation script
tmjssz Dec 14, 2023
2745045
Remove old SafeContract v1.1.1 implementations
tmjssz Dec 14, 2023
f60dce2
Fix `getModulesPaginated` function in 1.1.1 contract implementations
tmjssz Dec 15, 2023
af5c34e
Fix binding issues in `mapToTypechainContract` function for contract …
tmjssz Dec 15, 2023
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
2 changes: 1 addition & 1 deletion packages/protocol-kit/scripts/generateTypechainFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const safeContracts_V1_3_0 = [
].join(' ')
const safeContracts_V1_2_0 = [`${safeContractsPath}/v1.2.0/gnosis_safe.json`].join(' ')
const safeContracts_V1_1_1 = [
`${safeContractsPath}/v1.1.1/gnosis_safe.json`,
// `${safeContractsPath}/v1.1.1/gnosis_safe.json`, // Remove contract 1.1.1 from typechain as it's migrated to Abitype,
`${safeContractsPath}/v1.1.1/proxy_factory.json`,
`${safeContractsPath}/v1.1.1/multi_send.json`
].join(' ')
Expand Down
3 changes: 1 addition & 2 deletions packages/protocol-kit/src/adapters/ethers/contracts/Safe/SafeContractEthers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
} from '@safe-global/protocol-kit/adapters/ethers/types'
import { toTxResult } from '@safe-global/protocol-kit/adapters/ethers/utils'
import { Gnosis_safe as Safe_V1_0_0 } from '@safe-global/protocol-kit/typechain/src/ethers-v6/v1.0.0/Gnosis_safe'
import { Gnosis_safe as Safe_V1_1_1 } from '@safe-global/protocol-kit/typechain/src/ethers-v6/v1.1.1/Gnosis_safe'
import { Gnosis_safe as Safe_V1_2_0 } from '@safe-global/protocol-kit/typechain/src/ethers-v6/v1.2.0/Gnosis_safe'
import {
SafeContract,
Expand All @@ -15,7 +14,7 @@ import {
} from '@safe-global/safe-core-sdk-types'

abstract class SafeContractEthers implements SafeContract {
constructor(public contract: Safe_V1_2_0 | Safe_V1_1_1 | Safe_V1_0_0) {}
constructor(public contract: Safe_V1_2_0 | Safe_V1_0_0) {}

abstract setup(
setupConfig: SafeSetupConfig,
Expand Down
68 changes: 0 additions & 68 deletions ...ages/protocol-kit/src/adapters/ethers/contracts/Safe/v1.1.1/SafeContract_V1_1_1_Ethers.ts
View file
Open in desktop

This file was deleted.

Loading
Loading