From 939287dcb1dee8b05a75e26eb1f4076f6eebb8c4 Mon Sep 17 00:00:00 2001 From: Atlas Date: Fri, 15 Nov 2024 13:52:01 +0100 Subject: [PATCH] feat: use forge install to manage the dep --- .gitmodules | 3 +++ foundry.toml | 2 -- lib/ovm-contracts | 1 + package-lock.json | 35 ----------------------------------- package.json | 6 ------ 5 files changed, 4 insertions(+), 43 deletions(-) create mode 160000 lib/ovm-contracts delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/.gitmodules b/.gitmodules index 888d42d..fe626b6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/forge-std"] path = lib/forge-std url = https://github.com/foundry-rs/forge-std +[submodule "lib/ovm-contracts"] + path = lib/ovm-contracts + url = https://github.com/webisopen/ovm-contracts diff --git a/foundry.toml b/foundry.toml index f5e244c..d17ac50 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,6 +1,4 @@ [profile.default] -libs = ["node_modules","lib"] - auto_detect_solc = false bytecode_hash = "none" evm_version = "paris" diff --git a/lib/ovm-contracts b/lib/ovm-contracts new file mode 160000 index 0000000..2ceaeaa --- /dev/null +++ b/lib/ovm-contracts @@ -0,0 +1 @@ +Subproject commit 2ceaeaa737cf7835a0d1ceec91cffd937c8014ff diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index b5d4261..0000000 --- a/package-lock.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "cal-pi-onchain", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "dependencies": { - "@openzeppelin/contracts": "^5.0.2", - "@webisopen/ovm-contracts": "^1.3.0" - } - }, - "node_modules/@openzeppelin/contracts": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", - "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" - }, - "node_modules/@webisopen/ovm-contracts": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webisopen/ovm-contracts/-/ovm-contracts-1.3.0.tgz", - "integrity": "sha512-ub7QEFCWeVgytb/ZOaDD8g/kSziU1w6vVsZs3p6JTo6JwbYO0AJESRtOGhZVblUslmOJGmpBH8G0WnPfqUfr2g==" - } - }, - "dependencies": { - "@openzeppelin/contracts": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", - "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" - }, - "@webisopen/ovm-contracts": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webisopen/ovm-contracts/-/ovm-contracts-1.3.0.tgz", - "integrity": "sha512-ub7QEFCWeVgytb/ZOaDD8g/kSziU1w6vVsZs3p6JTo6JwbYO0AJESRtOGhZVblUslmOJGmpBH8G0WnPfqUfr2g==" - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index e480d70..0000000 --- a/package.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dependencies": { - "@webisopen/ovm-contracts": "^1.3.0", - "@openzeppelin/contracts": "^5.0.2" - } -}