deployments

holographxyz · Jul 7, 2023 · 17928d0 · 17928d0
1 parent cfe1f68
commit 17928d0
Show file tree

Hide file tree

Showing 14 changed files with 2,460 additions and 86 deletions.
diff --git a/contracts/HolographFactory.sol b/contracts/HolographFactory.sol
@@ -117,6 +117,8 @@ import "./struct/BridgeSettings.sol";
 import "./struct/DeploymentConfig.sol";
 import "./struct/Verification.sol";
 
+import "./library/Strings.sol";
+
 /**
  * @title Holograph Factory
  * @author https://github.com/holographxyz
@@ -372,6 +374,15 @@ contract HolographFactory is Admin, Initializable, Holographable, HolographFacto
      */
     return (signer != address(0) &&
       (ecrecover(keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash)), v, r, s) == signer ||
+        (
+          ecrecover(
+            keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n66", Strings.toHexString(uint256(hash), 32))),
+            v,
+            r,
+            s
+          )
+        ) ==
+        signer ||
         ecrecover(hash, v, r, s) == signer));
   }
 

diff --git a/contracts/drops/token/HolographDropERC721.sol b/contracts/drops/token/HolographDropERC721.sol
@@ -284,10 +284,20 @@ contract HolographDropERC721 is NonReentrant, ERC721H, IHolographDropERC721 {
         // this is a default filter that can be used for OS royalty filtering
         // marketFilterAddress = 0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6;
         // we just register to OS royalties and let OS handle it for us with their default filter contract
-        openseaOperatorFilterRegistry.register(address(this));
+        HolographERC721Interface(holographer()).sourceExternalCall(
+          address(openseaOperatorFilterRegistry),
+          abi.encodeWithSelector(IOperatorFilterRegistry.register.selector, holographer())
+        );
       } else {
         // allow user to specify custom filtering contract address
-        openseaOperatorFilterRegistry.registerAndSubscribe(address(this), marketFilterAddress);
+        HolographERC721Interface(holographer()).sourceExternalCall(
+          address(openseaOperatorFilterRegistry),
+          abi.encodeWithSelector(
+            IOperatorFilterRegistry.registerAndSubscribe.selector,
+            holographer(),
+            marketFilterAddress
+          )
+        );
       }
       assembly {
         sstore(_osRegistryEnabledSlot, true)
@@ -581,36 +591,44 @@ contract HolographDropERC721 is NonReentrant, ERC721H, IHolographDropERC721 {
    * @notice Requires admin permissions
    * @param args Calldata args to pass to the registry
    */
-  function updateMarketFilterSettings(bytes calldata args) external onlyOwner returns (bytes memory) {
-    (bool success, bytes memory ret) = address(openseaOperatorFilterRegistry).call(args);
-    if (!success) {
-      revert RemoteOperatorFilterRegistryCallFailed();
-    }
-    bool osRegistryEnabled = openseaOperatorFilterRegistry.isRegistered(address(this));
+  function updateMarketFilterSettings(bytes calldata args) external onlyOwner {
+    HolographERC721Interface(holographer()).sourceExternalCall(address(openseaOperatorFilterRegistry), args);
+    bool osRegistryEnabled = openseaOperatorFilterRegistry.isRegistered(holographer());
     assembly {
       sstore(_osRegistryEnabledSlot, osRegistryEnabled)
     }
-    return ret;
   }
 
   /**
    * @notice Manage subscription for marketplace filtering based off royalty payouts.
    * @param enable Enable filtering to non-royalty payout marketplaces
    */
   function manageMarketFilterSubscription(bool enable) external onlyOwner {
-    address self = address(this);
+    address self = holographer();
     if (marketFilterAddress == address(0)) {
       revert MarketFilterAddressNotSupportedForChain();
     }
     if (!openseaOperatorFilterRegistry.isRegistered(self) && enable) {
-      openseaOperatorFilterRegistry.registerAndSubscribe(self, marketFilterAddress);
+      HolographERC721Interface(self).sourceExternalCall(
+        address(openseaOperatorFilterRegistry),
+        abi.encodeWithSelector(IOperatorFilterRegistry.registerAndSubscribe.selector, self, marketFilterAddress)
+      );
     } else if (enable) {
-      openseaOperatorFilterRegistry.subscribe(self, marketFilterAddress);
+      HolographERC721Interface(self).sourceExternalCall(
+        address(openseaOperatorFilterRegistry),
+        abi.encodeWithSelector(IOperatorFilterRegistry.subscribe.selector, self, marketFilterAddress)
+      );
     } else {
-      openseaOperatorFilterRegistry.unsubscribe(self, false);
-      openseaOperatorFilterRegistry.unregister(self);
-    }
-    bool osRegistryEnabled = openseaOperatorFilterRegistry.isRegistered(address(this));
+      HolographERC721Interface(self).sourceExternalCall(
+        address(openseaOperatorFilterRegistry),
+        abi.encodeWithSelector(IOperatorFilterRegistry.unsubscribe.selector, self, false)
+      );
+      HolographERC721Interface(self).sourceExternalCall(
+        address(openseaOperatorFilterRegistry),
+        abi.encodeWithSelector(IOperatorFilterRegistry.unregister.selector, self)
+      );
+    }
+    bool osRegistryEnabled = openseaOperatorFilterRegistry.isRegistered(self);
     assembly {
       sstore(_osRegistryEnabledSlot, osRegistryEnabled)
     }

diff --git a/deployments/develop/arbitrumTestnetGoerli/HolographFactory.json b/deployments/develop/arbitrumTestnetGoerli/HolographFactory.json
diff --git a/deployments/develop/arbitrumTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json b/deployments/develop/arbitrumTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json
diff --git a/deployments/develop/avalancheTestnet/HolographFactory.json b/deployments/develop/avalancheTestnet/HolographFactory.json
diff --git a/deployments/develop/avalancheTestnet/solcInputs/c71d96e115e745dd34ef9239c385494d.json b/deployments/develop/avalancheTestnet/solcInputs/c71d96e115e745dd34ef9239c385494d.json
diff --git a/deployments/develop/ethereumTestnetGoerli/HolographFactory.json b/deployments/develop/ethereumTestnetGoerli/HolographFactory.json
diff --git a/deployments/develop/ethereumTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json b/deployments/develop/ethereumTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json
diff --git a/deployments/develop/optimismTestnetGoerli/HolographFactory.json b/deployments/develop/optimismTestnetGoerli/HolographFactory.json
diff --git a/deployments/develop/optimismTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json b/deployments/develop/optimismTestnetGoerli/solcInputs/c71d96e115e745dd34ef9239c385494d.json
diff --git a/deployments/develop/polygonTestnet/HolographFactory.json b/deployments/develop/polygonTestnet/HolographFactory.json
diff --git a/deployments/develop/polygonTestnet/solcInputs/c71d96e115e745dd34ef9239c385494d.json b/deployments/develop/polygonTestnet/solcInputs/c71d96e115e745dd34ef9239c385494d.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -399,6 +399,7 @@ const config: HardhatUserConfig = {
       arbitrumOne: process.env.ARBISCAN_API_KEY || '',
       arbitrumGoerli: process.env.ARBISCAN_API_KEY || '',
       arbitrumNova: process.env.ARBISCAN_NOVA_API_KEY || '',
+      mantleTestnet: 'NO-API' || process.env.MANTLE_API_KEY,
     },
     customChains: [
       {
@@ -409,6 +410,14 @@ const config: HardhatUserConfig = {
           browserURL: 'https://nova.arbiscan.io',
         },
       },
+      {
+        network: 'mantleTestnet',
+        chainId: 5001,
+        urls: {
+          apiURL: 'https://explorer.testnet.mantle.xyz/api',
+          browserURL: 'https://explorer.testnet.mantle.xyz',
+        },
+      },
     ],
   },
   hardhatHolographContractBuilder: {

diff --git a/src/HolographFactory.sol b/src/HolographFactory.sol
@@ -18,6 +18,8 @@ import "./struct/BridgeSettings.sol";
 import "./struct/DeploymentConfig.sol";
 import "./struct/Verification.sol";
 
+import "./library/Strings.sol";
+
 /**
  * @title Holograph Factory
  * @author https://github.com/holographxyz
@@ -273,6 +275,15 @@ contract HolographFactory is Admin, Initializable, Holographable, HolographFacto
      */
     return (signer != address(0) &&
       (ecrecover(keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", hash)), v, r, s) == signer ||
+        (
+          ecrecover(
+            keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n66", Strings.toHexString(uint256(hash), 32))),
+            v,
+            r,
+            s
+          )
+        ) ==
+        signer ||
         ecrecover(hash, v, r, s) == signer));
   }