Skip to content

[SDK] Feature: Allow forcing deploy/skip_deploy behaviour #6361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 27, 2025
Merged

[SDK] Feature: Allow forcing deploy/skip_deploy behaviour #6361

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b523c0
allow forcing deploy/skip_deploy behaviour
d4mr Feb 27, 2025
9858781
cleaup + change interface
d4mr Feb 27, 2025
a37e16b
fix isAccountDeploying logic
joaquim-verges Feb 27, 2025
9e3fc9a
cache predict address
joaquim-verges Feb 27, 2025
5fc1d4e
shortcut
joaquim-verges Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion packages/thirdweb/src/wallets/smart/lib/userop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export async function createUnsignedUserOp(args: {
adminAddress: string;
sponsorGas: boolean;
waitForDeployment?: boolean;
forceDeployment?: "force_deploy" | "force_skip_deploy";
overrides?: SmartWalletOptions["overrides"];
}): Promise<UserOperationV06 | UserOperationV07> {
const {
Expand All @@ -146,6 +147,7 @@ export async function createUnsignedUserOp(args: {
overrides,
sponsorGas,
waitForDeployment = true,
forceDeployment,
} = args;
const chain = executeTx.chain;
const client = executeTx.client;
Expand All @@ -161,9 +163,18 @@ export async function createUnsignedUserOp(args: {
args.overrides?.entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
);

const isDeployedOverride = forceDeployment
? {
force_deploy: true,
force_skip_deploy: false,
}[forceDeployment]
: undefined;

const [isDeployed, callData, callGasLimit, gasFees, nonce] =
await Promise.all([
isContractDeployed(accountContract),
typeof isDeployedOverride === "boolean"
? isDeployedOverride
: isContractDeployed(accountContract),
encode(executeTx),
resolvePromisedValue(executeTx.gas),
getGasFees({
Expand Down Expand Up @@ -699,6 +710,7 @@ export async function createAndSignUserOp(options: {
client: ThirdwebClient;
smartWalletOptions: SmartWalletOptions;
waitForDeployment?: boolean;
forceDeployment?: "force_deploy" | "force_skip_deploy";
}) {
const config = options.smartWalletOptions;
const factoryContract = getContract({
Expand Down Expand Up @@ -757,6 +769,7 @@ export async function createAndSignUserOp(options: {
sponsorGas: "sponsorGas" in config ? config.sponsorGas : config.gasless,
overrides: config.overrides,
waitForDeployment: options.waitForDeployment,
forceDeployment: options.forceDeployment,
});
const signedUserOp = await signUserOp({
client: options.client,
Expand Down
Loading