Skip to content

Winston/cnct 2311 pro cannot sign transaction with in app wallet #5390

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 1 commit into from
Nov 12, 2024
Merged

Winston/cnct 2311 pro cannot sign transaction with in app wallet #5390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/serious-plants-play.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"thirdweb": patch
---

fix enclave transaction signing for transactions with 0 maxPriorityFeePerGas
41 changes: 23 additions & 18 deletions packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,39 @@ export class EnclaveWallet implements IWebWallet {
const transaction: Record<string, Hex | number | undefined> = {
to: tx.to ? getAddress(tx.to) : undefined,
data: tx.data,
value: tx.value ? toHex(tx.value) : undefined,
gas: tx.gas ? toHex(tx.gas + tx.gas / BigInt(10)) : undefined, // Add a 10% buffer to gas
nonce: tx.nonce
? toHex(tx.nonce)
: toHex(
await import(
"../../../../rpc/actions/eth_getTransactionCount.js"
).then(({ eth_getTransactionCount }) =>
eth_getTransactionCount(rpcRequest, {
address: this.address,
blockTag: "pending",
}),
value: typeof tx.value === "bigint" ? toHex(tx.value) : undefined,
gas:
typeof tx.gas === "bigint"
? toHex(tx.gas + tx.gas / BigInt(10))
: undefined, // Add a 10% buffer to gas
nonce:
typeof tx.nonce === "number"
? toHex(tx.nonce)
: toHex(
await import(
"../../../../rpc/actions/eth_getTransactionCount.js"
).then(({ eth_getTransactionCount }) =>
eth_getTransactionCount(rpcRequest, {
address: this.address,
blockTag: "pending",
}),
),
),
),
chainId: toHex(tx.chainId),
};

if (tx.maxFeePerGas) {
Copy link
Member

@joaquim-verges joaquim-verges Nov 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we check the type here too?

nitpick: in general i prefer checking if value !== undefined rather than typeof bigint

transaction.maxFeePerGas = toHex(tx.maxFeePerGas);
transaction.maxPriorityFeePerGas = tx.maxPriorityFeePerGas
? toHex(tx.maxPriorityFeePerGas)
: undefined;
transaction.maxPriorityFeePerGas =
typeof tx.maxPriorityFeePerGas === "bigint"
? toHex(tx.maxPriorityFeePerGas)
: undefined;
transaction.type = 2;
} else {
transaction.gasPrice = tx.gasPrice ? toHex(tx.gasPrice) : undefined;
transaction.gasPrice =
typeof tx.gasPrice === "bigint" ? toHex(tx.gasPrice) : undefined;
transaction.type = 0;
}

return signEnclaveTransaction({
client,
storage,
Expand Down
Loading