Skip to content
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

PRO-1991-Manual CallDataLimit Override #88

Merged
merged 6 commits into from
Dec 13, 2023
Merged

PRO-1991-Manual CallDataLimit Override #88

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b31f57
specify callDataLimit from user as optional
vignesha22 Dec 11, 2023
d780ca2
updated package version and ChangeLog
vignesha22 Dec 11, 2023
fecdd33
added example for setting callGasLimit
vignesha22 Dec 12, 2023
71bab04
added check for minimum callGasLimit
vignesha22 Dec 13, 2023
659d5cf
added dummy signature upon estimating
vignesha22 Dec 13, 2023
5dd538a
added validation on getUserOpsReceipt
vignesha22 Dec 13, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Changelog
### New
- Added ability to override callDataLimit on estimate step by the user

## [1.3.13] - 2023-11-22
### Bug Fixes
- Removed UnsupportedChainId error and now can add custom network details
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@etherspot/prime-sdk",
"version": "1.3.13",
"version": "1.3.14",
"description": "Etherspot Prime (Account Abstraction) SDK",
"keywords": [
"ether",
Expand Down
11 changes: 8 additions & 3 deletions src/sdk/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { Factory, PaymasterApi, SdkOptions } from './interfaces';
import { Network } from "./network";
import { BatchUserOpsRequest, Exception, getGasFee, onRampApiKey, openUrl, UserOpsRequest } from "./common";
import { BigNumber, ethers, providers } from 'ethers';
import { BigNumber, BigNumberish, ethers, providers } from 'ethers';
import { getNetworkConfig, Networks, onRamperAllNetworks } from './network/constants';
import { UserOperationStruct } from './contracts/account-abstraction/contracts/core/BaseAccount';
import { EtherspotWalletAPI, HttpRpcClient, VerifyingPaymasterAPI } from './base';
Expand Down Expand Up @@ -169,7 +169,7 @@ export class PrimeSdk {
return this.etherspotWallet.getCounterFactualAddress();
}

async estimate(paymasterDetails?: PaymasterApi, gasDetails?: TransactionGasInfoForUserOp) {
async estimate(paymasterDetails?: PaymasterApi, gasDetails?: TransactionGasInfoForUserOp, callDataLimit?: BigNumberish) {
if (this.userOpsBatch.to.length < 1) {
throw new ErrorHandler('cannot sign empty transaction batch', 1);
}
Expand All @@ -192,6 +192,10 @@ export class PrimeSdk {
maxPriorityFeePerGas: 1,
});

if (callDataLimit) {
partialtx.callGasLimit = BigNumber.from(callDataLimit).toHexString();
}

/**
* Dummy signature used only in the case of zeroDev factory contract
*/
Expand Down Expand Up @@ -219,7 +223,8 @@ export class PrimeSdk {
if (bundlerGasEstimate.preVerificationGas) {
partialtx.preVerificationGas = BigNumber.from(bundlerGasEstimate.preVerificationGas);
partialtx.verificationGasLimit = BigNumber.from(bundlerGasEstimate.verificationGasLimit ?? bundlerGasEstimate.verificationGas);
partialtx.callGasLimit = BigNumber.from(bundlerGasEstimate.callGasLimit);
if (!callDataLimit)
partialtx.callGasLimit = BigNumber.from(bundlerGasEstimate.callGasLimit);
}

return partialtx;
Expand Down