feat: support erc20 tokens for tiered sales facet (#6)

* feat: support erc20 tokens for tiered sales facet * fix: use internal function for payment processing * fix: remove restriction on lowering per-wallet * test: erc20 currency scenarios * chore: deploy on all chains
0xflair · Dec 31, 2022 · 73e2d58 · 73e2d58
1 parent d4316e5
commit 73e2d58
Show file tree

Hide file tree

Showing 431 changed files with 62,104 additions and 13,260 deletions.
diff --git a/deploy/02_deploy_finance_sales_facets.ts b/deploy/02_deploy_finance_sales_facets.ts
@@ -1,7 +1,7 @@
-import {HardhatRuntimeEnvironment} from 'hardhat/types';
-import {DeployFunction} from 'hardhat-deploy/types';
+import { HardhatRuntimeEnvironment } from 'hardhat/types';
+import { DeployFunction } from 'hardhat-deploy/types';
 
-import {deployPermanentContract} from '../hardhat.util';
+import { deployPermanentContract } from '../hardhat.util';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const accounts = await hre.getUnnamedAccounts();

diff --git a/deploy/03_deploy_erc1155.ts b/deploy/03_deploy_erc1155.ts
@@ -7,7 +7,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const accounts = await hre.getUnnamedAccounts();
 
   //
-  // Presets
+  // Base
   //
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC1155', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC1155WithERC2771', []);

diff --git a/deploy/03_deploy_erc20.ts b/deploy/03_deploy_erc20.ts
@@ -7,7 +7,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const accounts = await hre.getUnnamedAccounts();
 
   //
-  // Presets
+  // Base
   //
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20', []);
 
@@ -19,16 +19,16 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20Metadata', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20MetadataOwnable', []);
 
-  // // Supply
+  // Supply
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20SupplyOwnable', []);
 
-  // // Mintable
+  // Mintable
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20MintableOwnable', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20MintableOwnableERC2771', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20MintableRoleBased', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20MintableRoleBasedERC2771', []);
 
-  // // Tiered Sales
+  // Tiered Sales
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20TieredSales', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC20TieredSalesERC2771', []);
 };

diff --git a/deploy/03_deploy_erc721.ts b/deploy/03_deploy_erc721.ts
@@ -7,7 +7,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const accounts = await hre.getUnnamedAccounts();
 
   //
-  // Presets
+  // Base
   //
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC721A', []);
   await deployPermanentContract(hre.deployments, accounts[0], 'ERC721AWithERC2771', []);

