Fixes LibHelper and Amoy config. Deploys Paymaster functions.

tableturn · Apr 3, 2024 · 0ce0684 · 0ce0684
1 parent 89f84c3
commit 0ce0684
Show file tree

Hide file tree

Showing 29 changed files with 1,931 additions and 1,110 deletions.
diff --git a/contracts/lib/LibHelpers.sol b/contracts/lib/LibHelpers.sol
@@ -6,7 +6,8 @@ import "../interfaces/IERC173.sol";
 
 library LibHelpers {
   address internal constant ZERO_ADDRESS = address(0);
-  address internal constant DEPLOYER_CONTRACT = 0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7;
+  address internal constant DEPLOYER_CONTRACT = 0x6DF2D25d8C6FD680730ee658b530A05a99BB769a;
+  address internal constant DEPLOYER_CONTRACT_AMOY = 0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7;
 
   function _isDiamondFacet(address who) internal view returns (bool) {
     return who == address(this);
@@ -17,6 +18,6 @@ library LibHelpers {
   }
 
   function _isDeployer(address who) internal pure returns (bool) {
-    return who == LibHelpers.DEPLOYER_CONTRACT;
+    return (who == LibHelpers.DEPLOYER_CONTRACT) || (who == LibHelpers.DEPLOYER_CONTRACT_AMOY);
   }
 }
diff --git a/deployments/amoy/FastAccessFacet.json b/deployments/amoy/FastAccessFacet.json
diff --git a/deployments/amoy/FastAutomatonsFacet.json b/deployments/amoy/FastAutomatonsFacet.json
diff --git a/deployments/amoy/FastCrowdfundsFacet.json b/deployments/amoy/FastCrowdfundsFacet.json
diff --git a/deployments/amoy/FastDistributionsFacet.json b/deployments/amoy/FastDistributionsFacet.json
diff --git a/deployments/amoy/FastF01.json b/deployments/amoy/FastF01.json
diff --git a/deployments/amoy/FastF02.json b/deployments/amoy/FastF02.json
diff --git a/deployments/amoy/FastF03.json b/deployments/amoy/FastF03.json
diff --git a/deployments/amoy/FastF04.json b/deployments/amoy/FastF04.json
diff --git a/deployments/amoy/FastForwardableFacet.json b/deployments/amoy/FastForwardableFacet.json
diff --git a/deployments/amoy/FastFrontendFacet.json b/deployments/amoy/FastFrontendFacet.json
diff --git a/deployments/amoy/FastHistoryFacet.json b/deployments/amoy/FastHistoryFacet.json
diff --git a/deployments/amoy/FastTokenFacet.json b/deployments/amoy/FastTokenFacet.json
diff --git a/deployments/amoy/FastTopFacet.json b/deployments/amoy/FastTopFacet.json
diff --git a/deployments/amoy/Issuer.json b/deployments/amoy/Issuer.json
diff --git a/deployments/amoy/IssuerAccessFacet.json b/deployments/amoy/IssuerAccessFacet.json
diff --git a/deployments/amoy/IssuerAutomatonsFacet.json b/deployments/amoy/IssuerAutomatonsFacet.json
diff --git a/deployments/amoy/IssuerFrontendFacet.json b/deployments/amoy/IssuerFrontendFacet.json
diff --git a/deployments/amoy/IssuerTopFacet.json b/deployments/amoy/IssuerTopFacet.json
diff --git a/deployments/amoy/Marketplace.json b/deployments/amoy/Marketplace.json
diff --git a/deployments/amoy/MarketplaceAccessFacet.json b/deployments/amoy/MarketplaceAccessFacet.json
diff --git a/deployments/amoy/MarketplaceAutomatonsFacet.json b/deployments/amoy/MarketplaceAutomatonsFacet.json
diff --git a/deployments/amoy/MarketplaceFastDeploymentRequestsFacet.json b/deployments/amoy/MarketplaceFastDeploymentRequestsFacet.json
diff --git a/deployments/amoy/MarketplaceForwardableFacet.json b/deployments/amoy/MarketplaceForwardableFacet.json
diff --git a/deployments/amoy/MarketplaceTokenHoldersFacet.json b/deployments/amoy/MarketplaceTokenHoldersFacet.json
diff --git a/deployments/amoy/MarketplaceTopFacet.json b/deployments/amoy/MarketplaceTopFacet.json
diff --git a/deployments/amoy/solcInputs/282aebb21cccc251bc099bdf4cf81fc0.json b/deployments/amoy/solcInputs/282aebb21cccc251bc099bdf4cf81fc0.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -224,7 +224,9 @@ const config: HardhatUserConfig = {
     },
     // Polygon Testnet - Amoy.
     80002: {
-      ...DEPLOYER_FACTORY_COMMON,
+      deployer: "0xE1CB04A0fA36DdD16a06ea828007E35e1a3cBC37",
+      factory: "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+      funding: "10000000000000000",
       signedTx:
         "0xf8a88085746a52880f830174a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf383027128a0983a0a2de9444f60b6405a227cce730f6d1025f02ff2d37c638e976389f8a073a07846164338796cbf55c45d80f7b328ff55f495d0264574a7cb876673808161bc",
     },

diff --git a/src/utils.ts b/src/utils.ts
@@ -7,8 +7,8 @@ export const ZERO_ADDRESS = ethers.constants.AddressZero;
 export const ZERO_ACCOUNT_MOCK = { getAddress: () => ZERO_ADDRESS };
 
 export const DEPLOYER_FACTORY_COMMON = {
-  deployer: "0xE1CB04A0fA36DdD16a06ea828007E35e1a3cBC37",
-  factory: "0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
+  deployer: "0xfa570a9Fd418FF0B8A5C792497a79059070A3A8e",
+  factory: "0x6DF2D25d8C6FD680730ee658b530A05a99BB769a",
   funding: "10000000000000000",
 };