diff --git a/.changeset/crisp-zoos-retire.md b/.changeset/crisp-zoos-retire.md new file mode 100644 index 000000000..84fd2a25c --- /dev/null +++ b/.changeset/crisp-zoos-retire.md @@ -0,0 +1,18 @@ +--- +'@0xsequence/api': patch +'@0xsequence/builder': patch +'@0xsequence/guard': patch +'@0xsequence/identity-instrument': patch +'@0xsequence/indexer': patch +'@0xsequence/marketplace': patch +'@0xsequence/metadata': patch +'@0xsequence/relayer': patch +'@0xsequence/userdata': patch +'@0xsequence/abi': patch +'@0xsequence/wallet-core': patch +'@0xsequence/dapp-client': patch +'@0xsequence/wallet-primitives': patch +'@0xsequence/wallet-wdk': patch +--- + +dapp-client updates diff --git a/.changeset/new-turkeys-double.md b/.changeset/new-turkeys-double.md new file mode 100644 index 000000000..72f26beb9 --- /dev/null +++ b/.changeset/new-turkeys-double.md @@ -0,0 +1,18 @@ +--- +'@0xsequence/api': patch +'@0xsequence/builder': patch +'@0xsequence/guard': patch +'@0xsequence/identity-instrument': patch +'@0xsequence/indexer': patch +'@0xsequence/marketplace': patch +'@0xsequence/metadata': patch +'@0xsequence/relayer': patch +'@0xsequence/userdata': patch +'@0xsequence/abi': patch +'@0xsequence/wallet-core': patch +'@0xsequence/dapp-client': patch +'@0xsequence/wallet-primitives': patch +'@0xsequence/wallet-wdk': patch +--- + +Apple auth fixes diff --git a/.changeset/nice-tips-slide.md b/.changeset/nice-tips-slide.md new file mode 100644 index 000000000..1595123e7 --- /dev/null +++ b/.changeset/nice-tips-slide.md @@ -0,0 +1,18 @@ +--- +'@0xsequence/api': patch +'@0xsequence/builder': patch +'@0xsequence/guard': patch +'@0xsequence/identity-instrument': patch +'@0xsequence/indexer': patch +'@0xsequence/marketplace': patch +'@0xsequence/metadata': patch +'@0xsequence/relayer': patch +'@0xsequence/userdata': patch +'@0xsequence/abi': patch +'@0xsequence/wallet-core': patch +'@0xsequence/dapp-client': patch +'@0xsequence/wallet-primitives': patch +'@0xsequence/wallet-wdk': patch +--- + +Apple auth fix diff --git a/.changeset/pre.json b/.changeset/pre.json index 73184ae44..5483a869a 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -4,29 +4,33 @@ "initialVersions": { "docs": "0.1.0", "web": "0.1.0", - "@0xsequence/api": "3.0.0-beta.5", - "@0xsequence/builder": "3.0.0-beta.5", - "@0xsequence/guard": "3.0.0-beta.5", - "@0xsequence/identity-instrument": "3.0.0-beta.5", - "@0xsequence/indexer": "3.0.0-beta.5", - "@0xsequence/marketplace": "3.0.0-beta.5", - "@0xsequence/metadata": "3.0.0-beta.5", - "@0xsequence/relayer": "3.0.0-beta.5", - "@0xsequence/userdata": "3.0.0-beta.5", - "@0xsequence/abi": "3.0.0-beta.5", - "@0xsequence/wallet-core": "3.0.0-beta.5", - "@0xsequence/dapp-client": "3.0.0-beta.5", - "@0xsequence/wallet-primitives": "3.0.0-beta.5", - "@0xsequence/wallet-wdk": "3.0.0-beta.5", + "@0xsequence/api": "3.0.0-beta.9", + "@0xsequence/builder": "3.0.0-beta.9", + "@0xsequence/guard": "3.0.0-beta.9", + "@0xsequence/identity-instrument": "3.0.0-beta.9", + "@0xsequence/indexer": "3.0.0-beta.9", + "@0xsequence/marketplace": "3.0.0-beta.9", + "@0xsequence/metadata": "3.0.0-beta.9", + "@0xsequence/relayer": "3.0.0-beta.9", + "@0xsequence/userdata": "3.0.0-beta.9", + "@0xsequence/abi": "3.0.0-beta.9", + "@0xsequence/wallet-core": "3.0.0-beta.9", + "@0xsequence/dapp-client": "3.0.0-beta.9", + "@0xsequence/wallet-primitives": "3.0.0-beta.9", + "@0xsequence/wallet-wdk": "3.0.0-beta.9", "@repo/eslint-config": "0.0.1-beta.1", "@repo/typescript-config": "0.0.1-beta.1", "@repo/ui": "0.0.1-beta.1" }, "changesets": [ + "crisp-zoos-retire", "cyan-radios-relax", "goofy-laws-serve", + "new-turkeys-double", + "nice-tips-slide", "open-toes-marry", "plain-feet-stare", + "tiny-files-chew", "wild-feet-carry", "wise-heads-buy" ] diff --git a/.changeset/tiny-files-chew.md b/.changeset/tiny-files-chew.md new file mode 100644 index 000000000..672546fd0 --- /dev/null +++ b/.changeset/tiny-files-chew.md @@ -0,0 +1,18 @@ +--- +'@0xsequence/api': patch +'@0xsequence/builder': patch +'@0xsequence/guard': patch +'@0xsequence/identity-instrument': patch +'@0xsequence/indexer': patch +'@0xsequence/marketplace': patch +'@0xsequence/metadata': patch +'@0xsequence/relayer': patch +'@0xsequence/userdata': patch +'@0xsequence/abi': patch +'@0xsequence/wallet-core': patch +'@0xsequence/dapp-client': patch +'@0xsequence/wallet-primitives': patch +'@0xsequence/wallet-wdk': patch +--- + +dapp client updates for EOA login diff --git a/packages/services/api/CHANGELOG.md b/packages/services/api/CHANGELOG.md index 11007faa9..8a7997a58 100644 --- a/packages/services/api/CHANGELOG.md +++ b/packages/services/api/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/api +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/api/package.json b/packages/services/api/package.json index 6191c7940..1dcb3dae2 100644 --- a/packages/services/api/package.json +++ b/packages/services/api/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/api", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "api sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/api", "author": "Sequence Platforms Inc.", diff --git a/packages/services/builder/CHANGELOG.md b/packages/services/builder/CHANGELOG.md index 2877d5538..76bd0fe59 100644 --- a/packages/services/builder/CHANGELOG.md +++ b/packages/services/builder/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/builder +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/builder/package.json b/packages/services/builder/package.json index de33fd730..f0b0d62b0 100644 --- a/packages/services/builder/package.json +++ b/packages/services/builder/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/builder", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "builder sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/builder", "author": "Sequence Platforms Inc.", diff --git a/packages/services/guard/CHANGELOG.md b/packages/services/guard/CHANGELOG.md index 7adaddd55..d20ea859e 100644 --- a/packages/services/guard/CHANGELOG.md +++ b/packages/services/guard/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/guard +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/guard/package.json b/packages/services/guard/package.json index 5c93bdfc1..cacf82ffa 100644 --- a/packages/services/guard/package.json +++ b/packages/services/guard/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/guard", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "guard sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/guard", "author": "Sequence Platforms Inc.", diff --git a/packages/services/identity-instrument/CHANGELOG.md b/packages/services/identity-instrument/CHANGELOG.md index 866782714..9dca72984 100644 --- a/packages/services/identity-instrument/CHANGELOG.md +++ b/packages/services/identity-instrument/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/identity-instrument +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/identity-instrument/package.json b/packages/services/identity-instrument/package.json index 026b8c291..a05aff012 100644 --- a/packages/services/identity-instrument/package.json +++ b/packages/services/identity-instrument/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/identity-instrument", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "license": "Apache-2.0", "type": "module", "publishConfig": { diff --git a/packages/services/indexer/CHANGELOG.md b/packages/services/indexer/CHANGELOG.md index e320c4307..0898bb564 100644 --- a/packages/services/indexer/CHANGELOG.md +++ b/packages/services/indexer/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/indexer +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/indexer/package.json b/packages/services/indexer/package.json index cb91b590c..332d21732 100644 --- a/packages/services/indexer/package.json +++ b/packages/services/indexer/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/indexer", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "indexer sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/indexer", "author": "Sequence Platforms Inc.", diff --git a/packages/services/marketplace/CHANGELOG.md b/packages/services/marketplace/CHANGELOG.md index 6e33420f0..9fe90e1d3 100644 --- a/packages/services/marketplace/CHANGELOG.md +++ b/packages/services/marketplace/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/marketplace +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/marketplace/package.json b/packages/services/marketplace/package.json index 58959af0d..17cc4cf51 100644 --- a/packages/services/marketplace/package.json +++ b/packages/services/marketplace/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/marketplace", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "marketplace sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/marketplace", "author": "Sequence Platforms Inc.", diff --git a/packages/services/metadata/CHANGELOG.md b/packages/services/metadata/CHANGELOG.md index 4fc3e61cc..f0831c0a5 100644 --- a/packages/services/metadata/CHANGELOG.md +++ b/packages/services/metadata/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/metadata +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/metadata/package.json b/packages/services/metadata/package.json index 9218059ef..afed07373 100644 --- a/packages/services/metadata/package.json +++ b/packages/services/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/metadata", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "publishConfig": { "access": "public" }, diff --git a/packages/services/relayer/CHANGELOG.md b/packages/services/relayer/CHANGELOG.md index 00efdf828..0e23d886c 100644 --- a/packages/services/relayer/CHANGELOG.md +++ b/packages/services/relayer/CHANGELOG.md @@ -1,5 +1,37 @@ # @0xsequence/relayer +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates +- Updated dependencies + - @0xsequence/wallet-primitives@3.0.0-beta.10 + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login +- Updated dependencies + - @0xsequence/wallet-primitives@3.0.0-beta.9 + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes +- Updated dependencies + - @0xsequence/wallet-primitives@3.0.0-beta.8 + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix +- Updated dependencies + - @0xsequence/wallet-primitives@3.0.0-beta.7 + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/relayer/package.json b/packages/services/relayer/package.json index 9e49fe299..3c2802d78 100644 --- a/packages/services/relayer/package.json +++ b/packages/services/relayer/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/relayer", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "type": "module", "publishConfig": { "access": "public" diff --git a/packages/services/userdata/CHANGELOG.md b/packages/services/userdata/CHANGELOG.md index b28ab5220..659989d4c 100644 --- a/packages/services/userdata/CHANGELOG.md +++ b/packages/services/userdata/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/userdata +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/services/userdata/package.json b/packages/services/userdata/package.json index 3d2fd79e9..3b4086385 100644 --- a/packages/services/userdata/package.json +++ b/packages/services/userdata/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/userdata", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "userdata sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/services/userdata", "author": "Sequence Platforms Inc.", diff --git a/packages/utils/abi/CHANGELOG.md b/packages/utils/abi/CHANGELOG.md index 92b0978a1..e62c45c4b 100644 --- a/packages/utils/abi/CHANGELOG.md +++ b/packages/utils/abi/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/abi +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/utils/abi/package.json b/packages/utils/abi/package.json index fdf2e38c2..83978c3d8 100644 --- a/packages/utils/abi/package.json +++ b/packages/utils/abi/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/abi", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "description": "abi sub-package for Sequence", "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/utils/abi", "author": "Sequence Platforms Inc.", diff --git a/packages/wallet/core/CHANGELOG.md b/packages/wallet/core/CHANGELOG.md index 0ff25b21a..a8a4c0121 100644 --- a/packages/wallet/core/CHANGELOG.md +++ b/packages/wallet/core/CHANGELOG.md @@ -1,5 +1,45 @@ # @0xsequence/wallet-core +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.10 + - @0xsequence/relayer@3.0.0-beta.10 + - @0xsequence/wallet-primitives@3.0.0-beta.10 + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.9 + - @0xsequence/relayer@3.0.0-beta.9 + - @0xsequence/wallet-primitives@3.0.0-beta.9 + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.8 + - @0xsequence/relayer@3.0.0-beta.8 + - @0xsequence/wallet-primitives@3.0.0-beta.8 + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.7 + - @0xsequence/relayer@3.0.0-beta.7 + - @0xsequence/wallet-primitives@3.0.0-beta.7 + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/wallet/core/package.json b/packages/wallet/core/package.json index b7e7b463f..2b575325f 100644 --- a/packages/wallet/core/package.json +++ b/packages/wallet/core/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/wallet-core", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "license": "Apache-2.0", "type": "module", "publishConfig": { diff --git a/packages/wallet/dapp-client/CHANGELOG.md b/packages/wallet/dapp-client/CHANGELOG.md index e7feb8989..3a46bc242 100644 --- a/packages/wallet/dapp-client/CHANGELOG.md +++ b/packages/wallet/dapp-client/CHANGELOG.md @@ -1,5 +1,49 @@ # @0xsequence/dapp-client +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.10 + - @0xsequence/relayer@3.0.0-beta.10 + - @0xsequence/wallet-core@3.0.0-beta.10 + - @0xsequence/wallet-primitives@3.0.0-beta.10 + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.9 + - @0xsequence/relayer@3.0.0-beta.9 + - @0xsequence/wallet-core@3.0.0-beta.9 + - @0xsequence/wallet-primitives@3.0.0-beta.9 + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.8 + - @0xsequence/relayer@3.0.0-beta.8 + - @0xsequence/wallet-core@3.0.0-beta.8 + - @0xsequence/wallet-primitives@3.0.0-beta.8 + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.7 + - @0xsequence/relayer@3.0.0-beta.7 + - @0xsequence/wallet-core@3.0.0-beta.7 + - @0xsequence/wallet-primitives@3.0.0-beta.7 + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/wallet/dapp-client/package.json b/packages/wallet/dapp-client/package.json index 40a6659c5..8ab8875c4 100644 --- a/packages/wallet/dapp-client/package.json +++ b/packages/wallet/dapp-client/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/dapp-client", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "license": "Apache-2.0", "type": "module", "publishConfig": { diff --git a/packages/wallet/dapp-client/src/DappTransport.ts b/packages/wallet/dapp-client/src/DappTransport.ts index 502c238bd..090b1070b 100644 --- a/packages/wallet/dapp-client/src/DappTransport.ts +++ b/packages/wallet/dapp-client/src/DappTransport.ts @@ -378,10 +378,7 @@ export class DappTransport { return } - const isPotentiallyValidSource = - this.walletWindow && (event.source === this.walletWindow || !this.walletWindow.closed) - - if (!isPotentiallyValidSource && event.data?.type !== MessageType.WALLET_OPENED) { + if (!this.walletWindow || event.source !== this.walletWindow) { return } diff --git a/packages/wallet/dapp-client/src/index.ts b/packages/wallet/dapp-client/src/index.ts index d16662c37..c2315b138 100644 --- a/packages/wallet/dapp-client/src/index.ts +++ b/packages/wallet/dapp-client/src/index.ts @@ -23,8 +23,9 @@ export type { GetFeeTokensResponse, FeeToken, FeeOption, + TransportMessage, } from './types/index.js' -export { RequestActionType, TransportMode } from './types/index.js' +export { RequestActionType, TransportMode, MessageType } from './types/index.js' export { FeeOptionError, TransactionError, @@ -34,7 +35,17 @@ export { SigningError, ModifyExplicitSessionError, } from './utils/errors.js' -export { getExplorerUrl, jsonReplacers, jsonRevivers } from './utils/index.js' +export { + createExplicitSessionConfig, + getExplorerUrl, + getNetwork, + getRelayerUrl, + getRpcUrl, + jsonReplacers, + jsonRevivers, + VALUE_FORWARDER_ADDRESS, +} from './utils/index.js' +export type { ExplicitSessionParams, NativeTokenSpending, SessionDuration } from './utils/index.js' export type { SequenceStorage, ExplicitSessionData, @@ -45,6 +56,14 @@ export type { } from './utils/storage.js' export { WebStorage } from './utils/storage.js' -export { Attestation, Permission, Extensions, SessionConfig, Constants, Payload } from '@0xsequence/wallet-primitives' +export { + Attestation, + Permission, + Extensions, + SessionConfig, + Constants, + Payload, + Network, +} from '@0xsequence/wallet-primitives' export type { ExplicitSessionConfig, ExplicitSession, ImplicitSession, Session } from '@0xsequence/wallet-core' export { Signers, Wallet, Utils, Envelope, State } from '@0xsequence/wallet-core' diff --git a/packages/wallet/dapp-client/src/types/index.ts b/packages/wallet/dapp-client/src/types/index.ts index 72e3dbe11..6a0eb08da 100644 --- a/packages/wallet/dapp-client/src/types/index.ts +++ b/packages/wallet/dapp-client/src/types/index.ts @@ -21,7 +21,7 @@ export const RequestActionType = { SEND_WALLET_TRANSACTION: 'sendWalletTransaction', } as const -export type LoginMethod = 'google' | 'apple' | 'email' | 'passkey' | 'mnemonic' +export type LoginMethod = 'google' | 'apple' | 'email' | 'passkey' | 'mnemonic' | 'eoa' export interface GuardConfig { url: string diff --git a/packages/wallet/dapp-client/src/utils/index.ts b/packages/wallet/dapp-client/src/utils/index.ts index cdb2c4e69..12bf312c3 100644 --- a/packages/wallet/dapp-client/src/utils/index.ts +++ b/packages/wallet/dapp-client/src/utils/index.ts @@ -1,6 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { Network } from '@0xsequence/wallet-primitives' -import { Bytes, Hex } from 'ox' +import type { ExplicitSessionConfig } from '@0xsequence/wallet-core' +import { Network, Permission } from '@0xsequence/wallet-primitives' +import { Bytes, Hex, type Address } from 'ox' +export { VALUE_FORWARDER_ADDRESS } from './constants.js' type JsonReplacer = (key: string, value: any) => any type JsonReviver = (key: string, value: any) => any @@ -124,6 +126,50 @@ const uint8ArrayReviver: JsonReviver = (key, value) => { export const jsonRevivers = chainRevivers([mapReviver, bigIntReviver, uint8ArrayReviver]) export const jsonReplacers = chainReplacers([mapReplacer, bigIntReplacer, uint8ArrayReplacer]) +export type SessionDuration = { + days?: number + hours?: number + minutes?: number +} + +export type NativeTokenSpending = { + valueLimit: bigint + allowedRecipients?: Address.Address[] +} + +export type ExplicitSessionParams = { + chainId: number + expiresIn: SessionDuration + permissions: Permission.Permission[] + nativeTokenSpending?: NativeTokenSpending +} + +export const createExplicitSessionConfig = (params: ExplicitSessionParams): ExplicitSessionConfig => { + const nowInSeconds = BigInt(Math.floor(Date.now() / 1000)) + const { days = 0, hours = 0, minutes = 0 } = params.expiresIn + const sessionLifetimeSeconds = days * 24 * 60 * 60 + hours * 60 * 60 + minutes * 60 + const deadline = nowInSeconds + BigInt(sessionLifetimeSeconds) + + if (params.permissions.length === 0) { + throw new Error('createExplicitSessionConfig: At least one permission is required.') + } + + const nativeTokenSpending = params.nativeTokenSpending + const valueLimit = nativeTokenSpending?.valueLimit ?? 0n + const nativeTokenReceivers = [...(nativeTokenSpending?.allowedRecipients || [])] + const nativeTokenSpendingPermissions = nativeTokenReceivers.map((receiver) => ({ + target: receiver, + rules: [], + })) + + return { + chainId: params.chainId, + valueLimit, + deadline, + permissions: [...params.permissions, ...nativeTokenSpendingPermissions], + } +} + /** * Apply a template to a string. * diff --git a/packages/wallet/primitives/CHANGELOG.md b/packages/wallet/primitives/CHANGELOG.md index c98111672..0a422e031 100644 --- a/packages/wallet/primitives/CHANGELOG.md +++ b/packages/wallet/primitives/CHANGELOG.md @@ -1,5 +1,29 @@ # @0xsequence/wallet-primitives +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/wallet/primitives/package.json b/packages/wallet/primitives/package.json index 08e2b41ba..7b1aa271f 100644 --- a/packages/wallet/primitives/package.json +++ b/packages/wallet/primitives/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/wallet-primitives", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "license": "Apache-2.0", "type": "module", "publishConfig": { diff --git a/packages/wallet/wdk/CHANGELOG.md b/packages/wallet/wdk/CHANGELOG.md index 6f2094f85..eedb582ce 100644 --- a/packages/wallet/wdk/CHANGELOG.md +++ b/packages/wallet/wdk/CHANGELOG.md @@ -1,5 +1,53 @@ # @0xsequence/wallet-wdk +## 3.0.0-beta.10 + +### Patch Changes + +- dapp-client updates +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.10 + - @0xsequence/identity-instrument@3.0.0-beta.10 + - @0xsequence/relayer@3.0.0-beta.10 + - @0xsequence/wallet-core@3.0.0-beta.10 + - @0xsequence/wallet-primitives@3.0.0-beta.10 + +## 3.0.0-beta.9 + +### Patch Changes + +- dapp client updates for EOA login +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.9 + - @0xsequence/identity-instrument@3.0.0-beta.9 + - @0xsequence/relayer@3.0.0-beta.9 + - @0xsequence/wallet-core@3.0.0-beta.9 + - @0xsequence/wallet-primitives@3.0.0-beta.9 + +## 3.0.0-beta.8 + +### Patch Changes + +- Apple auth fixes +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.8 + - @0xsequence/identity-instrument@3.0.0-beta.8 + - @0xsequence/relayer@3.0.0-beta.8 + - @0xsequence/wallet-core@3.0.0-beta.8 + - @0xsequence/wallet-primitives@3.0.0-beta.8 + +## 3.0.0-beta.7 + +### Patch Changes + +- Apple auth fix +- Updated dependencies + - @0xsequence/guard@3.0.0-beta.7 + - @0xsequence/identity-instrument@3.0.0-beta.7 + - @0xsequence/relayer@3.0.0-beta.7 + - @0xsequence/wallet-core@3.0.0-beta.7 + - @0xsequence/wallet-primitives@3.0.0-beta.7 + ## 3.0.0-beta.6 ### Patch Changes diff --git a/packages/wallet/wdk/package.json b/packages/wallet/wdk/package.json index 069ea2491..ed1843b76 100644 --- a/packages/wallet/wdk/package.json +++ b/packages/wallet/wdk/package.json @@ -1,6 +1,6 @@ { "name": "@0xsequence/wallet-wdk", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.10", "license": "Apache-2.0", "type": "module", "publishConfig": { diff --git a/packages/wallet/wdk/src/sequence/handlers/authcode.ts b/packages/wallet/wdk/src/sequence/handlers/authcode.ts index f73f9ec5d..74ad9ee93 100644 --- a/packages/wallet/wdk/src/sequence/handlers/authcode.ts +++ b/packages/wallet/wdk/src/sequence/handlers/authcode.ts @@ -49,8 +49,8 @@ export class AuthCodeHandler extends IdentityHandler implements Handler { client_id: this.audience, redirect_uri: this.redirectUri, response_type: 'code', - scope: 'openid profile email', state, + ...(this.signupKind === 'apple' ? {} : { scope: 'openid profile email' }), }) return `${this.oauthUrl}?${searchParams.toString()}` diff --git a/packages/wallet/wdk/test/authcode.test.ts b/packages/wallet/wdk/test/authcode.test.ts index 4874e475b..f5930894d 100644 --- a/packages/wallet/wdk/test/authcode.test.ts +++ b/packages/wallet/wdk/test/authcode.test.ts @@ -311,6 +311,8 @@ describe('AuthCodeHandler', () => { expect(result).toContain('https://appleid.apple.com/auth/authorize?') expect(result).toContain('client_id=apple-client-id') + const resultUrl = new URL(result) + expect(resultUrl.searchParams.has('scope')).toBe(false) }) it('Should create commitment without signer', async () => {