use oz5.0 libraries (#9)

* use oz5.0 libraries * fix init * empty * use locked deps; legacy peer deps * import Base64 from openzeppelin
Abstract-Foundation · Oct 30, 2024 · d4c548b · d4c548b
1 parent c1f887a
commit d4c548b
Show file tree

Hide file tree

Showing 27 changed files with 40 additions and 2,811 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-node@v4
       - name: Install dependencies
         run: |
-          npm install
+          npm ci --legacy-peer-deps
       - name: Build
         run: |
           npm run compile

diff --git a/contracts/AccountFactory.sol b/contracts/AccountFactory.sol
@@ -66,7 +66,7 @@ contract AccountFactory is Ownable {
         address _registry,
         bytes32 _proxyBytecodeHash,
         address _deployer
-    ) Ownable() {
+    ) Ownable(msg.sender) {
         implementationAddress = _implementation;
         registry = _registry;
         proxyBytecodeHash = _proxyBytecodeHash;

diff --git a/contracts/ClaveImplementation.sol b/contracts/ClaveImplementation.sol
@@ -64,7 +64,8 @@ contract ClaveImplementation is
         address initialK1Validator,
         bytes[] calldata modules,
         Call calldata initCall
-    ) public {
+    ) public initializer {
+        __ERC1271Handler_init();
         // check that this account is being deployed by the initial signer or the factory authorized deployer
         AccountFactory factory = AccountFactory(msg.sender);
         address thisDeployer = factory.accountToDeployer(address(this));

diff --git a/contracts/ClaveRegistry.sol b/contracts/ClaveRegistry.sol
@@ -24,7 +24,7 @@ contract ClaveRegistry is Ownable, IClaveRegistry {
     event FactoryUnset(address indexed factory);
 
     // Constructor function of the contracts
-    constructor() Ownable() {}
+    constructor() Ownable(msg.sender) {}
 
     /**
      * @notice Registers an account as a Clave account

diff --git a/contracts/cns/ClaveNameService.sol b/contracts/cns/ClaveNameService.sol
diff --git a/contracts/cns/IClaveNameService.sol b/contracts/cns/IClaveNameService.sol
diff --git a/contracts/earn/ClaveEarnRouter.sol b/contracts/earn/ClaveEarnRouter.sol