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

Jump to bottom

chore: bump forge-std #3344

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore: bump forge-std #3344

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
115917a
Update forge-std and remove ds-test dependency
vdrg Oct 28, 2024
9bb8352
Update e2e pnpm lock
vdrg Oct 28, 2024
f764565
Update MoveSystem address in store test snapshot
vdrg Oct 29, 2024
6566ec4
Create tricky-pants-yawn.md
vdrg Oct 30, 2024
07ab863
Update .changeset/tricky-pants-yawn.md
vdrg Oct 30, 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: 10 additions & 0 deletions .changeset/tricky-pants-yawn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@latticexyz/cli": patch
"@latticexyz/gas-report": patch
"@latticexyz/schema-type": patch
"@latticexyz/store": patch
"@latticexyz/world-module-erc20": patch
"@latticexyz/world-module-metadata": patch
vdrg marked this conversation as resolved.
Show resolved Hide resolved
---

Bumped forge-std version and removed ds-test dependency (not needed in current forge-std versions)
3 changes: 1 addition & 2 deletions e2e/packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"@latticexyz/world": "link:../../../packages/world",
"@latticexyz/world-modules": "link:../../../packages/world-modules",
"dotenv": "^16.0.3",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"typescript": "5.4.2",
"vite": "^4.2.1",
Expand Down
1 change: 0 additions & 1 deletion e2e/packages/contracts/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
21 changes: 6 additions & 15 deletions e2e/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions examples/custom-world/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"devDependencies": {
"@latticexyz/cli": "link:../../packages/cli",
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"prettier-plugin-solidity": "1.3.1",
"shx": "^0.3.4",
Expand Down
1 change: 0 additions & 1 deletion examples/custom-world/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions examples/local-explorer/packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
},
"devDependencies": {
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"prettier-plugin-solidity": "1.3.1",
"solhint": "^3.3.7",
Expand Down
1 change: 0 additions & 1 deletion examples/local-explorer/packages/contracts/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions examples/minimal/packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"@latticexyz/world-modules": "link:../../../../packages/world-modules",
"@solidstate/contracts": "^0.0.52",
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"prettier-plugin-solidity": "1.3.1",
"solhint": "^3.4.1",
Expand Down
1 change: 0 additions & 1 deletion examples/minimal/packages/contracts/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions examples/multiple-accounts/packages/contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
},
"devDependencies": {
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"prettier-plugin-solidity": "1.3.1",
"solhint": "^3.3.7",
Expand Down
1 change: 0 additions & 1 deletion examples/multiple-accounts/packages/contracts/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions examples/multiple-namespaces/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"@latticexyz/world-modules": "link:../../packages/world-modules",
"@solidstate/contracts": "^0.0.52",
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"prettier": "3.2.5",
"prettier-plugin-solidity": "1.3.1",
"shx": "^0.3.4",
Expand Down
1 change: 0 additions & 1 deletion examples/multiple-namespaces/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@
"@types/throttle-debounce": "^5.0.0",
"@types/toposort": "^2.0.6",
"@types/yargs": "^17.0.10",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"tsup": "^6.7.0",
"vitest": "0.34.6"
}
Expand Down
1 change: 0 additions & 1 deletion packages/cli/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
3 changes: 1 addition & 2 deletions packages/gas-report/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"@types/node": "^18.15.11",
"@types/stream-to-array": "^2.3.1",
"@types/yargs": "^17.0.10",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"tsup": "^6.7.0",
"vitest": "0.34.6"
}
Expand Down
1 change: 0 additions & 1 deletion packages/gas-report/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
3 changes: 1 addition & 2 deletions packages/schema-type/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
},
"devDependencies": {
"@latticexyz/gas-report": "workspace:*",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"tsup": "^6.7.0",
"vitest": "0.34.6"
}
Expand Down
1 change: 0 additions & 1 deletion packages/schema-type/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
12 changes: 6 additions & 6 deletions packages/store/gas-report.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@
"file": "test/Gas.t.sol:GasTest",
"test": "testCompareAbiEncodeVsCustom",
"name": "pass abi encoded bytes to external contract",
"gasUsed": 29493
"gasUsed": 29505
},
{
"file": "test/Gas.t.sol:GasTest",
"test": "testCompareAbiEncodeVsCustom",
"name": "pass custom encoded bytes to external contract",
"gasUsed": 23310
"gasUsed": 23322
},
{
"file": "test/Gas.t.sol:GasTest",
Expand Down Expand Up @@ -363,7 +363,7 @@
"file": "test/Mixed.t.sol:MixedTest",
"test": "testCompareSolidity",
"name": "store Mixed struct in storage (native solidity)",
"gasUsed": 92007
"gasUsed": 92004
},
{
"file": "test/Mixed.t.sol:MixedTest",
Expand Down Expand Up @@ -807,7 +807,7 @@
"file": "test/StoreCoreGas.t.sol:StoreCoreGasTest",
"test": "testSetAndGetDynamicData",
"name": "compare: Set complex record with dynamic data using native solidity",
"gasUsed": 116845
"gasUsed": 116842
},
{
"file": "test/StoreCoreGas.t.sol:StoreCoreGasTest",
Expand Down Expand Up @@ -1053,13 +1053,13 @@
"file": "test/StoreSwitch.t.sol:StoreSwitchTest",
"test": "testDelegatecall",
"name": "get Store address",
"gasUsed": 2170
"gasUsed": 2182
},
{
"file": "test/StoreSwitch.t.sol:StoreSwitchTest",
"test": "testNoDelegatecall",
"name": "get Store address",
"gasUsed": 2173
"gasUsed": 2185
},
{
"file": "test/tightcoder/DecodeSlice.t.sol:DecodeSliceTest",
Expand Down
3 changes: 1 addition & 2 deletions packages/store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
"@types/debug": "^4.1.7",
"@types/ejs": "^3.1.1",
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1",
"forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262",
"solhint": "^3.3.7",
"tsup": "^6.7.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/store/remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
ds-test/=node_modules/ds-test/src/
forge-std/=node_modules/forge-std/src/
@latticexyz/=node_modules/@latticexyz/
4 changes: 2 additions & 2 deletions packages/store/ts/flattenStoreLogs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ describe("flattenStoreLogs", async () => {
"Store_SetRecord store__ResourceIds (0x746200000000000000000000000000005465727261696e000000000000000000)",
"Store_SetRecord store__ResourceIds (0x737900000000000000000000000000004d6f766553797374656d000000000000)",
"Store_SetRecord world__Systems (0x737900000000000000000000000000004d6f766553797374656d000000000000)",
"Store_SetRecord world__SystemRegistry (0x000000000000000000000000909d87ff2af6abace4fe66171b9622bc10305c3c)",
"Store_SetRecord world__ResourceAccess (0x6e73000000000000000000000000000000000000000000000000000000000000,0x000000000000000000000000909d87ff2af6abace4fe66171b9622bc10305c3c)",
"Store_SetRecord world__SystemRegistry (0x000000000000000000000000e8d8a882c3522cd98aa6e21d157b65d140042959)",
"Store_SetRecord world__ResourceAccess (0x6e73000000000000000000000000000000000000000000000000000000000000,0x000000000000000000000000e8d8a882c3522cd98aa6e21d157b65d140042959)",
"Store_SetRecord world__FunctionSelector (0xb591186e00000000000000000000000000000000000000000000000000000000)",
"Store_SetRecord world__FunctionSignatur (0xb591186e00000000000000000000000000000000000000000000000000000000)",
"Store_SetRecord store__Tables (0x7462000000000000000000000000000043616c6c576974685369676e61747572)",
Expand Down
4 changes: 2 additions & 2 deletions packages/store/ts/getStoreLogs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ describe("getStoreLogs", async () => {
"Store_SpliceStaticData store__ResourceIds (0x746200000000000000000000000000005465727261696e000000000000000000)",
"Store_SpliceStaticData store__ResourceIds (0x737900000000000000000000000000004d6f766553797374656d000000000000)",
"Store_SetRecord world__Systems (0x737900000000000000000000000000004d6f766553797374656d000000000000)",
"Store_SpliceStaticData world__SystemRegistry (0x000000000000000000000000909d87ff2af6abace4fe66171b9622bc10305c3c)",
"Store_SpliceStaticData world__ResourceAccess (0x6e73000000000000000000000000000000000000000000000000000000000000,0x000000000000000000000000909d87ff2af6abace4fe66171b9622bc10305c3c)",
"Store_SpliceStaticData world__SystemRegistry (0x000000000000000000000000e8d8a882c3522cd98aa6e21d157b65d140042959)",
"Store_SpliceStaticData world__ResourceAccess (0x6e73000000000000000000000000000000000000000000000000000000000000,0x000000000000000000000000e8d8a882c3522cd98aa6e21d157b65d140042959)",
"Store_SetRecord world__FunctionSelector (0xb591186e00000000000000000000000000000000000000000000000000000000)",
"Store_SetRecord world__FunctionSignatur (0xb591186e00000000000000000000000000000000000000000000000000000000)",
"Store_SetRecord world__FunctionSignatur (0xb591186e00000000000000000000000000000000000000000000000000000000)",
Expand Down
Loading
Loading