chore: merge remote-tracking branch 'origin/development' into msca-base

alchemyplatform · Nov 14, 2023 · b573ea6 · b573ea6
2 parents 3552335 + 188ccd1
commit b573ea6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/packages/accounts/CHANGELOG.md b/packages/accounts/CHANGELOG.md
@@ -13,7 +13,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - entry point address as optional to SmartAccountProvider ([#180](https://github.com/alchemyplatform/aa-sdk/issues/180)) ([f5c378b](https://github.com/alchemyplatform/aa-sdk/commit/f5c378ba1cb04bdc1e41c3e6dd0eba1cb6ee7f2c))
 - remove AA_SDK_TESTS_SIGNER_TYPE constant exported from aa-core ([#232](https://github.com/alchemyplatform/aa-sdk/issues/232)) ([883c489](https://github.com/alchemyplatform/aa-sdk/commit/883c489b077d587b6c5b50c44d92b2a00f10e5ac))
 - use alchemy provider, light account for e2e tests ([#209](https://github.com/alchemyplatform/aa-sdk/issues/209)) ([124be68](https://github.com/alchemyplatform/aa-sdk/commit/124be68c5137a3511ec612e814265739e6909e75))
-
 - remove AA_SDK_TESTS_SIGNER_TYPE constant exported from aa-core ([#232](https://github.com/alchemyplatform/aa-sdk/issues/232)) ([5170a6b](https://github.com/alchemyplatform/aa-sdk/commit/5170a6b689c9834a9a2489f054b767e190fa38f7))
 
 # 0.2.0 (2023-11-03)

diff --git a/packages/accounts/src/light-account/utils.ts b/packages/accounts/src/light-account/utils.ts
@@ -5,10 +5,12 @@ import {
   arbitrumSepolia,
   base,
   baseGoerli,
+  baseSepolia,
   goerli,
   mainnet,
   optimism,
   optimismGoerli,
+  optimismSepolia,
   polygon,
   polygonMumbai,
   sepolia,
@@ -30,11 +32,13 @@ export const getDefaultLightAccountFactoryAddress = (chain: Chain): Address => {
     case polygonMumbai.id:
     case optimism.id:
     case optimismGoerli.id:
+    case optimismSepolia.id:
     case arbitrum.id:
     case arbitrumGoerli.id:
     case arbitrumSepolia.id:
     case base.id:
     case baseGoerli.id:
+    case baseSepolia.id:
       return "0x00000055C0b4fA41dde26A74435ff03692292FBD";
   }
   throw new Error(

diff --git a/packages/alchemy/src/chains.ts b/packages/alchemy/src/chains.ts
@@ -2,16 +2,18 @@ import type { Chain } from "viem";
 import {
   arbitrum,
   arbitrumGoerli,
+  arbitrumSepolia,
   goerli,
   mainnet,
   optimism,
   optimismGoerli,
+  optimismSepolia,
   polygon,
   polygonMumbai,
   sepolia,
   base,
   baseGoerli,
-  arbitrumSepolia,
+  baseSepolia,
 } from "viem/chains";
 
 export const SupportedChains = new Map<number, Chain>([
@@ -25,6 +27,8 @@ export const SupportedChains = new Map<number, Chain>([
   [arbitrum.id, arbitrum],
   [optimism.id, optimism],
   [optimismGoerli.id, optimismGoerli],
+  [optimismSepolia.id, optimismSepolia],
   [base.id, base],
   [baseGoerli.id, baseGoerli],
+  [baseSepolia.id, baseSepolia],
 ]);
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -15,8 +15,8 @@ export type { BaseSmartAccountParams } from "./account/types.js";
 export { LocalAccountSigner } from "./signer/local-account.js";
 export { SignerSchema } from "./signer/schema.js";
 export type {
-  SmartAccountSigner,
   SmartAccountAuthenticator,
+  SmartAccountSigner,
 } from "./signer/types.js";
 export {
   verifyEIP6492Signature,

diff --git a/packages/core/src/utils/defaults.ts b/packages/core/src/utils/defaults.ts
@@ -5,10 +5,12 @@ import {
   arbitrumSepolia,
   base,
   baseGoerli,
+  baseSepolia,
   goerli,
   mainnet,
   optimism,
   optimismGoerli,
+  optimismSepolia,
   polygon,
   polygonMumbai,
   sepolia,
@@ -30,11 +32,13 @@ export const getDefaultEntryPointAddress = (chain: Chain): Address => {
     case polygonMumbai.id:
     case optimism.id:
     case optimismGoerli.id:
+    case optimismSepolia.id:
     case arbitrum.id:
     case arbitrumGoerli.id:
     case arbitrumSepolia.id:
     case base.id:
     case baseGoerli.id:
+    case baseSepolia.id:
       return "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
   }
   throw new Error(
@@ -56,9 +60,11 @@ export const getDefaultSimpleAccountFactoryAddress = (
     case mainnet.id:
     case polygon.id:
     case optimism.id:
+    case optimismSepolia.id:
     case arbitrum.id:
     case base.id:
     case baseGoerli.id:
+    case baseSepolia.id:
     case arbitrumSepolia.id:
       return "0x15Ba39375ee2Ab563E8873C8390be6f2E2F50232";
     case sepolia.id: