Skip to content

Commit 4e1f486

Browse files
attentecorbanbrook
attente
authored and
corbanbrook
committed
format
1 parent df9507a commit 4e1f486

File tree

20 files changed

+158
-120
lines changed

20 files changed

+158
-120
lines changed

‎packages/wallet/core/src/relayer/standard/sequence.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class SequenceRelayer implements Relayer {
3232
const { options, quote } = await this.service.feeOptions({ wallet, to, data })
3333

3434
return {
35-
options: options.map(option => ({ ...option, to: Address.checksum(option.to) })),
35+
options: options.map((option) => ({ ...option, to: Address.checksum(option.to) })),
3636
quote: quote ? { _tag: 'FeeQuote', _quote: quote } : undefined,
3737
}
3838
}

‎packages/wallet/core/src/signers/session/implicit.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { Address, Attestation, Payload, Signature as SequenceSignature, SessionSignature } from '@0xsequence/wallet-primitives'
1+
import {
2+
Address,
3+
Attestation,
4+
Payload,
5+
Signature as SequenceSignature,
6+
SessionSignature,
7+
} from '@0xsequence/wallet-primitives'
28
import { AbiFunction, Bytes, Hex, Provider, Secp256k1, Signature } from 'ox'
39
import { MemoryPkStore, PkStore } from '../pk/index.js'
410
import { SessionSigner } from './session.js'

