Skip to content

Commit fd28fd4

Browse files
committed
chore: settings updates to allow soldeer
1 parent 5fe88ca commit fd28fd4

File tree

7 files changed

+59
-5
lines changed

7 files changed

+59
-5
lines changed

.github/workflows/solidity.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ jobs:
104104
- name: Install Node dependencies
105105
run: npm install
106106

107+
- name: Install Soldeer dependencies
108+
if: github.repository == 'settlemint/solidity-account-abstraction'
109+
run: |
110+
forge soldeer update
111+
107112
- name: Run Forge build
108113
run: |
109114
forge --version

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ generated
3636
build
3737

3838
.pnpm
39-
lcov.info
39+
lcov.info
40+
41+
# Soldeer
42+
/dependencies

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ USER root
2121

2222
RUN npm install
2323
RUN if [ -f "scripts/decompress.js" ]; then node scripts/decompress.js; fi
24+
RUN if [ -f "soldeer.lock" ]; then forge soldeer update; fi
2425
RUN forge build
2526
RUN npx hardhat compile
2627

foundry.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[profile.default]
2020
src = 'contracts'
2121
out = 'out'
22-
libs = ['node_modules', 'lib']
22+
libs = ['node_modules', 'lib', 'dependencies']
2323
test = 'test'
2424
cache_path = 'cache_forge'
2525
solc = "0.8.27"
@@ -30,4 +30,3 @@
3030
auto_detect_solc = false
3131
extra_output_files = [ "metadata" ]
3232
viaIR = true
33-

lib/forge-std/src/StdChains.sol

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ abstract contract StdChains {
201201
"sepolia", ChainData("Sepolia", 11155111, "https://sepolia.infura.io/v3/b9794ad1ddf84dfb8c34d6bb5dca2001")
202202
);
203203
setChainWithDefaultRpcUrl("holesky", ChainData("Holesky", 17000, "https://rpc.holesky.ethpandaops.io"));
204+
setChainWithDefaultRpcUrl("hoodi", ChainData("Hoodi", 560048, "https://rpc.hoodi.ethpandaops.io"));
204205
setChainWithDefaultRpcUrl("optimism", ChainData("Optimism", 10, "https://mainnet.optimism.io"));
205206
setChainWithDefaultRpcUrl(
206207
"optimism_sepolia", ChainData("Optimism Sepolia", 11155420, "https://sepolia.optimism.io")

lib/forge-std/src/Vm.sol

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/forge-std/test/Vm.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {Vm, VmSafe} from "../src/Vm.sol";
99
// added to or removed from Vm or VmSafe.
1010
contract VmTest is Test {
1111
function test_VmInterfaceId() public pure {
12-
assertEq(type(Vm).interfaceId, bytes4(0xdb28dd7b), "Vm");
12+
assertEq(type(Vm).interfaceId, bytes4(0x6bb3d14a), "Vm");
1313
}
1414

1515
function test_VmSafeInterfaceId() public pure {
16-
assertEq(type(VmSafe).interfaceId, bytes4(0xb572f44f), "VmSafe");
16+
assertEq(type(VmSafe).interfaceId, bytes4(0x1d414059), "VmSafe");
1717
}
1818
}

0 commit comments

Comments
 (0)