Skip to content

Commit f386bc9

Browse files
attenteattente
committed
rg -l 'Address\.Address' | xargs sed -i 's/Address\.Address/Address.Checksummed/g'
1 parent 2572e6e commit f386bc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+529
-487
lines changed

‎packages/wallet/core/src/envelope.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { Config, Payload, Signature } from '@0xsequence/wallet-primitives'
22
import { Hex } from 'ox'
33

44
export type Envelope<T extends Payload.Payload> = {
5-
readonly wallet: Address.Address
5+
readonly wallet: Address.Checksummed
66
readonly chainId: bigint
77
readonly configuration: Config.Config
88
readonly payload: T
99
}
1010

1111
export type Signature = {
12-
address: Address.Address
12+
address: Address.Checksummed
1313
signature: Signature.SignatureOfSignerLeaf
1414
}
1515

‎packages/wallet/core/src/preconditions/types.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export interface Precondition {
55

66
export class NativeBalancePrecondition implements Precondition {
77
constructor(
8-
public readonly address: Address.Address,
8+
public readonly address: Address.Checksummed,
99
public readonly min?: bigint,
1010
public readonly max?: bigint,
1111
) {}
@@ -27,8 +27,8 @@ export class NativeBalancePrecondition implements Precondition {
2727

2828
export class Erc20BalancePrecondition implements Precondition {
2929
constructor(
30-
public readonly address: Address.Address,
31-
public readonly token: Address.Address,
30+
public readonly address: Address.Checksummed,
31+
public readonly token: Address.Checksummed,
3232
public readonly min?: bigint,
3333
public readonly max?: bigint,
3434
) {}
@@ -53,9 +53,9 @@ export class Erc20BalancePrecondition implements Precondition {
5353

5454
export class Erc20ApprovalPrecondition implements Precondition {
5555
constructor(
56-
public readonly address: Address.Address,
57-
public readonly token: Address.Address,
58-
public readonly operator: Address.Address,
56+
public readonly address: Address.Checksummed,
57+
public readonly token: Address.Checksummed,
58+
public readonly operator: Address.Checksummed,
5959
public readonly min: bigint,
6060
) {}
6161

@@ -82,8 +82,8 @@ export class Erc20ApprovalPrecondition implements Precondition {
8282

8383
export class Erc721OwnershipPrecondition implements Precondition {
8484
constructor(
85-
public readonly address: Address.Address,
86-
public readonly token: Address.Address,
85+
public readonly address: Address.Checksummed,
86+
public readonly token: Address.Checksummed,
8787
public readonly tokenId: bigint,
8888
public readonly owned?: boolean,
8989
) {}
@@ -108,10 +108,10 @@ export class Erc721OwnershipPrecondition implements Precondition {
108108

109109
export class Erc721ApprovalPrecondition implements Precondition {
110110
constructor(
111-
public readonly address: Address.Address,
112-
public readonly token: Address.Address,
111+
public readonly address: Address.Checksummed,
112+
public readonly token: Address.Checksummed,
113113
public readonly tokenId: bigint,
114-
public readonly operator: Address.Address,
114+
public readonly operator: Address.Checksummed,
115115
) {}
116116

117117
type(): string {
@@ -137,8 +137,8 @@ export class Erc721ApprovalPrecondition implements Precondition {
137137

138138
export class Erc1155BalancePrecondition implements Precondition {
139139
constructor(
140-
public readonly address: Address.Address,
141-
public readonly token: Address.Address,
140+
public readonly address: Address.Checksummed,
141+
public readonly token: Address.Checksummed,
142142
public readonly tokenId: bigint,
143143
public readonly min?: bigint,
144144
public readonly max?: bigint,
@@ -167,10 +167,10 @@ export class Erc1155BalancePrecondition implements Precondition {
167167

168168
export class Erc1155ApprovalPrecondition implements Precondition {
169169
constructor(
170-
public readonly address: Address.Address,
171-
public readonly token: Address.Address,
170+
public readonly address: Address.Checksummed,
171+
public readonly token: Address.Checksummed,
172172
public readonly tokenId: bigint,
173-
public readonly operator: Address.Address,
173+
public readonly operator: Address.Checksummed,
174174
public readonly min: bigint,
175175
) {}
176176

‎packages/wallet/core/src/relayer/bundler.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ export interface Bundler {
99
id: string
1010

1111
estimateLimits(
12-
wallet: Address.Address,
12+
wallet: Address.Checksummed,
1313
payload: Payload.Calls4337_07,
1414
): Promise<{ speed?: 'slow' | 'standard' | 'fast'; payload: Payload.Calls4337_07 }[]>
15-
relay(entrypoint: Address.Address, userOperation: UserOperation.RpcV07): Promise<{ opHash: Hex.Hex }>
15+
relay(entrypoint: Address.Checksummed, userOperation: UserOperation.RpcV07): Promise<{ opHash: Hex.Hex }>
1616
status(opHash: Hex.Hex, chainId: bigint): Promise<OperationStatus>
1717

18-
isAvailable(entrypoint: Address.Address, chainId: bigint): Promise<boolean>
18+
isAvailable(entrypoint: Address.Checksummed, chainId: bigint): Promise<boolean>
1919
}
2020

2121
export function isBundler(relayer: any): relayer is Bundler {

‎packages/wallet/core/src/relayer/bundlers/pimlico.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ export class PimlicoBundler implements Bundler {
2828
this.bundlerRpcUrl = bundlerRpcUrl
2929
}
3030

31-
async isAvailable(entrypoint: Address.Address, chainId: bigint): Promise<boolean> {
31+
async isAvailable(entrypoint: Address.Checksummed, chainId: bigint): Promise<boolean> {
3232
const [bundlerChainId, supportedEntryPoints] = await Promise.all([
3333
this.bundlerRpc<string>('eth_chainId', []),
34-
this.bundlerRpc<Address.Address[]>('eth_supportedEntryPoints', []),
34+
this.bundlerRpc<Address.Checksummed[]>('eth_supportedEntryPoints', []),
3535
])
3636

3737
if (chainId !== BigInt(bundlerChainId)) {
@@ -41,13 +41,13 @@ export class PimlicoBundler implements Bundler {
4141
return supportedEntryPoints.some((ep) => Address.isEqual(ep, entrypoint))
4242
}
4343

44-
async relay(entrypoint: Address.Address, userOperation: UserOperation.RpcV07): Promise<{ opHash: Hex.Hex }> {
44+
async relay(entrypoint: Address.Checksummed, userOperation: UserOperation.RpcV07): Promise<{ opHash: Hex.Hex }> {
4545
const status = await this.bundlerRpc<Hex.Hex>('eth_sendUserOperation', [userOperation, entrypoint])
4646
return { opHash: status }
4747
}
4848

4949
async estimateLimits(
50-
wallet: Address.Address,
50+
wallet: Address.Checksummed,
5151
payload: Payload.Calls4337_07,
5252
): Promise<
5353
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FeeToken, GetMetaTxnReceiptReturn } from './standard/rpc/index.js'
44

55
export interface FeeOption {
66
token: FeeToken
7-
to: Address.Address
7+
to: Address.Checksummed
88
value: string
99
gasLimit: number
1010
}
@@ -61,15 +61,15 @@ export interface Relayer {
6161
type: string
6262
id: string
6363

64-
isAvailable(wallet: Address.Address, chainId: bigint): Promise<boolean>
64+
isAvailable(wallet: Address.Checksummed, chainId: bigint): Promise<boolean>
6565

6666
feeOptions(
67-
wallet: Address.Address,
67+
wallet: Address.Checksummed,
6868
chainId: bigint,
6969
calls: Payload.Call[],
7070
): Promise<{ options: FeeOption[]; quote?: FeeQuote }>
7171

72-
relay(to: Address.Address, data: Hex.Hex, chainId: bigint, quote?: FeeQuote): Promise<{ opHash: Hex.Hex }>
72+
relay(to: Address.Checksummed, data: Hex.Hex, chainId: bigint, quote?: FeeQuote): Promise<{ opHash: Hex.Hex }>
7373

7474
status(opHash: Hex.Hex, chainId: bigint): Promise<OperationStatus>
7575

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ export class EIP6963Relayer implements Relayer {
1919
this.relayer = new LocalRelayer(new EIP1193ProviderAdapter(detail.provider))
2020
}
2121

22-
isAvailable(wallet: Address.Address, chainId: bigint): Promise<boolean> {
22+
isAvailable(wallet: Address.Checksummed, chainId: bigint): Promise<boolean> {
2323
return this.relayer.isAvailable(wallet, chainId)
2424
}
2525

2626
feeOptions(
27-
wallet: Address.Address,
27+
wallet: Address.Checksummed,
2828
chainId: bigint,
2929
calls: Payload.Call[],
3030
): Promise<{ options: FeeOption[]; quote?: FeeQuote }> {
3131
return this.relayer.feeOptions(wallet, chainId, calls)
3232
}
3333

34-
async relay(to: Address.Address, data: Hex.Hex, chainId: bigint, _?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
34+
async relay(to: Address.Checksummed, data: Hex.Hex, chainId: bigint, _?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
3535
return this.relayer.relay(to, data, chainId)
3636
}
3737

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import {
1616
type GenericProviderTransactionReceipt = 'success' | 'failed' | 'unknown'
1717

1818
export interface GenericProvider {
19-
sendTransaction(args: { to: Address.Address; data: Hex.Hex }, chainId: bigint): Promise<string | undefined>
20-
getBalance(address: Address.Address): Promise<bigint>
21-
call(args: { to: Address.Address; data: Hex.Hex }): Promise<string>
19+
sendTransaction(args: { to: Address.Checksummed; data: Hex.Hex }, chainId: bigint): Promise<string | undefined>
20+
getBalance(address: Address.Checksummed): Promise<bigint>
21+
call(args: { to: Address.Checksummed; data: Hex.Hex }): Promise<string>
2222
getTransactionReceipt(txHash: Hex.Hex, chainId: bigint): Promise<GenericProviderTransactionReceipt>
2323
}
2424

@@ -29,7 +29,7 @@ export class LocalRelayer implements Relayer {
2929

3030
constructor(public readonly provider: GenericProvider) {}
3131

32-
isAvailable(_wallet: Address.Address, _chainId: bigint): Promise<boolean> {
32+
isAvailable(_wallet: Address.Checksummed, _chainId: bigint): Promise<boolean> {
3333
return Promise.resolve(true)
3434
}
3535

@@ -48,7 +48,7 @@ export class LocalRelayer implements Relayer {
4848
}
4949

5050
feeOptions(
51-
wallet: Address.Address,
51+
wallet: Address.Checksummed,
5252
chainId: bigint,
5353
calls: Payload.Call[],
5454
): Promise<{ options: FeeOption[]; quote?: FeeQuote }> {
@@ -70,7 +70,7 @@ export class LocalRelayer implements Relayer {
7070
}
7171

7272
async relay(
73-
to: Address.Address,
73+
to: Address.Checksummed,
7474
data: Hex.Hex,
7575
chainId: bigint,
7676
quote?: FeeQuote,
@@ -288,8 +288,8 @@ export class EIP1193ProviderAdapter implements GenericProvider {
288288
}
289289
}
290290

291-
async sendTransaction(args: { to: Address.Address; data: Hex.Hex }, chainId: bigint) {
292-
const accounts: Address.Address[] = await this.provider.request({ method: 'eth_requestAccounts' })
291+
async sendTransaction(args: { to: Address.Checksummed; data: Hex.Hex }, chainId: bigint) {
292+
const accounts: Address.Checksummed[] = await this.provider.request({ method: 'eth_requestAccounts' })
293293
const from = accounts[0]
294294

295295
if (!from) {
@@ -313,15 +313,15 @@ export class EIP1193ProviderAdapter implements GenericProvider {
313313
return tx
314314
}
315315

316-
async getBalance(address: Address.Address) {
316+
async getBalance(address: Address.Checksummed) {
317317
const balance = await this.provider.request({
318318
method: 'eth_getBalance',
319319
params: [address, 'latest'],
320320
})
321321
return BigInt(balance)
322322
}
323323

324-
async call(args: { to: Address.Address; data: Hex.Hex }) {
324+
async call(args: { to: Address.Checksummed; data: Hex.Hex }) {
325325
return await this.provider.request({
326326
method: 'eth_call',
327327
params: [args, 'latest'],

‎packages/wallet/core/src/relayer/standard/pk-relayer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ export class PkRelayer implements Relayer {
9797
})
9898
}
9999

100-
async isAvailable(_wallet: Address.Address, chainId: bigint): Promise<boolean> {
100+
async isAvailable(_wallet: Address.Checksummed, chainId: bigint): Promise<boolean> {
101101
const providerChainId = BigInt(await this.provider.request({ method: 'eth_chainId' }))
102102
return providerChainId === chainId
103103
}
104104

105105
feeOptions(
106-
wallet: Address.Address,
106+
wallet: Address.Checksummed,
107107
chainId: bigint,
108108
calls: Payload.Call[],
109109
): Promise<{ options: FeeOption[]; quote?: FeeQuote }> {
110110
return this.relayer.feeOptions(wallet, chainId, calls)
111111
}
112112

113-
async relay(to: Address.Address, data: Hex.Hex, chainId: bigint, _?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
113+
async relay(to: Address.Checksummed, data: Hex.Hex, chainId: bigint, _?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
114114
const providerChainId = BigInt(await this.provider.request({ method: 'eth_chainId' }))
115115
if (providerChainId !== chainId) {
116116
throw new Error('Provider chain id does not match relayer chain id')

‎packages/wallet/core/src/relayer/standard/rpc/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ export class RpcRelayer implements Relayer {
6262
})
6363
}
6464

65-
isAvailable(_wallet: Address.Address, chainId: bigint): Promise<boolean> {
65+
isAvailable(_wallet: Address.Checksummed, chainId: bigint): Promise<boolean> {
6666
return Promise.resolve(BigInt(this.chainId) === chainId)
6767
}
6868

6969
async feeOptions(
70-
wallet: Address.Address,
70+
wallet: Address.Checksummed,
7171
chainId: bigint,
7272
calls: Payload.Call[],
7373
): Promise<{ options: FeeOption[]; quote?: FeeQuote }> {
@@ -103,8 +103,8 @@ export class RpcRelayer implements Relayer {
103103
}
104104

105105
async sendMetaTxn(
106-
walletAddress: Address.Address,
107-
to: Address.Address,
106+
walletAddress: Address.Checksummed,
107+
to: Address.Checksummed,
108108
data: Hex.Hex,
109109
chainId: bigint,
110110
quote?: FeeQuote,
@@ -132,7 +132,7 @@ export class RpcRelayer implements Relayer {
132132
}
133133

134134
async relay(
135-
to: Address.Address,
135+
to: Address.Checksummed,
136136
data: Hex.Hex,
137137
chainId: bigint,
138138
quote?: FeeQuote,
@@ -366,7 +366,7 @@ export class RpcRelayer implements Relayer {
366366
}
367367
}
368368

369-
private mapRpcFeeTokenToAddress(rpcToken: RpcFeeToken): Address.Address {
369+
private mapRpcFeeTokenToAddress(rpcToken: RpcFeeToken): Address.Checksummed {
370370
if (rpcToken.type === FeeTokenType.ERC20_TOKEN && rpcToken.contractAddress) {
371371
return Address.from(rpcToken.contractAddress)
372372
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ export class SequenceRelayer implements Relayer {
1414
this.service = new Service(host, fetch)
1515
}
1616

17-
async isAvailable(_wallet: Address.Address, _chainId: bigint): Promise<boolean> {
17+
async isAvailable(_wallet: Address.Checksummed, _chainId: bigint): Promise<boolean> {
1818
return true
1919
}
2020

2121
async feeOptions(
22-
wallet: Address.Address,
22+
wallet: Address.Checksummed,
2323
_chainId: bigint,
2424
calls: Payload.Call[],
2525
): Promise<{ options: FeeOption[]; quote?: FeeQuote }> {
@@ -45,7 +45,12 @@ export class SequenceRelayer implements Relayer {
4545
return false
4646
}
4747

48-
async relay(to: Address.Address, data: Hex.Hex, _chainId: bigint, quote?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
48+
async relay(
49+
to: Address.Checksummed,
50+
data: Hex.Hex,
51+
_chainId: bigint,
52+
quote?: FeeQuote,
53+
): Promise<{ opHash: Hex.Hex }> {
4954
const walletAddress = to // TODO: pass wallet address or stop requiring it
5055

5156
const { txnHash } = await this.service.sendMetaTxn({

0 commit comments

Comments
 (0)