Rename Workspace Packages

safe-global · Mar 7, 2024 · aa5b37e · aa5b37e
1 parent 92e5bc0
commit aa5b37e
Show file tree

Hide file tree

Showing 42 changed files with 258 additions and 230 deletions.
diff --git a/.github/workflows/ci_passkey_example.yml b/.github/workflows/ci_passkey_example.yml
@@ -4,7 +4,7 @@ on:
     paths:
       - 'modules/4337/**'
       - 'modules/passkey/**'
-      - 'examples/safe-4337-passkeys/**'
+      - 'examples/4337-passkeys/**'
 
 jobs:
   checks:
@@ -22,8 +22,8 @@ jobs:
           npm run build -w modules/4337
           # Reinstall the dependencies so the 4337 dependency includes artifacts
           npm ci
-          npm run lint -w examples/safe-4337-passkeys
-          npm run build -w examples/safe-4337-passkeys
+          npm run lint -w examples/4337-passkeys
+          npm run build -w examples/4337-passkeys
         env:
           VITE_WC_CLOUD_PROJECT_ID: ${{ secrets.VITE_WC_CLOUD_PROJECT_ID }}
           VITE_WC_4337_BUNDLER_URL: ${{ secrets.VITE_WC_4337_BUNDLER_URL }}
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@ This repository contains a collection of modules for the [Safe Smart Account](ht
 
 ## Examples
 
-- [Safe + 4337 + Passkeys](./examples/safe-4337-passkeys)
+- [Safe + 4337 + Passkeys](./examples/4337-passkeys)
+- [4337 Gas Metering](./examples/4337-gas-metering)
 
 ## Security and Liability
 

diff --git a/examples/4337-gas-metering/package.json b/examples/4337-gas-metering/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@safe-global/4337-gas-metering",
+  "name": "@safe-global/safe-modules-example-4337-gas-metering",
   "version": "1.0.0",
   "description": "Gas Metering Analysis for Safe with 4337 Module",
   "homepage": "https://github.com/safe-global/safe-modules/4337-gas-metering",

diff --git a/examples/safe-4337-passkeys/.env.example → examples/4337-passkeys/.env.example b/examples/safe-4337-passkeys/.env.example → examples/4337-passkeys/.env.example
diff --git a/examples/safe-4337-passkeys/.eslintrc.cjs → examples/4337-passkeys/.eslintrc.cjs b/examples/safe-4337-passkeys/.eslintrc.cjs → examples/4337-passkeys/.eslintrc.cjs
diff --git a/examples/safe-4337-passkeys/.gitignore → examples/4337-passkeys/.gitignore b/examples/safe-4337-passkeys/.gitignore → examples/4337-passkeys/.gitignore
diff --git a/examples/safe-4337-passkeys/README.md → examples/4337-passkeys/README.md b/examples/safe-4337-passkeys/README.md → examples/4337-passkeys/README.md
@@ -33,7 +33,7 @@ Helpful links:
 ### Run the app in development mode
 
 ```bash
-npm run dev -w examples/safe-4337-passkeys
+npm run dev -w examples/4337-passkeys
 ```
 
 ## Config adjustments

diff --git a/examples/safe-4337-passkeys/index.html → examples/4337-passkeys/index.html b/examples/safe-4337-passkeys/index.html → examples/4337-passkeys/index.html
diff --git a/examples/safe-4337-passkeys/package.json → examples/4337-passkeys/package.json b/examples/safe-4337-passkeys/package.json → examples/4337-passkeys/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "safe-4337-passkeys",
+  "name": "@safe-global/safe-modules-example-4337-passkeys",
   "private": true,
   "version": "0.0.0",
   "type": "module",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@web3modal/ethers": "^4.0.5",
-    "@safe-global/safe-erc4337": "^0.3.0",
+    "@safe-global/safe-4337": "^0.3.0",
     "ethers": "^6.11.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

diff --git a/...s/safe-4337-passkeys/public/safe-logo.svg → examples/4337-passkeys/public/safe-logo.svg b/...s/safe-4337-passkeys/public/safe-logo.svg → examples/4337-passkeys/public/safe-logo.svg
diff --git a/examples/safe-4337-passkeys/src/App.css → examples/4337-passkeys/src/App.css b/examples/safe-4337-passkeys/src/App.css → examples/4337-passkeys/src/App.css
diff --git a/examples/safe-4337-passkeys/src/App.tsx → examples/4337-passkeys/src/App.tsx b/examples/safe-4337-passkeys/src/App.tsx → examples/4337-passkeys/src/App.tsx
diff --git a/...passkeys/src/components/ConnectButton.tsx → ...passkeys/src/components/ConnectButton.tsx b/...passkeys/src/components/ConnectButton.tsx → ...passkeys/src/components/ConnectButton.tsx
diff --git a/...passkeys/src/components/OpPrefundCard.tsx → ...passkeys/src/components/OpPrefundCard.tsx b/...passkeys/src/components/OpPrefundCard.tsx → ...passkeys/src/components/OpPrefundCard.tsx
diff --git a/...7-passkeys/src/components/PasskeyCard.tsx → ...7-passkeys/src/components/PasskeyCard.tsx b/...7-passkeys/src/components/PasskeyCard.tsx → ...7-passkeys/src/components/PasskeyCard.tsx
diff --git a/...4337-passkeys/src/components/SafeCard.tsx → ...4337-passkeys/src/components/SafeCard.tsx b/...4337-passkeys/src/components/SafeCard.tsx → ...4337-passkeys/src/components/SafeCard.tsx
diff --git a/examples/safe-4337-passkeys/src/config.ts → examples/4337-passkeys/src/config.ts b/examples/safe-4337-passkeys/src/config.ts → examples/4337-passkeys/src/config.ts
diff --git a/...37-passkeys/src/hooks/useCodeAtAddress.ts → ...37-passkeys/src/hooks/useCodeAtAddress.ts b/...37-passkeys/src/hooks/useCodeAtAddress.ts → ...37-passkeys/src/hooks/useCodeAtAddress.ts
diff --git a/...afe-4337-passkeys/src/hooks/useFeeData.ts → ...les/4337-passkeys/src/hooks/useFeeData.ts b/...afe-4337-passkeys/src/hooks/useFeeData.ts → ...les/4337-passkeys/src/hooks/useFeeData.ts
diff --git a/...asskeys/src/hooks/useLocalStorageState.ts → ...asskeys/src/hooks/useLocalStorageState.ts b/...asskeys/src/hooks/useLocalStorageState.ts → ...asskeys/src/hooks/useLocalStorageState.ts
diff --git a/...sskeys/src/hooks/useNativeTokenBalance.ts → ...sskeys/src/hooks/useNativeTokenBalance.ts b/...sskeys/src/hooks/useNativeTokenBalance.ts → ...sskeys/src/hooks/useNativeTokenBalance.ts
diff --git a/...skeys/src/hooks/useUserOpGasEstimation.ts → ...skeys/src/hooks/useUserOpGasEstimation.ts b/...skeys/src/hooks/useUserOpGasEstimation.ts → ...skeys/src/hooks/useUserOpGasEstimation.ts
diff --git a/examples/safe-4337-passkeys/src/index.css → examples/4337-passkeys/src/index.css b/examples/safe-4337-passkeys/src/index.css → examples/4337-passkeys/src/index.css
diff --git a/...es/safe-4337-passkeys/src/logic/erc721.ts → examples/4337-passkeys/src/logic/erc721.ts b/...es/safe-4337-passkeys/src/logic/erc721.ts → examples/4337-passkeys/src/logic/erc721.ts
diff --git a/.../safe-4337-passkeys/src/logic/passkeys.ts → examples/4337-passkeys/src/logic/passkeys.ts b/.../safe-4337-passkeys/src/logic/passkeys.ts → examples/4337-passkeys/src/logic/passkeys.ts
diff --git a/...ples/safe-4337-passkeys/src/logic/safe.ts → examples/4337-passkeys/src/logic/safe.ts b/...ples/safe-4337-passkeys/src/logic/safe.ts → examples/4337-passkeys/src/logic/safe.ts
@@ -1,21 +1,21 @@
 import { ethers } from 'ethers'
-import { abi as SafeSignerLaunchpadAbi } from '@safe-global/safe-erc4337/build/artifacts/contracts/experimental/SafeSignerLaunchpad.sol/SafeSignerLaunchpad.json'
-import { abi as WebAuthnSignerFactoryAbi } from '@safe-global/safe-erc4337/build/artifacts/contracts/experimental/WebAuthnSigner.sol/WebAuthnSignerFactory.json'
-import { abi as SetupModuleSetupAbi } from '@safe-global/safe-erc4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
+import { abi as SafeSignerLaunchpadAbi } from '@safe-global/safe-4337/build/artifacts/contracts/experimental/SafeSignerLaunchpad.sol/SafeSignerLaunchpad.json'
+import { abi as WebAuthnSignerFactoryAbi } from '@safe-global/safe-4337/build/artifacts/contracts/experimental/WebAuthnSigner.sol/WebAuthnSignerFactory.json'
+import { abi as SetupModuleSetupAbi } from '@safe-global/safe-4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
 import {
   abi as WebAuthnSignerAbi,
   bytecode as WebAuthSignerBytecode,
-} from '@safe-global/safe-erc4337/build/artifacts/contracts/experimental/WebAuthnSigner.sol/WebAuthnSigner.json'
-import { abi as Safe4337ModuleAbi } from '@safe-global/safe-erc4337/build/artifacts/contracts/Safe4337Module.sol/Safe4337Module.json'
-import { abi as SafeProxyFactoryAbi } from '@safe-global/safe-erc4337/build/artifacts/@safe-global/safe-contracts/contracts/proxies/SafeProxyFactory.sol/SafeProxyFactory.json'
+} from '@safe-global/safe-4337/build/artifacts/contracts/experimental/WebAuthnSigner.sol/WebAuthnSigner.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 {
   SafeSignerLaunchpad,
   Safe4337Module,
   SafeProxyFactory,
   WebAuthnSigner,
   WebAuthnSignerFactory,
   SafeModuleSetup,
