From 9f3636d2327d4efc6e10d3df482c523fcd063aab Mon Sep 17 00:00:00 2001 From: zjkree Date: Tue, 24 Dec 2024 06:00:54 +0100 Subject: [PATCH 1/3] Remove forge-std. --- .gitignore | 4 ++-- .gitmodules | 4 +--- lib/forge-std | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 160000 lib/forge-std diff --git a/.gitignore b/.gitignore index 1f85ede..c46aa2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -cache/ -out/ \ No newline at end of file +onchain/cache/ +onchain/out/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 888d42d..8b13789 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1 @@ -[submodule "lib/forge-std"] - path = lib/forge-std - url = https://github.com/foundry-rs/forge-std + diff --git a/lib/forge-std b/lib/forge-std deleted file mode 160000 index b93cf4b..0000000 --- a/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b93cf4bc34ff214c099dc970b153f85ade8c9f66 From 818da97ea55f9e23b35a18edd620600b6618547e Mon Sep 17 00:00:00 2001 From: zjkree Date: Tue, 24 Dec 2024 06:03:14 +0100 Subject: [PATCH 2/3] Move onchain logic to speperate dir. --- foundry.toml => onchain/foundry.toml | 0 {script => onchain/script}/Counter.s.sol | 0 {src => onchain/src}/Push3IntAdapter.sol | 0 {src => onchain/src}/Push3Interpreter.sol | 0 {test => onchain/test}/Push3IntAdapter.t.sol | 0 {test => onchain/test}/Push3Interpreter.t.sol | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename foundry.toml => onchain/foundry.toml (100%) rename {script => onchain/script}/Counter.s.sol (100%) rename {src => onchain/src}/Push3IntAdapter.sol (100%) rename {src => onchain/src}/Push3Interpreter.sol (100%) rename {test => onchain/test}/Push3IntAdapter.t.sol (100%) rename {test => onchain/test}/Push3Interpreter.t.sol (100%) diff --git a/foundry.toml b/onchain/foundry.toml similarity index 100% rename from foundry.toml rename to onchain/foundry.toml diff --git a/script/Counter.s.sol b/onchain/script/Counter.s.sol similarity index 100% rename from script/Counter.s.sol rename to onchain/script/Counter.s.sol diff --git a/src/Push3IntAdapter.sol b/onchain/src/Push3IntAdapter.sol similarity index 100% rename from src/Push3IntAdapter.sol rename to onchain/src/Push3IntAdapter.sol diff --git a/src/Push3Interpreter.sol b/onchain/src/Push3Interpreter.sol similarity index 100% rename from src/Push3Interpreter.sol rename to onchain/src/Push3Interpreter.sol diff --git a/test/Push3IntAdapter.t.sol b/onchain/test/Push3IntAdapter.t.sol similarity index 100% rename from test/Push3IntAdapter.t.sol rename to onchain/test/Push3IntAdapter.t.sol diff --git a/test/Push3Interpreter.t.sol b/onchain/test/Push3Interpreter.t.sol similarity index 100% rename from test/Push3Interpreter.t.sol rename to onchain/test/Push3Interpreter.t.sol From 50288eb30c14f4c9557b7e8b07a8bf1f9de234f9 Mon Sep 17 00:00:00 2001 From: zjkree Date: Tue, 24 Dec 2024 06:04:03 +0100 Subject: [PATCH 3/3] forge install: forge-std v1.9.5 --- .gitmodules | 3 +++ onchain/lib/forge-std | 1 + 2 files changed, 4 insertions(+) create mode 160000 onchain/lib/forge-std diff --git a/.gitmodules b/.gitmodules index 8b13789..e9dccc6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1 +1,4 @@ +[submodule "onchain/lib/forge-std"] + path = onchain/lib/forge-std + url = https://github.com/foundry-rs/forge-std diff --git a/onchain/lib/forge-std b/onchain/lib/forge-std new file mode 160000 index 0000000..b93cf4b --- /dev/null +++ b/onchain/lib/forge-std @@ -0,0 +1 @@ +Subproject commit b93cf4bc34ff214c099dc970b153f85ade8c9f66