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

[test] re-added name & symbol as parameters to differentiate erc tokens #42

Merged
merged 2 commits into from
Dec 26, 2024
Merged

[test] re-added name & symbol as parameters to differentiate erc tokens #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e519742
[test] re-added name & symbol as parameters to differentiate erc tokens
tomasfrancizco Dec 26, 2024
635bece
[fix] fixed erc20mock dependency issue, added local file
tomasfrancizco Dec 26, 2024
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
10 changes: 5 additions & 5 deletions script/HelperConfig.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.24;

import {Script, console} from "forge-std/Script.sol";
import {EntryPoint} from "lib/entry-point-v6/core/EntryPoint.sol";
import {ERC20Mock} from "@openzeppelin/contracts/mocks/token/ERC20Mock.sol";
import {ERC20Mock} from "./utils/ERC20Mock.sol";

contract HelperConfig is Script {
/*//////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -161,13 +161,13 @@ contract HelperConfig is Script {
vm.startBroadcast(ANVIL_DEFAULT_ACCOUNT);
EntryPoint entryPoint = new EntryPoint();
console.log("EntryPoint deployed! %s", address(entryPoint));
ERC20Mock usdcMock = new ERC20Mock();
ERC20Mock usdcMock = new ERC20Mock("Circle USD", "USDC");
console.log("USDC deployed! %s", address(usdcMock));
ERC20Mock usdtMock = new ERC20Mock();
ERC20Mock usdtMock = new ERC20Mock("Tether USD", "USDT");
console.log("USDT deployed! %s", address(usdtMock));
ERC20Mock wethMock = new ERC20Mock();
ERC20Mock wethMock = new ERC20Mock("Wrapped ETH", "WETH");
console.log("WETH deployed! %s", address(wethMock));
ERC20Mock maticMock = new ERC20Mock();
ERC20Mock maticMock = new ERC20Mock("MATIC", "MATIC");
console.log("MATIC deployed! %s", address(maticMock));
vm.stopBroadcast();
console.log("Mocks deployed!");
Expand Down
16 changes: 16 additions & 0 deletions script/utils/ERC20Mock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;

import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

contract ERC20Mock is ERC20 {
constructor(string memory name, string memory symbol) ERC20(name, symbol) {}

function mint(address account, uint256 amount) external {
_mint(account, amount);
}

function burn(address account, uint256 amount) external {
_burn(account, amount);
}
}
16 changes: 0 additions & 16 deletions src/L2/utils/PackedUserOperation.sol
View file
Open in desktop

This file was deleted.

55 changes: 32 additions & 23 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
semver "^7.3.5"
tar "^6.1.11"

"@openzeppelin/contracts@^5.0.2":
version "5.1.0"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.1.0.tgz#4e61162f2a2bf414c4e10c45eca98ce5f1aadbd4"
integrity sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==

"@types/bun@latest":
version "1.1.6"
resolved "https://registry.npmjs.org/@types/bun/-/bun-1.1.6.tgz"
Expand All @@ -30,11 +25,11 @@
bun-types "1.1.17"

"@types/node@*", "@types/node@^22.1.0":
version "22.10.2"
resolved "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz"
integrity sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==
version "22.3.0"
resolved "https://registry.npmjs.org/@types/node/-/node-22.3.0.tgz"
integrity sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g==
dependencies:
undici-types "~6.20.0"
undici-types "~6.18.2"

"@types/node@~20.12.8":
version "20.12.14"
Expand Down Expand Up @@ -147,9 +142,9 @@ detect-libc@^2.0.0:
integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==

dotenv@^16.4.5:
version "16.4.7"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
version "16.4.5"
resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz"
integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==

emoji-regex@^8.0.0:
version "8.0.0"
Expand Down Expand Up @@ -216,7 +211,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"

inherits@2, inherits@^2.0.3:
inherits@^2.0.3, inherits@2:
version "2.0.4"
resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
Expand Down Expand Up @@ -357,7 +352,14 @@ signal-exit@^3.0.0:
resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==

"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
dependencies:
safe-buffer "~5.2.0"

"string-width@^1.0.2 || 2 || 3 || 4":
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -366,12 +368,14 @@ signal-exit@^3.0.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
safe-buffer "~5.2.0"
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

strip-ansi@^6.0.1:
version "6.0.1"
Expand All @@ -397,15 +401,20 @@ tr46@~0.0.3:
resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==

typescript@^5.0.0:
version "5.7.2"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz"
integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==

undici-types@~5.26.4:
version "5.26.5"
resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

undici-types@~6.20.0:
version "6.20.0"
resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz"
integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
undici-types@~6.18.2:
version "6.18.2"
resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.18.2.tgz"
integrity sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ==

util-deprecate@^1.0.1:
version "1.0.2"
Expand Down
Loading