-} from '@safe-global/safe-erc4337/typechain-types/'
+} from '@safe-global/safe-4337/typechain-types/'
 
 import {
   SAFE_SIGNER_LAUNCHPAD_ADDRESS,

diff --git a/...s/safe-4337-passkeys/src/logic/storage.ts → examples/4337-passkeys/src/logic/storage.ts b/...s/safe-4337-passkeys/src/logic/storage.ts → examples/4337-passkeys/src/logic/storage.ts
diff --git a/...es/safe-4337-passkeys/src/logic/userOp.ts → examples/4337-passkeys/src/logic/userOp.ts b/...es/safe-4337-passkeys/src/logic/userOp.ts → examples/4337-passkeys/src/logic/userOp.ts
diff --git a/...s/safe-4337-passkeys/src/logic/wallets.ts → examples/4337-passkeys/src/logic/wallets.ts b/...s/safe-4337-passkeys/src/logic/wallets.ts → examples/4337-passkeys/src/logic/wallets.ts
diff --git a/examples/safe-4337-passkeys/src/main.tsx → examples/4337-passkeys/src/main.tsx b/examples/safe-4337-passkeys/src/main.tsx → examples/4337-passkeys/src/main.tsx
diff --git a/examples/safe-4337-passkeys/src/utils.ts → examples/4337-passkeys/src/utils.ts b/examples/safe-4337-passkeys/src/utils.ts → examples/4337-passkeys/src/utils.ts
diff --git a/...ples/safe-4337-passkeys/src/vite-env.d.ts → examples/4337-passkeys/src/vite-env.d.ts b/...ples/safe-4337-passkeys/src/vite-env.d.ts → examples/4337-passkeys/src/vite-env.d.ts
diff --git a/examples/safe-4337-passkeys/tsconfig.json → examples/4337-passkeys/tsconfig.json b/examples/safe-4337-passkeys/tsconfig.json → examples/4337-passkeys/tsconfig.json
diff --git a/...les/safe-4337-passkeys/tsconfig.node.json → examples/4337-passkeys/tsconfig.node.json b/...les/safe-4337-passkeys/tsconfig.node.json → examples/4337-passkeys/tsconfig.node.json
diff --git a/examples/safe-4337-passkeys/vite.config.ts → examples/4337-passkeys/vite.config.ts b/examples/safe-4337-passkeys/vite.config.ts → examples/4337-passkeys/vite.config.ts
diff --git a/modules/4337/package.json b/modules/4337/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@safe-global/safe-erc4337",
+  "name": "@safe-global/safe-4337",
   "version": "0.3.0",
   "description": "Safe Module for ERC-4337 support",
   "homepage": "https://github.com/safe-global/safe-modules/tree/main/modules/4337",

diff --git a/modules/passkey/package.json b/modules/passkey/package.json
@@ -43,7 +43,7 @@
     "@account-abstraction/contracts": "^0.7.0",
     "@noble/curves": "^1.3.0",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
-    "@safe-global/safe-erc4337": "^0.3.0",
+    "@safe-global/safe-4337": "^0.3.0",
     "@simplewebauthn/server": "^9.0.3",
     "cbor": "^9.0.2",
     "dotenv": "^16.4.5",

diff --git a/modules/passkey/src/deploy/safe.ts b/modules/passkey/src/deploy/safe.ts
@@ -1,8 +1,8 @@
 import MultiSend from '@safe-global/safe-contracts/build/artifacts/contracts/libraries/MultiSend.sol/MultiSend.json'
 import SafeProxyFactory from '@safe-global/safe-contracts/build/artifacts/contracts/proxies/SafeProxyFactory.sol/SafeProxyFactory.json'
 import SafeL2 from '@safe-global/safe-contracts/build/artifacts/contracts/SafeL2.sol/SafeL2.json'
-import Safe4337Module from '@safe-global/safe-erc4337/build/artifacts/contracts/Safe4337Module.sol/Safe4337Module.json'
-import SafeModuleSetup from '@safe-global/safe-erc4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
+import Safe4337Module from '@safe-global/safe-4337/build/artifacts/contracts/Safe4337Module.sol/Safe4337Module.json'
+import SafeModuleSetup from '@safe-global/safe-4337/build/artifacts/contracts/SafeModuleSetup.sol/SafeModuleSetup.json'
 import { DeployFunction } from 'hardhat-deploy/types'
 
 const deploy: DeployFunction = async ({ deployments, getNamedAccounts, network }) => {

diff --git a/modules/passkey/test/4337/WebAuthnSigner.spec.ts b/modules/passkey/test/4337/WebAuthnSigner.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { deployments, ethers, network } from 'hardhat'
-import { packGasParameters, unpackUserOperation } from '@safe-global/safe-erc4337/dist/src/utils/userOp'
+import { packGasParameters, unpackUserOperation } from '@safe-global/safe-4337/dist/src/utils/userOp'
 import { bundlerRpc, prepareAccounts, waitForUserOp } from '../utils/e2e'
 import { chainId } from '../utils/encoding'
 import { WebAuthnCredentials, decodePublicKey, encodeWebAuthnSignature } from '../utils/webauthn'

diff --git a/modules/passkey/test/utils/e2e.ts b/modules/passkey/test/utils/e2e.ts
@@ -1,5 +1,5 @@
 import { deployments, ethers } from 'hardhat'
-import { MultiProvider4337 } from '@safe-global/safe-erc4337/dist/src/utils/safe'
+import { MultiProvider4337 } from '@safe-global/safe-4337/dist/src/utils/safe'
 import { AddressLike, BigNumberish, BytesLike, HDNodeWallet } from 'ethers'
 import { PackedUserOperationStruct } from '../../typechain-types/@account-abstraction/contracts/interfaces/IAccount'