Skip to content

Commit

Permalink
Merge branch 'main' into rob/svg-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
RobChangCA committed Sep 18, 2024
2 parents ef340a5 + 90a0eaa commit f15baa1
Show file tree
Hide file tree
Showing 43 changed files with 750 additions and 81 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

### Features

- add support for social login ([#942](https://github.com/alchemyplatform/aa-sdk/issues/942)) ([aa00dc7](https://github.com/alchemyplatform/aa-sdk/commit/aa00dc7d880f6d9cf9ae29e63941a9552faa9dd5))

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package root
Expand Down
4 changes: 4 additions & 0 deletions aa-sdk/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

**Note:** Version bump only for package @aa-sdk/core

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @aa-sdk/core
Expand Down
2 changes: 1 addition & 1 deletion aa-sdk/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aa-sdk/core",
"license": "MIT",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "viem based SDK that enables interactions with ERC-4337 Smart Accounts. ABIs are based off the definitions generated in @account-abstraction/contracts",
"author": "Alchemy",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion aa-sdk/core/src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file is autogenerated by inject-version.ts. Any changes will be
// overwritten on commit!
export const VERSION = "4.0.0-beta.3";
export const VERSION = "4.0.0-beta.4";
4 changes: 4 additions & 0 deletions aa-sdk/ethers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

**Note:** Version bump only for package @aa-sdk/ethers

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @aa-sdk/ethers
Expand Down
6 changes: 3 additions & 3 deletions aa-sdk/ethers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aa-sdk/ethers",
"license": "MIT",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "Ethers.js wrapper for @aa-sdk/core",
"author": "Alchemy",
"type": "module",
Expand Down Expand Up @@ -42,15 +42,15 @@
"test:run-e2e": "vitest run --config vitest.config.e2e.ts"
},
"devDependencies": {
"@account-kit/smart-contracts": "^4.0.0-beta.3",
"@account-kit/smart-contracts": "^4.0.0-beta.4",
"alchemy-sdk": "^3.0.0",
"dotenv": "^16.0.3",
"typescript": "^5.0.4",
"typescript-template": "*",
"vitest": "^2.0.4"
},
"dependencies": {
"@aa-sdk/core": "^4.0.0-beta.3",
"@aa-sdk/core": "^4.0.0-beta.4",
"@ethersproject/abi": "^5.7.0",
"@ethersproject/abstract-signer": "^5.7.0",
"@ethersproject/bytes": "^5.7.0",
Expand Down
6 changes: 6 additions & 0 deletions account-kit/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

### Features

- add support for social login ([#942](https://github.com/alchemyplatform/aa-sdk/issues/942)) ([aa00dc7](https://github.com/alchemyplatform/aa-sdk/commit/aa00dc7d880f6d9cf9ae29e63941a9552faa9dd5))

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @account-kit/core
Expand Down
8 changes: 4 additions & 4 deletions account-kit/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@account-kit/core",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "Core library for account kit that provides state management and framework indepednent abstractions across infra, Alchemy Signer, and Smart Contracts",
"author": "Alchemy",
"license": "MIT",
Expand Down Expand Up @@ -46,9 +46,9 @@
"vitest": "^2.0.4"
},
"dependencies": {
"@account-kit/infra": "^4.0.0-beta.3",
"@account-kit/signer": "^4.0.0-beta.3",
"@account-kit/smart-contracts": "^4.0.0-beta.3",
"@account-kit/infra": "^4.0.0-beta.4",
"@account-kit/signer": "^4.0.0-beta.4",
"@account-kit/smart-contracts": "^4.0.0-beta.4",
"js-cookie": "^3.0.5",
"zod": "^3.22.4",
"zustand": "^4.5.2"
Expand Down
2 changes: 2 additions & 0 deletions account-kit/core/src/createConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const createConfig = (
ssr,
storage,
connectors,
enablePopupOauth,
...connectionConfig
} = params;

Expand Down Expand Up @@ -81,6 +82,7 @@ export const createConfig = (
iframeConfig,
rootOrgId,
rpId,
enablePopupOauth,
},
sessionConfig,
storage: storage?.(
Expand Down
10 changes: 10 additions & 0 deletions account-kit/core/src/store/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,16 @@ export const createSigner = (params: ClientStoreConfig) => {
const search = new URLSearchParams(window.location.search);
if (search.has("bundle")) {
signer.authenticate({ type: "email", bundle: search.get("bundle")! });
} else if (search.has("alchemy-bundle")) {
signer.authenticate({
type: "oauthReturn",
bundle: search.get("alchemy-bundle")!,
orgId: search.get("alchemy-org-id")!,
});
}

if (client.enablePopupOauth) {
signer.preparePopupOauth();
}

return signer;
Expand Down
9 changes: 9 additions & 0 deletions account-kit/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ export type CreateConfigProps = RpcConnectionConfig & {
storage?: (config?: { sessionLength: number }) => Storage;

connectors?: CreateConnectorFn[];

/**
* If set, calls `preparePopupOauth` immediately upon initializing the signer.
* If you intend to use popup-based OAuth login, you must either set this
* option to true or manually ensure that you call
* `signer.preparePopupOauth()` at some point before the user interaction that
* triggers the OAuth authentication flow.
*/
enablePopupOauth?: boolean;
} & Omit<
PartialBy<
Exclude<AlchemySignerParams["client"], AlchemySignerWebClient>,
Expand Down
2 changes: 1 addition & 1 deletion account-kit/core/src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file is autogenerated by inject-version.ts. Any changes will be
// overwritten on commit!
export const VERSION = "4.0.0-beta.3";
export const VERSION = "4.0.0-beta.4";
4 changes: 4 additions & 0 deletions account-kit/infra/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

**Note:** Version bump only for package @account-kit/infra

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @account-kit/infra
Expand Down
4 changes: 2 additions & 2 deletions account-kit/infra/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@account-kit/infra",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "adapters for @aa-sdk/core for interacting with alchemy services",
"author": "Alchemy",
"license": "MIT",
Expand Down Expand Up @@ -45,7 +45,7 @@
"vitest": "^2.0.4"
},
"dependencies": {
"@aa-sdk/core": "^4.0.0-beta.3",
"@aa-sdk/core": "^4.0.0-beta.4",
"eventemitter3": "^5.0.1",
"zod": "^3.22.4"
},
Expand Down
2 changes: 1 addition & 1 deletion account-kit/infra/src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file is autogenerated by inject-version.ts. Any changes will be
// overwritten on commit!
export const VERSION = "4.0.0-beta.3";
export const VERSION = "4.0.0-beta.4";
4 changes: 4 additions & 0 deletions account-kit/plugingen/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

**Note:** Version bump only for package @account-kit/plugingen

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @account-kit/plugingen
Expand Down
4 changes: 2 additions & 2 deletions account-kit/plugingen/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@account-kit/plugingen",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "A CLI tool that enables you to generate TS code for your ERC-6900 plugins",
"author": "Alchemy",
"license": "MIT",
Expand Down Expand Up @@ -60,7 +60,7 @@
},
"homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
"dependencies": {
"@aa-sdk/core": "^4.0.0-beta.3",
"@aa-sdk/core": "^4.0.0-beta.4",
"bundle-require": "^4.0.2",
"cac": "^6.7.14",
"change-case": "^5.4.3",
Expand Down
2 changes: 1 addition & 1 deletion account-kit/plugingen/src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file is autogenerated by inject-version.ts. Any changes will be
// overwritten on commit!
export const VERSION = "4.0.0-beta.3";
export const VERSION = "4.0.0-beta.4";
6 changes: 6 additions & 0 deletions account-kit/react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

### Features

- add support for social login ([#942](https://github.com/alchemyplatform/aa-sdk/issues/942)) ([aa00dc7](https://github.com/alchemyplatform/aa-sdk/commit/aa00dc7d880f6d9cf9ae29e63941a9552faa9dd5))

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @account-kit/react
Expand Down
6 changes: 3 additions & 3 deletions account-kit/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@account-kit/react",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "React components and hooks for using Account Kit",
"author": "Alchemy",
"license": "MIT",
Expand Down Expand Up @@ -67,8 +67,8 @@
"vitest": "^2.0.4"
},
"dependencies": {
"@account-kit/core": "^4.0.0-beta.3",
"@account-kit/infra": "^4.0.0-beta.3",
"@account-kit/core": "^4.0.0-beta.4",
"@account-kit/infra": "^4.0.0-beta.4",
"@tanstack/react-form": "^0.19.4",
"@tanstack/zod-form-adapter": "^0.19.4",
"@wagmi/connectors": "^4.3.9",
Expand Down
1 change: 1 addition & 0 deletions account-kit/react/src/hooks/useAuthenticate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export function useAuthenticate(
): UseAuthenticateResult {
const { queryClient } = useAlchemyAccountContext();
const signer = useSigner();

const {
mutate: authenticate,
mutateAsync: authenticateAsync,
Expand Down
2 changes: 1 addition & 1 deletion account-kit/react/src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// This file is autogenerated by inject-version.ts. Any changes will be
// overwritten on commit!
export const VERSION = "4.0.0-beta.3";
export const VERSION = "4.0.0-beta.4";
6 changes: 6 additions & 0 deletions account-kit/signer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.0.0-beta.4](https://github.com/alchemyplatform/aa-sdk/compare/v4.0.0-beta.3...v4.0.0-beta.4) (2024-09-18)

### Features

- add support for social login ([#942](https://github.com/alchemyplatform/aa-sdk/issues/942)) ([aa00dc7](https://github.com/alchemyplatform/aa-sdk/commit/aa00dc7d880f6d9cf9ae29e63941a9552faa9dd5))

# [4.0.0-beta.3](https://github.com/alchemyplatform/aa-sdk/compare/v0.0.0...v4.0.0-beta.3) (2024-09-16)

**Note:** Version bump only for package @account-kit/signer
Expand Down
4 changes: 2 additions & 2 deletions account-kit/signer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@account-kit/signer",
"version": "4.0.0-beta.3",
"version": "4.0.0-beta.4",
"description": "Core interfaces and clients for interfacing with the Alchemy Signer API",
"author": "Alchemy",
"license": "MIT",
Expand Down Expand Up @@ -49,7 +49,7 @@
"vitest": "^2.0.4"
},
"dependencies": {
"@aa-sdk/core": "^4.0.0-beta.3",
"@aa-sdk/core": "^4.0.0-beta.4",
"@turnkey/http": "^2.6.2",
"@turnkey/iframe-stamper": "^1.0.0",
"@turnkey/viem": "^0.4.8",
Expand Down
Loading

0 comments on commit f15baa1

Please sign in to comment.