Merge pull request #1907 from decentdao/erc721-support

Erc721 support on Mainnet and Polygon

package.json

@@ -11,7 +11,7 @@
     "@ethersproject/abstract-signer": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@fontsource/space-mono": "^5.0.19",
-    "@fractal-framework/fractal-contracts": "^0.7.0",
+    "@fractal-framework/fractal-contracts": "^0.7.1",
     "@graphprotocol/client-apollo": "^1.0.16",
     "@lido-sdk/contracts": "^3.0.2",
     "@netlify/blobs": "^6.5.0",

src/providers/NetworkConfig/networks/base.ts

@@ -71,9 +71,5 @@ export const baseConfig: NetworkConfig = {
     keyValuePairs: KeyValuePairs.address,
   },
   staking: {},
-  createOptions: [
-    GovernanceType.MULTISIG,
-    GovernanceType.AZORIUS_ERC20,
-    GovernanceType.AZORIUS_ERC721,
-  ],
+  createOptions: [GovernanceType.MULTISIG, GovernanceType.AZORIUS_ERC20],
 };

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,

src/providers/NetworkConfig/networks/optimism.ts

@@ -71,9 +71,5 @@ export const optimismConfig: NetworkConfig = {
     keyValuePairs: KeyValuePairs.address,
   },
   staking: {},
-  createOptions: [
-    GovernanceType.MULTISIG,
-    GovernanceType.AZORIUS_ERC20,
-    GovernanceType.AZORIUS_ERC721,
-  ],
+  createOptions: [GovernanceType.MULTISIG, GovernanceType.AZORIUS_ERC20],
 };

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,