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

Fix: use recommendedMasterCopyVersion only for Safe upgrades #4747

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fix: use recommendedMasterCopyVersion only for Safe upgrades #4747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89906f3
Fix: use recommendedMasterCopyVersion only for Safe upgrades
katspaugh Jan 8, 2025
75108d4
Fix tests
katspaugh Jan 8, 2025
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 apps/web/src/components/settings/ContractVersion/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const ContractVersion = () => {
const showUpdateDialog = safeMasterCopy?.deployer === MasterCopyDeployer.GNOSIS && needsUpdate
const isLatestVersion = safe.version && !showUpdateDialog

const latestSafeVersion = getLatestSafeVersion(currentChain)
const latestSafeVersion = getLatestSafeVersion(currentChain, true)

return (
<>
Expand Down
13 changes: 7 additions & 6 deletions apps/web/src/features/multichain/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,16 @@ export const predictAddressBasedOnReplayData = async (safeCreationData: Replayed
return getCreate2Address(safeCreationData.factoryAddress, salt, keccak256(initCode))
}

const canMultichain = (chain: ChainInfo) => {
const MIN_SAFE_VERSION = '1.4.1'
return hasFeature(chain, FEATURES.COUNTERFACTUAL) && semverSatisfies(LATEST_SAFE_VERSION, `>=${MIN_SAFE_VERSION}`)
}

export const hasMultiChainCreationFeatures = (chain: ChainInfo): boolean => {
return hasFeature(chain, FEATURES.MULTI_CHAIN_SAFE_CREATION) && hasFeature(chain, FEATURES.COUNTERFACTUAL)
return hasFeature(chain, FEATURES.MULTI_CHAIN_SAFE_CREATION) && canMultichain(chain)
}

export const hasMultiChainAddNetworkFeature = (chain: ChainInfo | undefined): boolean => {
if (!chain) return false
return (
hasFeature(chain, FEATURES.MULTI_CHAIN_SAFE_ADD_NETWORK) &&
hasFeature(chain, FEATURES.COUNTERFACTUAL) &&
semverSatisfies(chain.recommendedMasterCopyVersion || LATEST_SAFE_VERSION, '>=1.4.1')
)
return hasFeature(chain, FEATURES.MULTI_CHAIN_SAFE_ADD_NETWORK) && canMultichain(chain)
}
2 changes: 1 addition & 1 deletion apps/web/src/services/tx/safeUpdateParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const createUpdateSafeTxs = async (safe: SafeInfo, chain: ChainInfo): Pro
).getAddress()
const currentReadOnlySafeContract = await getReadOnlyGnosisSafeContract(chain, safe.version)

const updatedReadOnlySafeContract = await getReadOnlyGnosisSafeContract(chain, getLatestSafeVersion(chain))
const updatedReadOnlySafeContract = await getReadOnlyGnosisSafeContract(chain, getLatestSafeVersion(chain, true))

// @ts-expect-error this was removed in 1.3.0 but we need to support it for older safe versions
const changeMasterCopyCallData = currentReadOnlySafeContract.encode('changeMasterCopy', [latestMasterCopyAddress])
Expand Down
19 changes: 18 additions & 1 deletion apps/web/src/utils/__tests__/chains.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,34 @@ describe('chains', () => {
describe('chains', () => {
describe('getLatestSafeVersion', () => {
it('should return the version from recommendedMasterCopyVersion', () => {
expect(
getLatestSafeVersion(
chainBuilder().with({ chainId: '1', recommendedMasterCopyVersion: '1.4.1' }).build(),
true,
),
).toEqual('1.4.1')
expect(
getLatestSafeVersion(
chainBuilder().with({ chainId: '137', recommendedMasterCopyVersion: '1.3.0' }).build(),
true,
),
).toEqual('1.3.0')
})

it('should always return LATEST_VERSION if true is not passed', () => {
expect(
getLatestSafeVersion(chainBuilder().with({ chainId: '1', recommendedMasterCopyVersion: '1.4.1' }).build()),
).toEqual('1.4.1')
expect(
getLatestSafeVersion(chainBuilder().with({ chainId: '137', recommendedMasterCopyVersion: '1.3.0' }).build()),
).toEqual('1.3.0')
).toEqual('1.4.1')
})

it('should fall back to LATEST_VERSION', () => {
expect(
getLatestSafeVersion(
chainBuilder().with({ chainId: '11155111', recommendedMasterCopyVersion: null }).build(),
true,
),
).toEqual('1.4.1')
})
Expand Down
7 changes: 5 additions & 2 deletions apps/web/src/utils/chains.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,11 @@ export const isRouteEnabled = (route: string, chain?: ChainInfo) => {
return !featureRoute || hasFeature(chain, featureRoute)
}

export const getLatestSafeVersion = (chain: ChainInfo | undefined): SafeVersion => {
const latestSafeVersion = chain?.recommendedMasterCopyVersion || LATEST_SAFE_VERSION
export const getLatestSafeVersion = (chain: ChainInfo | undefined, isUpgrade = false): SafeVersion => {
const latestSafeVersion = isUpgrade
? chain?.recommendedMasterCopyVersion || LATEST_SAFE_VERSION // for upgrades, use the recommended version
: LATEST_SAFE_VERSION // for Safe creation, always use the latest version

// Without version filter it will always return the LATEST_SAFE_VERSION constant to avoid automatically updating to the newest version if the deployments change
const latestDeploymentVersion = (getSafeSingletonDeployment({ network: chain?.chainId, released: true })?.version ??
FALLBACK_SAFE_VERSION) as SafeVersion
Expand Down
Loading