‎packages/wallet/core/src/state/local/index.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ export class Provider implements ProviderInterface {
141141

142142
async getWallets(signer: Address.Checksummed) {
143143
return this.getWalletsGeneric<Signature.SignatureOfSignerLeaf>(
144-
await this.store.loadSubdigestsOfSigner(signer),
145-
(subdigest) => this.store.loadSignatureOfSubdigest(signer, subdigest),
144+
await this.store.loadSubdigestsOfSigner(signer),
145+
(subdigest) => this.store.loadSignatureOfSubdigest(signer, subdigest),
146146
)
147147
}
148148

149149
async getWalletsForSapient(signer: Address.Checksummed, imageHash: Hex.Hex) {
150150
return this.getWalletsGeneric<Signature.SignatureOfSapientSignerLeaf>(
151-
await this.store.loadSubdigestsOfSapientSigner(signer, imageHash),
152-
(subdigest) => this.store.loadSapientSignatureOfSubdigest(signer, subdigest, imageHash),
151+
await this.store.loadSubdigestsOfSapientSigner(signer, imageHash),
152+
(subdigest) => this.store.loadSapientSignatureOfSubdigest(signer, subdigest, imageHash),
153153
)
154154
}
155155

@@ -370,10 +370,12 @@ export class Provider implements ProviderInterface {
370370
if (Signature.isRawSignerLeaf(topology)) {
371371
const type = topology.signature.type
372372
if (type === 'eth_sign' || type === 'hash') {
373-
const address = Address.checksum(Secp256k1.recoverAddress({
374-
payload: type === 'eth_sign' ? PersonalMessage.getSignPayload(subdigest) : subdigest,
375-
signature: topology.signature,
376-
}))
373+
const address = Address.checksum(
374+
Secp256k1.recoverAddress({
375+
payload: type === 'eth_sign' ? PersonalMessage.getSignPayload(subdigest) : subdigest,
376+
signature: topology.signature,
377+
}),
378+
)
377379

378380
return this.store.saveSignatureOfSubdigest(address, subdigest, topology.signature)
379381
}

‎packages/wallet/core/src/state/local/indexed-db.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,11 @@ export class IndexedDbStore implements Store {
100100
return `${signer}-${subdigest}`
101101
}
102102

103-
private getSapientSignatureKey(signer: Address.Checksummed, subdigest: Hex.Hex, imageHash: Hex.Hex): `${Address.Checksummed}-${Hex.Hex}-${Hex.Hex}` {
103+
private getSapientSignatureKey(
104+
signer: Address.Checksummed,
105+
subdigest: Hex.Hex,
106+
imageHash: Hex.Hex,
107+
): `${Address.Checksummed}-${Hex.Hex}-${Hex.Hex}` {
104108
return `${signer}-${imageHash}-${subdigest}`
105109
}
106110

‎packages/wallet/core/src/state/sequence/index.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,39 +58,39 @@ export class Provider implements ProviderInterface {
5858
] => {
5959
Hex.assert(signature.signature)
6060

61-
switch (signature.type) {
62-
case SignatureType.EIP712:
63-
return [
64-
Address.checksum(wallet),
65-
{
66-
chainId: BigInt(signature.chainID),
67-
payload: fromServicePayload(signature.payload),
68-
signature: { type: 'hash', ...oxSignature.from(signature.signature) },
69-
},
70-
]
71-
case SignatureType.EthSign:
72-
return [
73-
Address.checksum(wallet),
74-
{
75-
chainId: BigInt(signature.chainID),
76-
payload: fromServicePayload(signature.payload),
77-
signature: { type: 'eth_sign', ...oxSignature.from(signature.signature) },
78-
},
79-
]
80-
case SignatureType.EIP1271:
81-
return [
82-
Address.checksum(wallet),
83-
{
84-
chainId: BigInt(signature.chainID),
85-
payload: fromServicePayload(signature.payload),
86-
signature: { type: 'erc1271', address: signer, data: signature.signature },
87-
},
88-
]
89-
case SignatureType.Sapient:
90-
throw new Error(`unexpected sapient signature by ${signer}`)
91-
case SignatureType.SapientCompact:
92-
throw new Error(`unexpected compact sapient signature by ${signer}`)
93-
}
61+
switch (signature.type) {
62+
case SignatureType.EIP712:
63+
return [
64+
Address.checksum(wallet),
65+
{
66+
chainId: BigInt(signature.chainID),
67+
payload: fromServicePayload(signature.payload),
68+
signature: { type: 'hash', ...oxSignature.from(signature.signature) },
69+
},
70+
]
71+
case SignatureType.EthSign:
72+
return [
73+
Address.checksum(wallet),
74+
{
75+
chainId: BigInt(signature.chainID),
76+
payload: fromServicePayload(signature.payload),
77+
signature: { type: 'eth_sign', ...oxSignature.from(signature.signature) },
78+
},
79+
]
80+
case SignatureType.EIP1271:
81+
return [
82+
Address.checksum(wallet),
83+
{
84+
chainId: BigInt(signature.chainID),
85+
payload: fromServicePayload(signature.payload),
86+
signature: { type: 'erc1271', address: signer, data: signature.signature },
87+
},
88+
]
89+
case SignatureType.Sapient:
90+
throw new Error(`unexpected sapient signature by ${signer}`)
91+
case SignatureType.SapientCompact:
92+
throw new Error(`unexpected compact sapient signature by ${signer}`)
93+
}
9494
},
9595
),
9696
)

‎packages/wallet/core/test/preconditions.test.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ describe('Preconditions', () => {
168168

169169
if (!CAN_RUN_LIVE) {
170170
// Mock the ownerOf call
171-
;(provider as any).call.mockResolvedValue(`0x000000000000000000000000${testWalletAddress.toString().slice(2).toLowerCase()}`)
171+
;(provider as any).call.mockResolvedValue(
172+
`0x000000000000000000000000${testWalletAddress.toString().slice(2).toLowerCase()}`,
173+
)
172174
}
173175

174176
const isValid = await relayer.checkPrecondition(intentPrecondition)
@@ -201,7 +203,9 @@ describe('Preconditions', () => {
201203

202204
if (!CAN_RUN_LIVE) {
203205
// Mock the getApproved call
204-
;(provider as any).call.mockResolvedValue(`0x000000000000000000000000${operator.toString().slice(2).toLowerCase()}`)
206+
;(provider as any).call.mockResolvedValue(
207+
`0x000000000000000000000000${operator.toString().slice(2).toLowerCase()}`,
208+
)
205209
}
206210

207211
const isValid = await relayer.checkPrecondition(intentPrecondition)

‎packages/wallet/core/test/session-manager.test.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import { Address, Attestation, Extensions, GenericTree, Payload, Permission, SessionConfig } from '@0xsequence/wallet-primitives'
1+
import {
2+
Address,
3+
Attestation,
4+
Extensions,
5+
GenericTree,
6+
Payload,
7+
Permission,
8+
SessionConfig,
9+
} from '@0xsequence/wallet-primitives'
210
import { AbiEvent, AbiFunction, Bytes, Hex, Provider, RpcTransport, Secp256k1 } from 'ox'
311
import { describe, expect, it } from 'vitest'
412

‎packages/wallet/dapp-client/src/ChainSessionManager.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,10 @@ export class ChainSessionManager {
418418
{ path: '/request/modify', redirectUrl: this.redirectUrl },
419419
)
420420

421-
if (!Address.isEqual(response.walletAddress, this.walletAddress) && !Address.isEqual(response.sessionAddress, sessionAddress)) {
421+
if (
422+
!Address.isEqual(response.walletAddress, this.walletAddress) &&
423+
!Address.isEqual(response.sessionAddress, sessionAddress)
424+
) {
422425
throw new ModifyExplicitSessionError('Wallet or session address mismatch.')
423426
}
424427

‎packages/wallet/primitives/src/address.ts‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ export function fromPublicKey(publicKey: PublicKey.PublicKey, options?: Address.
2323
export function from(configuration: Bytes.Bytes | Config, context: Omit<Context, 'stage2'>): Checksummed {
2424
const imageHash = configuration instanceof Uint8Array ? configuration : hashConfiguration(configuration)
2525

26-
return checksum( Bytes.toHex(
27-
Hash.keccak256(
28-
Bytes.concat(
29-
Bytes.from('0xff'),
30-
Bytes.from(context.factory),
31-
imageHash,
32-
Hash.keccak256(Bytes.concat(Bytes.from(context.creationCode), Bytes.padLeft(Bytes.from(context.stage1), 32))),
33-
),
34-
{ as: 'Bytes' },
35-
).subarray(12),
36-
) )
26+
return checksum(
27+
Bytes.toHex(
28+
Hash.keccak256(
29+
Bytes.concat(
30+
Bytes.from('0xff'),
31+
Bytes.from(context.factory),
32+
imageHash,
33+
Hash.keccak256(Bytes.concat(Bytes.from(context.creationCode), Bytes.padLeft(Bytes.from(context.stage1), 32))),
34+
),
35+
{ as: 'Bytes' },
36+
).subarray(12),
37+
),
38+
)
3739
}

‎packages/wallet/primitives/src/attestation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function encodeAuthData(authData: AuthData): Bytes.Bytes {
4040
}
4141

4242
export function decode(bytes: Bytes.Bytes): Attestation {
43-
const approvedSigner = checksum( Bytes.toHex(bytes.slice(0, 20)) )
43+
const approvedSigner = checksum(Bytes.toHex(bytes.slice(0, 20)))
4444
const identityType = bytes.slice(20, 24)
4545
const issuerHash = bytes.slice(24, 56)
4646
const audienceHash = bytes.slice(56, 88)

0 commit comments

Comments
 (0)