feat: use smart contract from npm package + fix APM deployment script

1Hive · Jul 30, 2023 · f2629b2 · f2629b2
1 parent d94b11f
commit f2629b2
Show file tree

Hide file tree

Showing 116 changed files with 8,419 additions and 15,645 deletions.
diff --git a/contracts/.npmignore b/contracts/.npmignore
diff --git a/contracts/MockImports.sol b/contracts/MockImports.sol
@@ -0,0 +1,19 @@
+pragma solidity 0.4.24;
+
+import "@aragon/os/contracts/acl/ACL.sol";
+import "@aragon/os/contracts/kernel/Kernel.sol";
+import "@aragon/os/contracts/factory/DAOFactory.sol";
+import "@aragon/os/contracts/factory/APMRegistryFactory.sol";
+import "@aragon/os/contracts/factory/ENSFactory.sol";
+import "@aragon/os/contracts/apm/APMRegistry.sol";
+import "@aragon/os/contracts/apm/Repo.sol";
+import "@aragon/os/contracts/ens/ENSSubdomainRegistrar.sol";
+import "@aragon/os/contracts/lib/ens/ENS.sol";
+import "@aragon/os/contracts/lib/ens/AbstractENS.sol";
+
+import "@aragon/id/contracts/FIFSResolvingRegistrar.sol";
+
+// import "@aragon/apps-shared-minime/contracts/MiniMeToken.sol";
+
+
+contract MockImports {}
diff --git a/contracts/acl/ACL.sol b/contracts/acl/ACL.sol
diff --git a/contracts/acl/ACLSyntaxSugar.sol b/contracts/acl/ACLSyntaxSugar.sol
diff --git a/contracts/acl/IACL.sol b/contracts/acl/IACL.sol
diff --git a/contracts/acl/IACLOracle.sol b/contracts/acl/IACLOracle.sol
diff --git a/contracts/apm/APMNamehash.sol b/contracts/apm/APMNamehash.sol
diff --git a/contracts/apm/APMRegistry.sol b/contracts/apm/APMRegistry.sol