diff --git a/deployments/arbitrumGoerli/ERC1155TieredSales.json b/deployments/arbitrumGoerli/ERC1155TieredSales.json
diff --git a/deployments/arbitrumGoerli/ERC1155TieredSalesERC2771.json b/deployments/arbitrumGoerli/ERC1155TieredSalesERC2771.json
diff --git a/deployments/arbitrumGoerli/ERC20TieredSales.json b/deployments/arbitrumGoerli/ERC20TieredSales.json
diff --git a/deployments/arbitrumGoerli/ERC20TieredSalesERC2771.json b/deployments/arbitrumGoerli/ERC20TieredSalesERC2771.json
diff --git a/deployments/arbitrumGoerli/ERC721TieredSales.json b/deployments/arbitrumGoerli/ERC721TieredSales.json
diff --git a/deployments/arbitrumGoerli/ERC721TieredSalesERC2771.json b/deployments/arbitrumGoerli/ERC721TieredSalesERC2771.json
diff --git a/deployments/arbitrumGoerli/License.json b/deployments/arbitrumGoerli/License.json
diff --git a/deployments/arbitrumGoerli/MetadataOwnable.json b/deployments/arbitrumGoerli/MetadataOwnable.json
diff --git a/deployments/arbitrumGoerli/TieredSalesOwnable.json b/deployments/arbitrumGoerli/TieredSalesOwnable.json
diff --git a/deployments/arbitrumGoerli/Withdrawable.json b/deployments/arbitrumGoerli/Withdrawable.json
diff --git a/deployments/arbitrumGoerli/solcInputs/24f964636901b23f343eb88b8f5f82cb.json b/deployments/arbitrumGoerli/solcInputs/24f964636901b23f343eb88b8f5f82cb.json
diff --git a/deployments/arbitrumGoerli/solcInputs/babb323e8d447d3ed5545515696dedf9.json b/deployments/arbitrumGoerli/solcInputs/babb323e8d447d3ed5545515696dedf9.json
diff --git a/...uts/3e978968784236f46d062ea1c097f0f0.json → ...uts/bd924e81b959edc830ca5e48147a41a3.json b/...uts/3e978968784236f46d062ea1c097f0f0.json → ...uts/bd924e81b959edc830ca5e48147a41a3.json
diff --git a/deployments/arbitrumNova/ERC1155TieredSales.json b/deployments/arbitrumNova/ERC1155TieredSales.json
diff --git a/deployments/arbitrumNova/ERC1155TieredSalesERC2771.json b/deployments/arbitrumNova/ERC1155TieredSalesERC2771.json
diff --git a/deployments/arbitrumNova/ERC20TieredSales.json b/deployments/arbitrumNova/ERC20TieredSales.json
diff --git a/deployments/arbitrumNova/ERC20TieredSalesERC2771.json b/deployments/arbitrumNova/ERC20TieredSalesERC2771.json
diff --git a/deployments/arbitrumNova/ERC721TieredSales.json b/deployments/arbitrumNova/ERC721TieredSales.json
diff --git a/deployments/arbitrumNova/ERC721TieredSalesERC2771.json b/deployments/arbitrumNova/ERC721TieredSalesERC2771.json
diff --git a/deployments/arbitrumNova/License.json b/deployments/arbitrumNova/License.json
diff --git a/deployments/arbitrumNova/MetadataOwnable.json b/deployments/arbitrumNova/MetadataOwnable.json
diff --git a/deployments/arbitrumNova/TieredSalesOwnable.json b/deployments/arbitrumNova/TieredSalesOwnable.json
diff --git a/deployments/arbitrumNova/Withdrawable.json b/deployments/arbitrumNova/Withdrawable.json
diff --git a/deployments/arbitrumNova/solcInputs/24f964636901b23f343eb88b8f5f82cb.json b/deployments/arbitrumNova/solcInputs/24f964636901b23f343eb88b8f5f82cb.json
diff --git a/deployments/arbitrumNova/solcInputs/babb323e8d447d3ed5545515696dedf9.json b/deployments/arbitrumNova/solcInputs/babb323e8d447d3ed5545515696dedf9.json
diff --git a/...uts/ca059977d32f68bb41c99340fafff131.json → ...uts/bd924e81b959edc830ca5e48147a41a3.json b/...uts/ca059977d32f68bb41c99340fafff131.json → ...uts/bd924e81b959edc830ca5e48147a41a3.json
diff --git a/deployments/arbitrumOne/ERC20TieredSales.json b/deployments/arbitrumOne/ERC20TieredSales.json
diff --git a/deployments/arbitrumOne/ERC20TieredSalesERC2771.json b/deployments/arbitrumOne/ERC20TieredSalesERC2771.json
diff --git a/deployments/arbitrumOne/MetadataOwnable.json b/deployments/arbitrumOne/MetadataOwnable.json
diff --git a/deployments/arbitrumOne/TieredSalesOwnable.json b/deployments/arbitrumOne/TieredSalesOwnable.json
diff --git a/deployments/arbitrumOne/solcInputs/0caef732459256ed443151237936b3f9.json b/deployments/arbitrumOne/solcInputs/0caef732459256ed443151237936b3f9.json
diff --git a/deployments/arbitrumTestnet/.chainId b/deployments/arbitrumTestnet/.chainId