move 4337-passkeys-singleton-signer to 4337-passkeys

safe-global · Jun 10, 2024 · 7967b4a · 7967b4a
1 parent bad527c
commit 7967b4a
Show file tree

Hide file tree

Showing 49 changed files with 539 additions and 564 deletions.
diff --git a/...37-passkeys-singleton-signer/.env.example → examples/4337-passkeys/.env.example b/...37-passkeys-singleton-signer/.env.example → examples/4337-passkeys/.env.example
diff --git a/...7-passkeys-singleton-signer/.eslintrc.cjs → examples/4337-passkeys/.eslintrc.cjs b/...7-passkeys-singleton-signer/.eslintrc.cjs → examples/4337-passkeys/.eslintrc.cjs
diff --git a/...4337-passkeys-singleton-signer/.gitignore → examples/4337-passkeys/.gitignore b/...4337-passkeys-singleton-signer/.gitignore → examples/4337-passkeys/.gitignore
diff --git a/.../4337-passkeys-singleton-signer/README.md → examples/4337-passkeys/README.md b/.../4337-passkeys-singleton-signer/README.md → examples/4337-passkeys/README.md
@@ -1,6 +1,6 @@
 # Safe + 4337 + Passkeys example application
 
-This minimalistic example application demonstrates a Safe{Core} Smart Account deployment leveraging 4337 and Passkeys. It uses experimental and unaudited (at the moment of writing) contracts: [TestWebAuthnSingletonSigner](https://github.com/safe-global/safe-modules/blob/64fda14111b800ec23b48d93a1288324725fd579/modules/passkey/contracts/test/TestWebAuthnSingletonSigner.sol). The `TestWebAuthnSingletonSigner` allows specifying any signature verifier, including the precompile, but the app chooses to use [FreshCryptoLib](https://github.com/rdubois-crypto/FreshCryptoLib/) verifier under the hood.
+This minimalistic example application demonstrates a Safe{Core} Smart Account deployment leveraging 4337 and Passkeys. It uses unaudited (at the moment of writing) contracts: [SafeWebAuthnSharedSigner](https://github.com/safe-global/safe-modules/blob/main/modules/passkey/contracts/4337/SafeWebAuthnSharedSigner.sol). The `SafeWebAuthnSharedSigner` allows specifying any signature verifier, including the precompile, but the app chooses to use [FreshCryptoLib](https://github.com/rdubois-crypto/FreshCryptoLib/) verifier under the hood.
 
 ## Running the app
 
@@ -33,7 +33,7 @@ Helpful links:
 ### Run the app in development mode
 
 ```bash
-pnpm run -F {examples/4337-passkeys-singleton-signer} dev
+pnpm run --filter @safe-global/safe-modules-example-4337-passkeys dev
 ```
 
 ## Config adjustments

diff --git a/...4337-passkeys-singleton-signer/index.html → examples/4337-passkeys/index.html b/...4337-passkeys-singleton-signer/index.html → examples/4337-passkeys/index.html
diff --git a/...37-passkeys-singleton-signer/package.json → examples/4337-passkeys/package.json b/...37-passkeys-singleton-signer/package.json → examples/4337-passkeys/package.json
diff --git a/...eys-singleton-signer/public/safe-logo.svg → examples/4337-passkeys/public/safe-logo.svg b/...eys-singleton-signer/public/safe-logo.svg → examples/4337-passkeys/public/safe-logo.svg
diff --git a/...n-signer/src/components/ConnectButton.tsx → ...passkeys/src/components/ConnectButton.tsx b/...n-signer/src/components/ConnectButton.tsx → ...passkeys/src/components/ConnectButton.tsx
diff --git a/...n-signer/src/components/ConnectWallet.tsx → ...passkeys/src/components/ConnectWallet.tsx b/...n-signer/src/components/ConnectWallet.tsx → ...passkeys/src/components/ConnectWallet.tsx
diff --git a/...rc/components/MissingAccountFundsCard.tsx → ...rc/components/MissingAccountFundsCard.tsx b/...rc/components/MissingAccountFundsCard.tsx → ...rc/components/MissingAccountFundsCard.tsx
diff --git a/...signer/src/components/SendNativeToken.tsx → ...sskeys/src/components/SendNativeToken.tsx b/...signer/src/components/SendNativeToken.tsx → ...sskeys/src/components/SendNativeToken.tsx
diff --git a/...n-signer/src/components/SwitchNetwork.tsx → ...passkeys/src/components/SwitchNetwork.tsx b/...n-signer/src/components/SwitchNetwork.tsx → ...passkeys/src/components/SwitchNetwork.tsx
diff --git a/...7-passkeys-singleton-signer/src/config.ts → examples/4337-passkeys/src/config.ts b/...7-passkeys-singleton-signer/src/config.ts → examples/4337-passkeys/src/config.ts
diff --git a/...ton-signer/src/hooks/UseOutletContext.tsx → ...7-passkeys/src/hooks/UseOutletContext.tsx b/...ton-signer/src/hooks/UseOutletContext.tsx → ...7-passkeys/src/hooks/UseOutletContext.tsx
diff --git a/...eton-signer/src/hooks/useCodeAtAddress.ts → ...37-passkeys/src/hooks/useCodeAtAddress.ts b/...eton-signer/src/hooks/useCodeAtAddress.ts → ...37-passkeys/src/hooks/useCodeAtAddress.ts
diff --git a/.../src/hooks/useEntryPointAccountBalance.ts → .../src/hooks/useEntryPointAccountBalance.ts b/.../src/hooks/useEntryPointAccountBalance.ts → .../src/hooks/useEntryPointAccountBalance.ts
diff --git a/...er/src/hooks/useEntryPointAccountNonce.ts → ...ys/src/hooks/useEntryPointAccountNonce.ts b/...er/src/hooks/useEntryPointAccountNonce.ts → ...ys/src/hooks/useEntryPointAccountNonce.ts
diff --git a/...-singleton-signer/src/hooks/useFeeData.ts → ...les/4337-passkeys/src/hooks/useFeeData.ts b/...-singleton-signer/src/hooks/useFeeData.ts → ...les/4337-passkeys/src/hooks/useFeeData.ts
diff --git a/...-signer/src/hooks/useLocalStorageState.ts → ...asskeys/src/hooks/useLocalStorageState.ts b/...-signer/src/hooks/useLocalStorageState.ts → ...asskeys/src/hooks/useLocalStorageState.ts
diff --git a/...signer/src/hooks/useNativeTokenBalance.ts → ...sskeys/src/hooks/useNativeTokenBalance.ts b/...signer/src/hooks/useNativeTokenBalance.ts → ...sskeys/src/hooks/useNativeTokenBalance.ts
diff --git a/...igner/src/hooks/useUserOpGasEstimation.ts → ...skeys/src/hooks/useUserOpGasEstimation.ts b/...igner/src/hooks/useUserOpGasEstimation.ts → ...skeys/src/hooks/useUserOpGasEstimation.ts
diff --git a/...7-passkeys-singleton-signer/src/index.css → examples/4337-passkeys/src/index.css b/...7-passkeys-singleton-signer/src/index.css → examples/4337-passkeys/src/index.css
diff --git a/...keys-singleton-signer/src/logic/erc721.ts → examples/4337-passkeys/src/logic/erc721.ts b/...keys-singleton-signer/src/logic/erc721.ts → examples/4337-passkeys/src/logic/erc721.ts
diff --git a/...ys-singleton-signer/src/logic/passkeys.ts → examples/4337-passkeys/src/logic/passkeys.ts b/...ys-singleton-signer/src/logic/passkeys.ts → examples/4337-passkeys/src/logic/passkeys.ts
diff --git a/...sskeys-singleton-signer/src/logic/safe.ts → examples/4337-passkeys/src/logic/safe.ts b/...sskeys-singleton-signer/src/logic/safe.ts → examples/4337-passkeys/src/logic/safe.ts
@@ -2,7 +2,7 @@ import { ethers } from 'ethers'
 import { abi as SetupModuleSetupAbi } from '@safe-global/safe-4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
 import { abi as SafeSingletonAbi } from '@safe-global/safe-contracts/build/artifacts/contracts/Safe.sol/Safe.json'
 import { abi as MultiSendAbi } from '@safe-global/safe-contracts/build/artifacts/contracts/libraries/MultiSend.sol/MultiSend.json'
-import { abi as SafeWebAuthnSharedSignerAbi } from '@safe-global/safe-passkey/build/artifacts/contracts/4337/experimental/SafeWebAuthnSharedSigner.sol/SafeWebAuthnSharedSigner.json'
+import { abi as SafeWebAuthnSharedSignerAbi } from '@safe-global/safe-passkey/build/artifacts/contracts/4337/SafeWebAuthnSharedSigner.sol/SafeWebAuthnSharedSigner.json'
 import { abi as Safe4337ModuleAbi } from '@safe-global/safe-4337/build/artifacts/contracts/Safe4337Module.sol/Safe4337Module.json'
 import { abi as SafeProxyFactoryAbi } from '@safe-global/safe-4337/build/artifacts/@safe-global/safe-contracts/contracts/proxies/SafeProxyFactory.sol/SafeProxyFactory.json'
 import type { Safe4337Module, SafeModuleSetup, SafeProxyFactory, SafeL2, MultiSend } from '@safe-global/safe-4337/dist/typechain-types/'

diff --git a/...ngleton-signer/src/logic/safeWalletApp.ts → .../4337-passkeys/src/logic/safeWalletApp.ts b/...ngleton-signer/src/logic/safeWalletApp.ts → .../4337-passkeys/src/logic/safeWalletApp.ts
diff --git a/...eys-singleton-signer/src/logic/storage.ts → examples/4337-passkeys/src/logic/storage.ts b/...eys-singleton-signer/src/logic/storage.ts → examples/4337-passkeys/src/logic/storage.ts
diff --git a/...keys-singleton-signer/src/logic/userOp.ts → examples/4337-passkeys/src/logic/userOp.ts b/...keys-singleton-signer/src/logic/userOp.ts → examples/4337-passkeys/src/logic/userOp.ts
diff --git a/...eys-singleton-signer/src/logic/wallets.ts → examples/4337-passkeys/src/logic/wallets.ts b/...eys-singleton-signer/src/logic/wallets.ts → examples/4337-passkeys/src/logic/wallets.ts
diff --git a/...37-passkeys-singleton-signer/src/main.tsx → examples/4337-passkeys/src/main.tsx b/...37-passkeys-singleton-signer/src/main.tsx → examples/4337-passkeys/src/main.tsx
diff --git a/...leton-signer/src/routes/CreatePasskey.tsx → ...337-passkeys/src/routes/CreatePasskey.tsx b/...leton-signer/src/routes/CreatePasskey.tsx → ...337-passkeys/src/routes/CreatePasskey.tsx
diff --git a/...ingleton-signer/src/routes/DeploySafe.tsx → ...s/4337-passkeys/src/routes/DeploySafe.tsx b/...ingleton-signer/src/routes/DeploySafe.tsx → ...s/4337-passkeys/src/routes/DeploySafe.tsx
diff --git a/...keys-singleton-signer/src/routes/Home.tsx → examples/4337-passkeys/src/routes/Home.tsx b/...keys-singleton-signer/src/routes/Home.tsx → examples/4337-passkeys/src/routes/Home.tsx
diff --git a/...keys-singleton-signer/src/routes/Root.tsx → examples/4337-passkeys/src/routes/Root.tsx b/...keys-singleton-signer/src/routes/Root.tsx → examples/4337-passkeys/src/routes/Root.tsx
diff --git a/...keys-singleton-signer/src/routes/Safe.tsx → examples/4337-passkeys/src/routes/Safe.tsx b/...keys-singleton-signer/src/routes/Safe.tsx → examples/4337-passkeys/src/routes/Safe.tsx
diff --git a/...-singleton-signer/src/routes/constants.ts → ...les/4337-passkeys/src/routes/constants.ts b/...-singleton-signer/src/routes/constants.ts → ...les/4337-passkeys/src/routes/constants.ts
diff --git a/...37-passkeys-singleton-signer/src/utils.ts → examples/4337-passkeys/src/utils.ts b/...37-passkeys-singleton-signer/src/utils.ts → examples/4337-passkeys/src/utils.ts
diff --git a/...sskeys-singleton-signer/src/vite-env.d.ts → examples/4337-passkeys/src/vite-env.d.ts b/...sskeys-singleton-signer/src/vite-env.d.ts → examples/4337-passkeys/src/vite-env.d.ts
diff --git a/...7-passkeys-singleton-signer/tsconfig.json → examples/4337-passkeys/tsconfig.json b/...7-passkeys-singleton-signer/tsconfig.json → examples/4337-passkeys/tsconfig.json
diff --git a/...skeys-singleton-signer/tsconfig.node.json → examples/4337-passkeys/tsconfig.node.json b/...skeys-singleton-signer/tsconfig.node.json → examples/4337-passkeys/tsconfig.node.json
diff --git a/...-passkeys-singleton-signer/vite.config.ts → examples/4337-passkeys/vite.config.ts b/...-passkeys-singleton-signer/vite.config.ts → examples/4337-passkeys/vite.config.ts
diff --git a/...key/contracts/4337/experimental/README.md → modules/passkey/contracts/4337/README.md b/...key/contracts/4337/experimental/README.md → modules/passkey/contracts/4337/README.md
diff --git a/...experimental/SafeWebAuthnSharedSigner.sol → ...ntracts/4337/SafeWebAuthnSharedSigner.sol b/...experimental/SafeWebAuthnSharedSigner.sol → ...ntracts/4337/SafeWebAuthnSharedSigner.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0;
 
-import {SignatureValidator} from "../../base/SignatureValidator.sol";
-import {ISafe} from "../../interfaces/ISafe.sol";
-import {P256, WebAuthn} from "../../libraries/WebAuthn.sol";
+import {SignatureValidator} from "../base/SignatureValidator.sol";
+import {ISafe} from "../interfaces/ISafe.sol";
+import {P256, WebAuthn} from "../libraries/WebAuthn.sol";
 
 /**
  * @title Safe WebAuthn Shared Signer

diff --git a/modules/passkey/contracts/test/TestSharedWebAuthnSignerAccessor.sol b/modules/passkey/contracts/test/TestSharedWebAuthnSignerAccessor.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import {SafeWebAuthnSharedSigner} from "../4337/experimental/SafeWebAuthnSharedSigner.sol";
+import {SafeWebAuthnSharedSigner} from "../4337/SafeWebAuthnSharedSigner.sol";
 
 contract TestSharedWebAuthnSignerAccessor {
     function getSignerConfiguration(address sharedSigner) external view returns (SafeWebAuthnSharedSigner.Signer memory signer) {