Skip to content

Commit

Permalink
Resolved SMA-682
Browse files Browse the repository at this point in the history
Docs are down

accommodate old alchemy version with non-deprecated Base class

fix yarn lock
  • Loading branch information
joepegler committed Feb 23, 2024
1 parent 1a8f296 commit dd50244
Show file tree
Hide file tree
Showing 12 changed files with 139 additions and 97 deletions.
1 change: 1 addition & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- develop
- v4
- docs

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion packages/account/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"typedoc": "^0.25.7"
},
"dependencies": {
"@alchemy/aa-core": "3.0.0-alpha.4",
"@alchemy/aa-core": "^2",
"@biconomy/bundler": "4.0.0",
"@biconomy/common": "4.0.0",
"@biconomy/modules": "4.0.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/account/src/BiconomySmartAccountV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ export class BiconomySmartAccountV2 extends BaseSmartContractAccount {
private constructor(readonly biconomySmartAccountConfig: BiconomySmartAccountV2ConfigConstructorProps) {
super({
...biconomySmartAccountConfig,
// @ts-ignore
chain: getChain(biconomySmartAccountConfig.chainId),
// @ts-ignore
rpcClient: biconomySmartAccountConfig.rpcUrl || getChain(biconomySmartAccountConfig.chainId).rpcUrls.default.http[0],
entryPointAddress: (biconomySmartAccountConfig.entryPointAddress as Hex) ?? DEFAULT_ENTRYPOINT_ADDRESS,
accountAddress: (biconomySmartAccountConfig.accountAddress as Hex) ?? undefined,
Expand Down Expand Up @@ -137,7 +139,9 @@ export class BiconomySmartAccountV2 extends BaseSmartContractAccount {
this.activeValidationModule = biconomySmartAccountConfig.activeValidationModule!;

this.provider = createPublicClient({
// @ts-ignore
chain: getChain(biconomySmartAccountConfig.chainId),
// @ts-ignore
transport: http(biconomySmartAccountConfig.rpcUrl || getChain(biconomySmartAccountConfig.chainId).rpcUrls.default.http[0]),
});

Expand Down
2 changes: 1 addition & 1 deletion packages/bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"access": "public"
},
"dependencies": {
"@alchemy/aa-core": "3.0.0-alpha.4",
"@alchemy/aa-core": "^2",
"@biconomy/common": "4.0.0",
"viem": "^2.7.3"
},
Expand Down
1 change: 1 addition & 0 deletions packages/bundler/src/Bundler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export class Bundler implements IBundler {
userOpHash: sendUserOperationResponse.result,
wait: (confirmations?: number): Promise<UserOpReceipt> => {
const providerClient = createPublicClient({
// @ts-ignore
chain: getChain(chainId),
transport: http(),
});
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"url": "https://github.com/bcnmy/biconomy-client-sdk/issues"
},
"dependencies": {
"@alchemy/aa-core": "3.0.0-alpha.4",
"@alchemy/aa-core": "^2",
"@ethersproject/abstract-signer": "^5.7.0",
"viem": "^2.7.3"
},
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/utils/Helpers/convertSigner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const convertSigner = async (signer: SupportedSigner, skipChainIdCalls: b
chainId = walletClient.chain.id;
}
// convert viems walletClient to alchemy's SmartAccountSigner under the hood
// @ts-ignore
resolvedSmartAccountSigner = new WalletClientSigner(walletClient, "viem");
rpcUrl = walletClient?.transport?.url ?? null;
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"access": "public"
},
"dependencies": {
"@alchemy/aa-core": "3.0.0-alpha.4",
"@alchemy/aa-core": "^2",
"@biconomy/common": "4.0.0",
"@ethersproject/abi": "^5.7.0",
"merkletreejs": "^0.3.11",
Expand Down
2 changes: 2 additions & 0 deletions packages/modules/src/session-storage/SessionLocalStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export class SessionLocalStorage implements ISessionStorage {
transport: http(),
});
const walletClientSigner = new WalletClientSigner(
// @ts-ignore
client,
"json-rpc", // signerType
);
Expand All @@ -148,6 +149,7 @@ export class SessionLocalStorage implements ISessionStorage {
chain: mainnet,
transport: http(),
});
// @ts-ignore
const signer = new WalletClientSigner(client, "viem");
return signer;
}
Expand Down
1 change: 1 addition & 0 deletions packages/modules/tests/utils/customSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ export class SessionFileStorage implements ISessionStorage {
account: signer,
transport: http(polygonMumbai.rpcUrls.default.http[0]),
});
// @ts-ignore
return new WalletClientSigner(walletClient, "json-rpc");
}

Expand Down
2 changes: 1 addition & 1 deletion packages/paymaster/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"access": "public"
},
"dependencies": {
"@alchemy/aa-core": "3.0.0-alpha.4",
"@alchemy/aa-core": "^2",
"@biconomy/common": "4.0.0",
"viem": "^2.7.3"
},
Expand Down
Loading

0 comments on commit dd50244

Please sign in to comment.