From ef4328b38272bca181e438a695d0f97a512465b7 Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Thu, 23 May 2024 23:31:44 -0400 Subject: [PATCH] Use ERC721 contracts in mainnet and polygon configs --- src/providers/NetworkConfig/networks/mainnet.ts | 14 +++++++++----- src/providers/NetworkConfig/networks/polygon.ts | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/providers/NetworkConfig/networks/mainnet.ts b/src/providers/NetworkConfig/networks/mainnet.ts index 74ac8336a1..e4070fde2b 100644 --- a/src/providers/NetworkConfig/networks/mainnet.ts +++ b/src/providers/NetworkConfig/networks/mainnet.ts @@ -2,12 +2,12 @@ import Azorius from '@fractal-framework/fractal-contracts/deployments/mainnet/Az import AzoriusFreezeGuard from '@fractal-framework/fractal-contracts/deployments/mainnet/AzoriusFreezeGuard.json'; import ERC20Claim from '@fractal-framework/fractal-contracts/deployments/mainnet/ERC20Claim.json'; import ERC20FreezeVoting from '@fractal-framework/fractal-contracts/deployments/mainnet/ERC20FreezeVoting.json'; - +import ERC721FreezeVoting from '@fractal-framework/fractal-contracts/deployments/mainnet/ERC721FreezeVoting.json'; import FractalModule from '@fractal-framework/fractal-contracts/deployments/mainnet/FractalModule.json'; import FractalRegistry from '@fractal-framework/fractal-contracts/deployments/mainnet/FractalRegistry.json'; import KeyValuePairs from '@fractal-framework/fractal-contracts/deployments/mainnet/KeyValuePairs.json'; import LinearERC20Voting from '@fractal-framework/fractal-contracts/deployments/mainnet/LinearERC20Voting.json'; - +import LinearVotingERC721 from '@fractal-framework/fractal-contracts/deployments/mainnet/LinearERC721Voting.json'; import ModuleProxyFactory from '@fractal-framework/fractal-contracts/deployments/mainnet/ModuleProxyFactory.json'; import MultisigFreezeGuard from '@fractal-framework/fractal-contracts/deployments/mainnet/MultisigFreezeGuard.json'; import MultisigFreezeVoting from '@fractal-framework/fractal-contracts/deployments/mainnet/MultisigFreezeVoting.json'; @@ -44,12 +44,12 @@ export const mainnetConfig: NetworkConfig = { fractalModuleMasterCopy: FractalModule.address, fractalRegistry: FractalRegistry.address, votesERC20MasterCopy: VotesERC20.address, - linearVotingERC721MasterCopy: '', // TODO - Add actual address once contract is deployed on mainnet + linearVotingERC721MasterCopy: LinearVotingERC721.address, claimingMasterCopy: ERC20Claim.address, azoriusFreezeGuardMasterCopy: AzoriusFreezeGuard.address, multisigFreezeVotingMasterCopy: MultisigFreezeVoting.address, erc20FreezeVotingMasterCopy: ERC20FreezeVoting.address, - erc721FreezeVotingMasterCopy: '', // TODO - Add actual address once contract is deployed on mainnet + erc721FreezeVotingMasterCopy: ERC721FreezeVoting.address, multisigFreezeGuardMasterCopy: MultisigFreezeGuard.address, fallbackHandler: getCompatibilityFallbackHandlerDeployment({ version: SAFE_VERSION, @@ -77,5 +77,9 @@ export const mainnetConfig: NetworkConfig = { withdrawalQueueContractAddress: '0x889edC2eDab5f40e902b864aD4d7AdE8E412F9B1', }, }, - createOptions: [GovernanceType.MULTISIG, GovernanceType.AZORIUS_ERC20], + createOptions: [ + GovernanceType.MULTISIG, + GovernanceType.AZORIUS_ERC20, + GovernanceType.AZORIUS_ERC721, + ], }; diff --git a/src/providers/NetworkConfig/networks/polygon.ts b/src/providers/NetworkConfig/networks/polygon.ts index 99f2cd03b9..9eccff9906 100644 --- a/src/providers/NetworkConfig/networks/polygon.ts +++ b/src/providers/NetworkConfig/networks/polygon.ts @@ -2,12 +2,12 @@ import Azorius from '@fractal-framework/fractal-contracts/deployments/polygon/Az import AzoriusFreezeGuard from '@fractal-framework/fractal-contracts/deployments/polygon/AzoriusFreezeGuard.json'; import ERC20Claim from '@fractal-framework/fractal-contracts/deployments/polygon/ERC20Claim.json'; import ERC20FreezeVoting from '@fractal-framework/fractal-contracts/deployments/polygon/ERC20FreezeVoting.json'; - +import ERC721FreezeVoting from '@fractal-framework/fractal-contracts/deployments/polygon/ERC721FreezeVoting.json'; import FractalModule from '@fractal-framework/fractal-contracts/deployments/polygon/FractalModule.json'; import FractalRegistry from '@fractal-framework/fractal-contracts/deployments/polygon/FractalRegistry.json'; import KeyValuePairs from '@fractal-framework/fractal-contracts/deployments/polygon/KeyValuePairs.json'; import LinearERC20Voting from '@fractal-framework/fractal-contracts/deployments/polygon/LinearERC20Voting.json'; - +import LinearVotingERC721 from '@fractal-framework/fractal-contracts/deployments/polygon/LinearERC721Voting.json'; import ModuleProxyFactory from '@fractal-framework/fractal-contracts/deployments/polygon/ModuleProxyFactory.json'; import MultisigFreezeGuard from '@fractal-framework/fractal-contracts/deployments/polygon/MultisigFreezeGuard.json'; import MultisigFreezeVoting from '@fractal-framework/fractal-contracts/deployments/polygon/MultisigFreezeVoting.json'; @@ -44,12 +44,12 @@ export const polygonConfig: NetworkConfig = { fractalModuleMasterCopy: FractalModule.address, fractalRegistry: FractalRegistry.address, votesERC20MasterCopy: VotesERC20.address, - linearVotingERC721MasterCopy: '', // TODO - Add actual address once contract is deployed on polygon + linearVotingERC721MasterCopy: LinearVotingERC721.address, claimingMasterCopy: ERC20Claim.address, azoriusFreezeGuardMasterCopy: AzoriusFreezeGuard.address, multisigFreezeVotingMasterCopy: MultisigFreezeVoting.address, erc20FreezeVotingMasterCopy: ERC20FreezeVoting.address, - erc721FreezeVotingMasterCopy: '', // TODO - Add actual address once contract is deployed on polygon + erc721FreezeVotingMasterCopy: ERC721FreezeVoting.address, multisigFreezeGuardMasterCopy: MultisigFreezeGuard.address, fallbackHandler: getCompatibilityFallbackHandlerDeployment({ version: SAFE_VERSION, @@ -71,5 +71,9 @@ export const polygonConfig: NetworkConfig = { keyValuePairs: KeyValuePairs.address, }, staking: {}, - createOptions: [GovernanceType.MULTISIG, GovernanceType.AZORIUS_ERC20], + createOptions: [ + GovernanceType.MULTISIG, + GovernanceType.AZORIUS_ERC20, + GovernanceType.AZORIUS_ERC721, + ], };