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

chore: update deps #14

Merged
merged 2 commits into from
Oct 10, 2024
+45 −45
Merged

chore: update deps #14

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
1ae2231
chore: remove foundry submodule deps
huaweigu Oct 10, 2024
d800358
chore: use yarn for deps
huaweigu Oct 10, 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
24 changes: 0 additions & 24 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,4 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
branch = v1
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
branch = release-v5.0
[submodule "lib/openzeppelin-contracts-upgradeable"]
path = lib/openzeppelin-contracts-upgradeable
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
branch = release-v5.0
[submodule "lib/account-abstraction"]
path = lib/account-abstraction
url = https://github.com/eth-infinitism/account-abstraction
branch = releases/v0.7
[submodule "lib/solady"]
path = lib/solady
url = https://github.com/vectorized/solady
[submodule "lib/FreshCryptoLib"]
path = lib/FreshCryptoLib
url = https://github.com/rdubois-crypto/FreshCryptoLib
[submodule "lib/p256-verifier"]
path = lib/p256-verifier
url = https://github.com/daimo-eth/p256-verifier
[submodule "lib/modular-account-libs"]
path = lib/modular-account-libs
url = https://github.com/erc6900/modular-account-libs
2 changes: 2 additions & 0 deletions foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ libs = ['lib']
solc_version = "0.8.24"
test = 'test'
via_ir = true
auto_detect_solc = false
auto_detect_remappings = false

[fuzz]
runs = 1024
Expand Down
1 change: 0 additions & 1 deletion lib/FreshCryptoLib
Open in desktop
Submodule FreshCryptoLib deleted from 8179e0
1 change: 0 additions & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std deleted from 1714be
1 change: 0 additions & 1 deletion lib/modular-account-libs
Open in desktop
Submodule modular-account-libs deleted from 5d9d0e
1 change: 0 additions & 1 deletion lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts deleted from dbb610
1 change: 0 additions & 1 deletion lib/openzeppelin-contracts-upgradeable
Open in desktop
Submodule openzeppelin-contracts-upgradeable deleted from 723f8c
1 change: 0 additions & 1 deletion lib/p256-verifier
Open in desktop
Submodule p256-verifier deleted from 607d3e
1 change: 0 additions & 1 deletion lib/solady
Open in desktop
Submodule solady deleted from 4f5098
8 changes: 8 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
},
"author": "circle",
"license": "GPL-3.0-or-later",
"dependencies": {
"@modular-account-libs": "github:erc6900/modular-account-libs#v0.8.0-rc.0",
"@openzeppelin/contracts": "5.0.2",
"@openzeppelin/contracts-upgradeable": "5.0.2",
"fcl": "github:rdubois-crypto/FreshCryptoLib#8179e08cac72072bd260796633fec41fdfd5b441",
"forge-std": "github:foundry-rs/forge-std#v1.9.2",
"solady": "0.0.243"
},
"devDependencies": {
"solhint": "^5.0.3"
},
Expand Down
18 changes: 6 additions & 12 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
@account-abstraction/=lib/account-abstraction/
@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
ds-test/=lib/forge-std/lib/ds-test/src/
eth-gas-reporter/=node_modules/eth-gas-reporter/
forge-std/=lib/forge-std/
hardhat/=node_modules/hardhat/
@modular-account/=lib/modular-account/src
@solady/=lib/solady/src/
@fcl/=lib/FreshCryptoLib/solidity/src
@p256-verifier/=lib/p256-verifier/src
@webauthn-sol/=lib/webauthn-sol/src/
@modular-account-libs/=lib/modular-account-libs/src/
@modular-account-libs/=node_modules/@modular-account-libs/src/
@solady/=node_modules/solady/src/
@fcl/=node_modules/fcl/solidity/src/
forge-std/=node_modules/forge-std/
4 changes: 2 additions & 2 deletions test/libs/webauthn/Utils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
pragma solidity 0.8.24;

import {FCL_Elliptic_ZZ} from "FreshCryptoLib/FCL_elliptic.sol";
import {Base64Url} from "FreshCryptoLib/utils/Base64Url.sol";
import {FCL_Elliptic_ZZ} from "@fcl/FCL_elliptic.sol";
import {Base64Url} from "@fcl/utils/Base64Url.sol";

struct WebAuthnInfo {
bytes authenticatorData;
Expand Down
27 changes: 27 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@
js-tokens "^4.0.0"
picocolors "^1.0.0"

"@modular-account-libs@github:erc6900/modular-account-libs#v0.8.0-rc.0":
version "0.8.0-rc.0"
resolved "https://codeload.github.com/erc6900/modular-account-libs/tar.gz/d64adb5bd100d6ad64d0a83b5dc13b356423d852"

"@openzeppelin/[email protected]":
version "5.0.2"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz#3e5321a2ecdd0b206064356798c21225b6ec7105"
integrity sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==

"@openzeppelin/[email protected]":
version "5.0.2"
resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210"
integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==

"@pnpm/config.env-replace@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz#ab29da53df41e8948a00f2433f085f54de8b3a4c"
Expand Down Expand Up @@ -280,6 +294,14 @@ fast-uri@^3.0.1:
resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.2.tgz#d78b298cf70fd3b752fd951175a3da6a7b48f024"
integrity sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==

"fcl@github:rdubois-crypto/FreshCryptoLib#8179e08cac72072bd260796633fec41fdfd5b441":
version "0.0.0"
resolved "https://codeload.github.com/rdubois-crypto/FreshCryptoLib/tar.gz/8179e08cac72072bd260796633fec41fdfd5b441"

"forge-std@github:foundry-rs/forge-std#v1.9.2":
version "1.9.2"
resolved "https://codeload.github.com/foundry-rs/forge-std/tar.gz/1714bee72e286e73f76e320d110e0eaf5c4e649d"

form-data-encoder@^2.1.2:
version "2.1.4"
resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
Expand Down Expand Up @@ -619,6 +641,11 @@ slice-ansi@^4.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"

[email protected]:
version "0.0.243"
resolved "https://registry.yarnpkg.com/solady/-/solady-0.0.243.tgz#f1d3063206f44111c45a987d66f68a0a72c9f60e"
integrity sha512-KwYZ79Sx+KUQ04d4dyj5P+ny1yi1LYDYv2ixZtgr43Eyn3PTvc+21do+eHG63vl4ZSREh3B3W9BAIgar68qF1A==

solhint@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/solhint/-/solhint-5.0.3.tgz#b57f6d2534fe09a60f9db1b92e834363edd1cbde"
Expand Down
Loading