Skip to content

fix the storage type for DepositInfo (EntryPoint:withdrawTo) from memory to storage #22

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

Open
liqingnz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix the storage type for DepositInfo (EntryPoint:withdrawTo) from memory to storage #22

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
2 changes: 1 addition & 1 deletion contracts/StakeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ abstract contract StakeManager {
* @param withdrawAmount the amount to withdraw.
*/
function withdrawTo(address payable withdrawAddress, uint256 withdrawAmount) external {
DepositInfo memory info = deposits[msg.sender];
DepositInfo storage info = deposits[msg.sender];
require(withdrawAmount <= info.deposit, "Withdraw amount too large");
info.deposit = uint112(info.deposit - withdrawAmount);
emit Withdrawn(msg.sender, withdrawAddress, withdrawAmount);
Expand Down
32 changes: 32 additions & 0 deletions test/wallet.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,17 @@ describe("Wallet testing", () => {
expect(await testNft.ownerOf(0)).eq(testSimpleWallet.address);
});

it("test deposit/withdraw", async () => {
expect(await testSimpleWallet.getDeposit()).to.eq(BigNumber.from(0));
await testSimpleWallet.addDeposit({ value: TWO_ETH });
expect(await testSimpleWallet.getDeposit()).to.eq(TWO_ETH);
await testSimpleWallet.withdrawDepositTo(deployerAddress, ONE_ETH);
expect(await testSimpleWallet.getDeposit()).to.eq(ONE_ETH);
await expect(testSimpleWallet.withdrawDepositTo(deployerAddress, TWO_ETH)).to.be.revertedWith(
"Withdraw amount too large",
);
});

it("test trusted paymaster", async () => {
await deployer.sendTransaction({
from: deployerAddress,
Expand All @@ -170,6 +181,9 @@ describe("Wallet testing", () => {
it("test initialization/upgradeability with ownership", async () => {
expect(await testSimpleWallet.owner()).to.eq(deployerAddress);
expect(await maskToken.allowance(testSimpleWallet.address, beneficialAccountAddress)).to.eq(ONE_ETH);
await expect(testSimpleWallet.updateEntryPoint(AddressZero))
.to.emit(testSimpleWallet, "EntryPointChanged")
.withArgs(entryPoint.address, AddressZero);
// only using "testSimpleWallet.address" for upgrade testing, could use any address here
await expect(
testProxy.connect(beneficialAccount).upgradeToAndCall(testSimpleWallet.address, "0x", false),
Expand Down Expand Up @@ -249,6 +263,7 @@ describe("Wallet testing", () => {
await maskToken.transfer(walletProxyAddress, utils.parseEther("100"));
// depositPaymaster setup
depositPaymaster = await new DepositPaymaster__factory(deployer).deploy(entryPoint.address, maskToken.address);
await expect(depositPaymaster.withdrawStake(deployerAddress)).to.be.revertedWith("No stake to withdraw");
await depositPaymaster.addStake(0, { value: TWO_ETH });
await maskToken.approve(depositPaymaster.address, constants.MaxUint256);
await depositPaymaster.connect(deployer).adjustAdmin(await deployer.getAddress(), true);
Expand Down Expand Up @@ -286,6 +301,23 @@ describe("Wallet testing", () => {
await depositPaymaster.addDepositFor(walletProxyAddress, TWO_ETH);
});

it("staking through paymaster", async () => {
expect((await entryPoint.getDepositInfo(depositPaymaster.address)).stake).to.be.eq(TWO_ETH);
const tempSigner = createWallet();
await expect(depositPaymaster.withdrawStake(tempSigner.address)).to.be.revertedWith(
"must call unlockStake() first",
);
await depositPaymaster.unlockStake();
await expect(depositPaymaster.unlockStake()).to.be.revertedWith("already unstaking");
await expect(depositPaymaster.withdrawStake(tempSigner.address)).to.be.revertedWith(
"Stake withdrawal is not due",
);
await network.provider.send("evm_increaseTime", [20]);
await depositPaymaster.withdrawStake(tempSigner.address);
expect((await entryPoint.getDepositInfo(depositPaymaster.address)).stake).to.be.eq(BigNumber.from(0));
expect(await ethers.provider.getBalance(tempSigner.address)).to.be.eq(TWO_ETH);
});

it("wallet deployment through EntryPoint", async () => {
let userOperation = createDefaultUserOp(walletProxyAddress);
userOperation.nonce = salt;
Expand Down