From 115917a0744d98c6335ae755be77b7e129b35bc4 Mon Sep 17 00:00:00 2001 From: Vicente Dragicevic Date: Mon, 28 Oct 2024 18:54:57 -0300 Subject: [PATCH 1/5] Update forge-std and remove ds-test dependency --- e2e/packages/contracts/package.json | 3 +- e2e/packages/contracts/remappings.txt | 1 - examples/custom-world/package.json | 3 +- examples/custom-world/remappings.txt | 1 - .../packages/contracts/package.json | 3 +- .../packages/contracts/remappings.txt | 1 - .../minimal/packages/contracts/package.json | 3 +- .../minimal/packages/contracts/remappings.txt | 1 - .../packages/contracts/package.json | 3 +- .../packages/contracts/remappings.txt | 1 - examples/multiple-namespaces/package.json | 3 +- examples/multiple-namespaces/remappings.txt | 1 - packages/cli/package.json | 3 +- packages/cli/remappings.txt | 1 - packages/gas-report/package.json | 3 +- packages/gas-report/remappings.txt | 1 - packages/schema-type/package.json | 3 +- packages/schema-type/remappings.txt | 1 - packages/store/gas-report.json | 12 +-- packages/store/package.json | 3 +- packages/store/remappings.txt | 1 - packages/world-module-erc20/gas-report.json | 60 ++++++------- packages/world-module-erc20/package.json | 3 +- packages/world-module-erc20/remappings.txt | 3 +- .../world-module-metadata/gas-report.json | 6 +- packages/world-module-metadata/package.json | 3 +- packages/world-module-metadata/remappings.txt | 3 +- packages/world-modules/gas-report.json | 36 ++++---- packages/world-modules/package.json | 3 +- packages/world-modules/remappings.txt | 3 +- packages/world/gas-report.json | 22 ++--- packages/world/package.json | 3 +- packages/world/remappings.txt | 1 - pnpm-lock.yaml | 84 ++++++------------- .../phaser/packages/contracts/package.json | 3 +- .../phaser/packages/contracts/remappings.txt | 1 - .../react-ecs/packages/contracts/package.json | 3 +- .../packages/contracts/remappings.txt | 1 - .../react/packages/contracts/package.json | 3 +- .../react/packages/contracts/remappings.txt | 1 - .../threejs/packages/contracts/package.json | 3 +- .../threejs/packages/contracts/remappings.txt | 1 - .../vanilla/packages/contracts/package.json | 3 +- .../vanilla/packages/contracts/remappings.txt | 1 - test/mock-game-contracts/package.json | 3 +- test/mock-game-contracts/remappings.txt | 1 - test/puppet-modules/package.json | 3 +- test/puppet-modules/remappings.txt | 1 - 48 files changed, 116 insertions(+), 194 deletions(-) diff --git a/e2e/packages/contracts/package.json b/e2e/packages/contracts/package.json index 6863f55a98..e60f0c975d 100644 --- a/e2e/packages/contracts/package.json +++ b/e2e/packages/contracts/package.json @@ -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", diff --git a/e2e/packages/contracts/remappings.txt b/e2e/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/e2e/packages/contracts/remappings.txt +++ b/e2e/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/examples/custom-world/package.json b/examples/custom-world/package.json index 9ec58ace1b..7be50e2f54 100644 --- a/examples/custom-world/package.json +++ b/examples/custom-world/package.json @@ -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", diff --git a/examples/custom-world/remappings.txt b/examples/custom-world/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/examples/custom-world/remappings.txt +++ b/examples/custom-world/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/examples/local-explorer/packages/contracts/package.json b/examples/local-explorer/packages/contracts/package.json index b0a118d096..bdb84d6578 100644 --- a/examples/local-explorer/packages/contracts/package.json +++ b/examples/local-explorer/packages/contracts/package.json @@ -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", diff --git a/examples/local-explorer/packages/contracts/remappings.txt b/examples/local-explorer/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/examples/local-explorer/packages/contracts/remappings.txt +++ b/examples/local-explorer/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/examples/minimal/packages/contracts/package.json b/examples/minimal/packages/contracts/package.json index 616f82f625..9219866f72 100644 --- a/examples/minimal/packages/contracts/package.json +++ b/examples/minimal/packages/contracts/package.json @@ -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", diff --git a/examples/minimal/packages/contracts/remappings.txt b/examples/minimal/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/examples/minimal/packages/contracts/remappings.txt +++ b/examples/minimal/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/examples/multiple-accounts/packages/contracts/package.json b/examples/multiple-accounts/packages/contracts/package.json index 47ea5fce11..3d12a093a8 100644 --- a/examples/multiple-accounts/packages/contracts/package.json +++ b/examples/multiple-accounts/packages/contracts/package.json @@ -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", diff --git a/examples/multiple-accounts/packages/contracts/remappings.txt b/examples/multiple-accounts/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/examples/multiple-accounts/packages/contracts/remappings.txt +++ b/examples/multiple-accounts/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/examples/multiple-namespaces/package.json b/examples/multiple-namespaces/package.json index f727002746..8309c35782 100644 --- a/examples/multiple-namespaces/package.json +++ b/examples/multiple-namespaces/package.json @@ -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", diff --git a/examples/multiple-namespaces/remappings.txt b/examples/multiple-namespaces/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/examples/multiple-namespaces/remappings.txt +++ b/examples/multiple-namespaces/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/packages/cli/package.json b/packages/cli/package.json index 6c6cd58ee9..c668aec694 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -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" } diff --git a/packages/cli/remappings.txt b/packages/cli/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/packages/cli/remappings.txt +++ b/packages/cli/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/packages/gas-report/package.json b/packages/gas-report/package.json index ec7ecdbbd0..5bd7850a89 100644 --- a/packages/gas-report/package.json +++ b/packages/gas-report/package.json @@ -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" } diff --git a/packages/gas-report/remappings.txt b/packages/gas-report/remappings.txt index fff7781446..57ac63a89a 100644 --- a/packages/gas-report/remappings.txt +++ b/packages/gas-report/remappings.txt @@ -1,2 +1 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ diff --git a/packages/schema-type/package.json b/packages/schema-type/package.json index 6191115626..0ef155a82f 100644 --- a/packages/schema-type/package.json +++ b/packages/schema-type/package.json @@ -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" } diff --git a/packages/schema-type/remappings.txt b/packages/schema-type/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/packages/schema-type/remappings.txt +++ b/packages/schema-type/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/packages/store/gas-report.json b/packages/store/gas-report.json index 2d5d001dac..248d5da4b6 100644 --- a/packages/store/gas-report.json +++ b/packages/store/gas-report.json @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/packages/store/package.json b/packages/store/package.json index 17b1518b34..44678b33a4 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -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" } diff --git a/packages/store/remappings.txt b/packages/store/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/packages/store/remappings.txt +++ b/packages/store/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/packages/world-module-erc20/gas-report.json b/packages/world-module-erc20/gas-report.json index 92485adbd0..682e078a7a 100644 --- a/packages/world-module-erc20/gas-report.json +++ b/packages/world-module-erc20/gas-report.json @@ -3,73 +3,73 @@ "file": "test/ERC20BaseTest.sol:ERC20WithInternalStoreTest", "test": "testApprove", "name": "internal_approve", - "gasUsed": 58213 + "gasUsed": 58231 }, { "file": "test/ERC20BaseTest.sol:ERC20WithInternalStoreTest", "test": "testBurn", "name": "internal_burn", - "gasUsed": 56417 + "gasUsed": 56423 }, { "file": "test/ERC20BaseTest.sol:ERC20WithInternalStoreTest", "test": "testMint", "name": "internal_mint", - "gasUsed": 90703 + "gasUsed": 90709 }, { "file": "test/ERC20BaseTest.sol:ERC20WithInternalStoreTest", "test": "testTransfer", "name": "internal_transfer", - "gasUsed": 67747 + "gasUsed": 67765 }, { "file": "test/ERC20BaseTest.sol:ERC20WithInternalStoreTest", "test": "testTransferFrom", "name": "internal_transferFrom", - "gasUsed": 79574 + "gasUsed": 79592 }, { "file": "test/ERC20BaseTest.sol:ERC20WithWorldTest", "test": "testApprove", "name": "world_approve", - "gasUsed": 66343 + "gasUsed": 66361 }, { "file": "test/ERC20BaseTest.sol:ERC20WithWorldTest", "test": "testBurn", "name": "world_burn", - "gasUsed": 70873 + "gasUsed": 70879 }, { "file": "test/ERC20BaseTest.sol:ERC20WithWorldTest", "test": "testMint", "name": "world_mint", - "gasUsed": 105159 + "gasUsed": 105165 }, { "file": "test/ERC20BaseTest.sol:ERC20WithWorldTest", "test": "testTransfer", "name": "world_transfer", - "gasUsed": 82375 + "gasUsed": 82393 }, { "file": "test/ERC20BaseTest.sol:ERC20WithWorldTest", "test": "testTransferFrom", "name": "world_transferFrom", - "gasUsed": 99431 + "gasUsed": 99449 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", "test": "testApprove", "name": "internal_approve", - "gasUsed": 58213 + "gasUsed": 58231 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", "test": "testBurn", "name": "internal_burn", - "gasUsed": 56440 + "gasUsed": 56446 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", @@ -81,31 +81,31 @@ "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", "test": "testMint", "name": "internal_mint", - "gasUsed": 90703 + "gasUsed": 90709 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", "test": "testTransfer", "name": "internal_transfer", - "gasUsed": 67702 + "gasUsed": 67720 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithInternalStoreTest", "test": "testTransferFrom", "name": "internal_transferFrom", - "gasUsed": 79574 + "gasUsed": 79592 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", "test": "testApprove", "name": "world_approve", - "gasUsed": 66343 + "gasUsed": 66361 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", "test": "testBurn", "name": "world_burn", - "gasUsed": 70874 + "gasUsed": 70880 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", @@ -117,19 +117,19 @@ "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", "test": "testMint", "name": "world_mint", - "gasUsed": 105137 + "gasUsed": 105143 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", "test": "testTransfer", "name": "world_transfer", - "gasUsed": 82397 + "gasUsed": 82415 }, { "file": "test/ERC20Burnable.t.sol:ERC20BurnableWithWorldTest", "test": "testTransferFrom", "name": "world_transferFrom", - "gasUsed": 99498 + "gasUsed": 99516 }, { "file": "test/ERC20Module.t.sol:ERC20ModuleTest", @@ -141,19 +141,19 @@ "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", "test": "testApprove", "name": "internal_approve", - "gasUsed": 58213 + "gasUsed": 58231 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", "test": "testBurn", "name": "internal_burn", - "gasUsed": 59740 + "gasUsed": 59746 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", "test": "testMint", "name": "internal_mint", - "gasUsed": 94004 + "gasUsed": 94010 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", @@ -171,31 +171,31 @@ "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", "test": "testTransfer", "name": "internal_transfer", - "gasUsed": 71003 + "gasUsed": 71021 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithInternalStoreTest", "test": "testTransferFrom", "name": "internal_transferFrom", - "gasUsed": 82876 + "gasUsed": 82894 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", "test": "testApprove", "name": "world_approve", - "gasUsed": 66343 + "gasUsed": 66361 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", "test": "testBurn", "name": "world_burn", - "gasUsed": 75661 + "gasUsed": 75667 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", "test": "testMint", "name": "world_mint", - "gasUsed": 109880 + "gasUsed": 109886 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", @@ -213,12 +213,12 @@ "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", "test": "testTransfer", "name": "world_transfer", - "gasUsed": 87096 + "gasUsed": 87114 }, { "file": "test/ERC20Pausable.t.sol:ERC20PausableWithWorldTest", "test": "testTransferFrom", "name": "world_transferFrom", - "gasUsed": 104242 + "gasUsed": 104260 } ] diff --git a/packages/world-module-erc20/package.json b/packages/world-module-erc20/package.json index e5a483c838..f31e675a44 100644 --- a/packages/world-module-erc20/package.json +++ b/packages/world-module-erc20/package.json @@ -55,8 +55,7 @@ "@latticexyz/cli": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@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", "vitest": "0.34.6" diff --git a/packages/world-module-erc20/remappings.txt b/packages/world-module-erc20/remappings.txt index 66be45ecbd..e2614d0aa8 100644 --- a/packages/world-module-erc20/remappings.txt +++ b/packages/world-module-erc20/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ -@latticexyz/=node_modules/@latticexyz/ \ No newline at end of file +@latticexyz/=node_modules/@latticexyz/ diff --git a/packages/world-module-metadata/gas-report.json b/packages/world-module-metadata/gas-report.json index db85ecdf4d..f0eb0dc763 100644 --- a/packages/world-module-metadata/gas-report.json +++ b/packages/world-module-metadata/gas-report.json @@ -3,18 +3,18 @@ "file": "test/MetadataModule.t.sol:MetadataModuleTest", "test": "testDeleteResourceTag", "name": "delete resource tag", - "gasUsed": 70301 + "gasUsed": 70307 }, { "file": "test/MetadataModule.t.sol:MetadataModuleTest", "test": "testInstall", "name": "install metadata module", - "gasUsed": 1109853 + "gasUsed": 1109847 }, { "file": "test/MetadataModule.t.sol:MetadataModuleTest", "test": "testSetResourceTag", "name": "set resource tag", - "gasUsed": 116708 + "gasUsed": 116714 } ] diff --git a/packages/world-module-metadata/package.json b/packages/world-module-metadata/package.json index bba356c77a..7862358d20 100644 --- a/packages/world-module-metadata/package.json +++ b/packages/world-module-metadata/package.json @@ -50,8 +50,7 @@ "@latticexyz/abi-ts": "workspace:*", "@latticexyz/gas-report": "workspace:*", "@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", "vitest": "0.34.6" diff --git a/packages/world-module-metadata/remappings.txt b/packages/world-module-metadata/remappings.txt index 66be45ecbd..e2614d0aa8 100644 --- a/packages/world-module-metadata/remappings.txt +++ b/packages/world-module-metadata/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ -@latticexyz/=node_modules/@latticexyz/ \ No newline at end of file +@latticexyz/=node_modules/@latticexyz/ diff --git a/packages/world-modules/gas-report.json b/packages/world-modules/gas-report.json index e026ade173..9e8298a350 100644 --- a/packages/world-modules/gas-report.json +++ b/packages/world-modules/gas-report.json @@ -3,7 +3,7 @@ "file": "test/CallWithSignatureModule.t.sol:Unstable_CallWithSignatureModuleTest", "test": "testInstallRoot", "name": "install delegation module", - "gasUsed": 691133 + "gasUsed": 691127 }, { "file": "test/CallWithSignatureModule.t.sol:Unstable_CallWithSignatureModuleTest", @@ -87,13 +87,13 @@ "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", "test": "testInstallComposite", "name": "install keys in table module", - "gasUsed": 1463317 + "gasUsed": 1463311 }, { "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", "test": "testInstallGas", "name": "install keys in table module", - "gasUsed": 1463317 + "gasUsed": 1463311 }, { "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", @@ -105,13 +105,13 @@ "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", "test": "testInstallSingleton", "name": "install keys in table module", - "gasUsed": 1463317 + "gasUsed": 1463311 }, { "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", "test": "testSetAndDeleteRecordHookCompositeGas", "name": "install keys in table module", - "gasUsed": 1463317 + "gasUsed": 1463311 }, { "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", @@ -129,7 +129,7 @@ "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", "test": "testSetAndDeleteRecordHookGas", "name": "install keys in table module", - "gasUsed": 1463317 + "gasUsed": 1463311 }, { "file": "test/KeysInTableModule.t.sol:KeysInTableModuleTest", @@ -147,7 +147,7 @@ "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", "test": "testGetKeysWithValueGas", "name": "install keys with value module", - "gasUsed": 719012 + "gasUsed": 719006 }, { "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", @@ -165,7 +165,7 @@ "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", "test": "testInstall", "name": "install keys with value module", - "gasUsed": 719012 + "gasUsed": 719006 }, { "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", @@ -177,7 +177,7 @@ "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", "test": "testSetAndDeleteRecordHook", "name": "install keys with value module", - "gasUsed": 719012 + "gasUsed": 719006 }, { "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", @@ -195,7 +195,7 @@ "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", "test": "testSetField", "name": "install keys with value module", - "gasUsed": 719012 + "gasUsed": 719006 }, { "file": "test/KeysWithValueModule.t.sol:KeysWithValueModuleTest", @@ -279,43 +279,43 @@ "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromCallboundDelegation", "name": "register a callbound delegation", - "gasUsed": 138994 + "gasUsed": 138979 }, { "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromCallboundDelegation", "name": "call a system via a callbound delegation", - "gasUsed": 67297 + "gasUsed": 67291 }, { "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromSystemDelegation", "name": "register a systembound delegation", - "gasUsed": 136116 + "gasUsed": 136101 }, { "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromSystemDelegation", "name": "call a system via a systembound delegation", - "gasUsed": 69661 + "gasUsed": 69655 }, { "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromTimeboundDelegation", "name": "register a timebound delegation", - "gasUsed": 132659 + "gasUsed": 132644 }, { "file": "test/StandardDelegationsModule.t.sol:StandardDelegationsModuleTest", "test": "testCallFromTimeboundDelegation", "name": "call a system via a timebound delegation", - "gasUsed": 58227 + "gasUsed": 58221 }, { "file": "test/UniqueEntityModule.t.sol:UniqueEntityModuleTest", "test": "testInstall", "name": "install unique entity module", - "gasUsed": 718745 + "gasUsed": 718739 }, { "file": "test/UniqueEntityModule.t.sol:UniqueEntityModuleTest", @@ -327,7 +327,7 @@ "file": "test/UniqueEntityModule.t.sol:UniqueEntityModuleTest", "test": "testInstallRoot", "name": "installRoot unique entity module", - "gasUsed": 689190 + "gasUsed": 689184 }, { "file": "test/UniqueEntityModule.t.sol:UniqueEntityModuleTest", diff --git a/packages/world-modules/package.json b/packages/world-modules/package.json index fadfa1252a..07fbcd7c7e 100644 --- a/packages/world-modules/package.json +++ b/packages/world-modules/package.json @@ -55,8 +55,7 @@ "@latticexyz/gas-report": "workspace:*", "@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", "glob": "^10.4.2", "solhint": "^3.3.7", "tsup": "^6.7.0", diff --git a/packages/world-modules/remappings.txt b/packages/world-modules/remappings.txt index 66be45ecbd..e2614d0aa8 100644 --- a/packages/world-modules/remappings.txt +++ b/packages/world-modules/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ -@latticexyz/=node_modules/@latticexyz/ \ No newline at end of file +@latticexyz/=node_modules/@latticexyz/ diff --git a/packages/world/gas-report.json b/packages/world/gas-report.json index 0b342e977c..69b1dff900 100644 --- a/packages/world/gas-report.json +++ b/packages/world/gas-report.json @@ -69,13 +69,13 @@ "file": "test/World.t.sol:WorldTest", "test": "testCall", "name": "call a system via the World", - "gasUsed": 40081 + "gasUsed": 40072 }, { "file": "test/World.t.sol:WorldTest", "test": "testCallFromNamespaceDelegation", "name": "call a system via a namespace fallback delegation", - "gasUsed": 59816 + "gasUsed": 59807 }, { "file": "test/World.t.sol:WorldTest", @@ -87,7 +87,7 @@ "file": "test/World.t.sol:WorldTest", "test": "testCallFromUnlimitedDelegation", "name": "call a system via an unlimited delegation", - "gasUsed": 40663 + "gasUsed": 40654 }, { "file": "test/World.t.sol:WorldTest", @@ -141,7 +141,7 @@ "file": "test/World.t.sol:WorldTest", "test": "testSetField", "name": "Write data to a table field", - "gasUsed": 60884 + "gasUsed": 60872 }, { "file": "test/World.t.sol:WorldTest", @@ -165,13 +165,13 @@ "file": "test/WorldDynamicUpdate.t.sol:UpdateInDynamicFieldTest", "test": "testPopFromDynamicField", "name": "pop 1 address (cold)", - "gasUsed": 51686 + "gasUsed": 51685 }, { "file": "test/WorldDynamicUpdate.t.sol:UpdateInDynamicFieldTest", "test": "testPopFromDynamicField", "name": "pop 1 address (warm)", - "gasUsed": 45632 + "gasUsed": 45631 }, { "file": "test/WorldDynamicUpdate.t.sol:UpdateInDynamicFieldTest", @@ -189,13 +189,13 @@ "file": "test/WorldProxy.t.sol:WorldProxyTest", "test": "testCall", "name": "call a system via the World", - "gasUsed": 45004 + "gasUsed": 44995 }, { "file": "test/WorldProxy.t.sol:WorldProxyTest", "test": "testCallFromNamespaceDelegation", "name": "call a system via a namespace fallback delegation", - "gasUsed": 64745 + "gasUsed": 64736 }, { "file": "test/WorldProxy.t.sol:WorldProxyTest", @@ -207,7 +207,7 @@ "file": "test/WorldProxy.t.sol:WorldProxyTest", "test": "testCallFromUnlimitedDelegation", "name": "call a system via an unlimited delegation", - "gasUsed": 45592 + "gasUsed": 45583 }, { "file": "test/WorldProxy.t.sol:WorldProxyTest", @@ -261,7 +261,7 @@ "file": "test/WorldProxy.t.sol:WorldProxyTest", "test": "testSetField", "name": "Write data to a table field", - "gasUsed": 65822 + "gasUsed": 65810 }, { "file": "test/WorldProxy.t.sol:WorldProxyTest", @@ -315,6 +315,6 @@ "file": "test/WorldResourceId.t.sol:WorldResourceIdTest", "test": "testToString", "name": "convert resource ID to string", - "gasUsed": 2390 + "gasUsed": 2364 } ] diff --git a/packages/world/package.json b/packages/world/package.json index 32e808297c..49981d6ec4 100644 --- a/packages/world/package.json +++ b/packages/world/package.json @@ -73,9 +73,8 @@ "@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", "ejs": "^3.1.10", - "forge-std": "https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1", + "forge-std": "https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262", "glob": "^10.4.2", "solhint": "^3.3.7", "tsup": "^6.7.0", diff --git a/packages/world/remappings.txt b/packages/world/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/packages/world/remappings.txt +++ b/packages/world/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 725a834cd1..7d69671f77 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -281,12 +281,9 @@ importers: '@types/yargs': specifier: ^17.0.10 version: 17.0.23 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 tsup: specifier: ^6.7.0 version: 6.7.0(postcss@8.4.47)(typescript@5.4.2) @@ -720,12 +717,9 @@ importers: '@types/yargs': specifier: ^17.0.10 version: 17.0.23 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 tsup: specifier: ^6.7.0 version: 6.7.0(postcss@8.4.47)(typescript@5.4.2) @@ -856,12 +850,9 @@ importers: '@latticexyz/gas-report': specifier: workspace:* version: link:../gas-report - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 tsup: specifier: ^6.7.0 version: 6.7.0(postcss@8.4.47)(typescript@5.4.2) @@ -985,12 +976,9 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.15.11 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 solhint: specifier: ^3.3.7 version: 3.3.7 @@ -1283,15 +1271,12 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.15.11 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 ejs: specifier: ^3.1.10 version: 3.1.10 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 glob: specifier: ^10.4.2 version: 10.4.2 @@ -1329,12 +1314,9 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.19.50 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 solhint: specifier: ^3.3.7 version: 3.3.7 @@ -1366,12 +1348,9 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.15.11 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 solhint: specifier: ^3.3.7 version: 3.3.7 @@ -1418,12 +1397,9 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.15.11 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 glob: specifier: ^10.4.2 version: 10.4.2 @@ -1457,12 +1433,9 @@ importers: dotenv: specifier: ^16.0.3 version: 16.0.3 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 test/puppet-modules: devDependencies: @@ -1484,12 +1457,9 @@ importers: dotenv: specifier: ^16.0.3 version: 16.0.3 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 test/ts-benchmarks: devDependencies: @@ -6819,10 +6789,6 @@ packages: sqlite3: optional: true - ds-test@https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0: - resolution: {tarball: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0} - version: 1.0.0 - duplexify@3.7.1: resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==} @@ -7451,9 +7417,9 @@ packages: resolution: {integrity: sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==} engines: {node: '>=14'} - forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: - resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1} - version: 1.6.0 + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262: + resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262} + version: 1.9.4 form-data@4.0.0: resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} @@ -18414,8 +18380,6 @@ snapshots: postgres: 3.3.5 sql.js: 1.8.0 - ds-test@https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0: {} - duplexify@3.7.1: dependencies: end-of-stream: 1.4.4 @@ -19455,7 +19419,7 @@ snapshots: cross-spawn: 7.0.3 signal-exit: 4.1.0 - forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: {} + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262: {} form-data@4.0.0: dependencies: diff --git a/templates/phaser/packages/contracts/package.json b/templates/phaser/packages/contracts/package.json index b0a118d096..bdb84d6578 100644 --- a/templates/phaser/packages/contracts/package.json +++ b/templates/phaser/packages/contracts/package.json @@ -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", diff --git a/templates/phaser/packages/contracts/remappings.txt b/templates/phaser/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/templates/phaser/packages/contracts/remappings.txt +++ b/templates/phaser/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/templates/react-ecs/packages/contracts/package.json b/templates/react-ecs/packages/contracts/package.json index b0a118d096..bdb84d6578 100644 --- a/templates/react-ecs/packages/contracts/package.json +++ b/templates/react-ecs/packages/contracts/package.json @@ -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", diff --git a/templates/react-ecs/packages/contracts/remappings.txt b/templates/react-ecs/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/templates/react-ecs/packages/contracts/remappings.txt +++ b/templates/react-ecs/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/templates/react/packages/contracts/package.json b/templates/react/packages/contracts/package.json index b0a118d096..bdb84d6578 100644 --- a/templates/react/packages/contracts/package.json +++ b/templates/react/packages/contracts/package.json @@ -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", diff --git a/templates/react/packages/contracts/remappings.txt b/templates/react/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/templates/react/packages/contracts/remappings.txt +++ b/templates/react/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/templates/threejs/packages/contracts/package.json b/templates/threejs/packages/contracts/package.json index eb4384df7f..1ab4f83396 100644 --- a/templates/threejs/packages/contracts/package.json +++ b/templates/threejs/packages/contracts/package.json @@ -23,8 +23,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", diff --git a/templates/threejs/packages/contracts/remappings.txt b/templates/threejs/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/templates/threejs/packages/contracts/remappings.txt +++ b/templates/threejs/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/templates/vanilla/packages/contracts/package.json b/templates/vanilla/packages/contracts/package.json index b0a118d096..bdb84d6578 100644 --- a/templates/vanilla/packages/contracts/package.json +++ b/templates/vanilla/packages/contracts/package.json @@ -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", diff --git a/templates/vanilla/packages/contracts/remappings.txt b/templates/vanilla/packages/contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/templates/vanilla/packages/contracts/remappings.txt +++ b/templates/vanilla/packages/contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/test/mock-game-contracts/package.json b/test/mock-game-contracts/package.json index 7676f32001..97479f7e75 100644 --- a/test/mock-game-contracts/package.json +++ b/test/mock-game-contracts/package.json @@ -15,7 +15,6 @@ "@latticexyz/world": "workspace:*", "@latticexyz/world-modules": "workspace:*", "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" } } diff --git a/test/mock-game-contracts/remappings.txt b/test/mock-game-contracts/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/test/mock-game-contracts/remappings.txt +++ b/test/mock-game-contracts/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ diff --git a/test/puppet-modules/package.json b/test/puppet-modules/package.json index 84c7489f70..cc2788f763 100644 --- a/test/puppet-modules/package.json +++ b/test/puppet-modules/package.json @@ -16,7 +16,6 @@ "@latticexyz/world": "workspace:*", "@latticexyz/world-modules": "workspace:*", "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" } } diff --git a/test/puppet-modules/remappings.txt b/test/puppet-modules/remappings.txt index c4d992480e..e2614d0aa8 100644 --- a/test/puppet-modules/remappings.txt +++ b/test/puppet-modules/remappings.txt @@ -1,3 +1,2 @@ -ds-test/=node_modules/ds-test/src/ forge-std/=node_modules/forge-std/src/ @latticexyz/=node_modules/@latticexyz/ From 9bb8352207fa65d672af479132111d66c345b9c7 Mon Sep 17 00:00:00 2001 From: Vicente Dragicevic Date: Mon, 28 Oct 2024 18:56:02 -0300 Subject: [PATCH 2/5] Update e2e pnpm lock --- e2e/pnpm-lock.yaml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml index efc3d77c56..c454f26d9e 100644 --- a/e2e/pnpm-lock.yaml +++ b/e2e/pnpm-lock.yaml @@ -102,12 +102,9 @@ importers: dotenv: specifier: ^16.0.3 version: 16.0.3 - ds-test: - specifier: https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0 - version: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0 forge-std: - specifier: https://github.com/foundry-rs/forge-std.git#74cfb77e308dd188d2f58864aaf44963ae6b88b1 - version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1 + specifier: https://github.com/foundry-rs/forge-std.git#1eea5bae12ae557d589f9f0f0edae2faa47cb262 + version: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262 prettier: specifier: 3.2.5 version: 3.2.5 @@ -787,10 +784,6 @@ packages: sqlite3: optional: true - ds-test@https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0: - resolution: {tarball: https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0} - version: 1.0.0 - emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -832,9 +825,9 @@ packages: debug: optional: true - forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: - resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1} - version: 1.6.0 + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262: + resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262} + version: 1.9.4 fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -1705,8 +1698,6 @@ snapshots: optionalDependencies: postgres: 3.3.5 - ds-test@https://codeload.github.com/dapphub/ds-test/tar.gz/e282159d5170298eb2455a6c05280ab5a73a4ef0: {} - emoji-regex@8.0.0: {} entities@4.5.0: {} @@ -1784,7 +1775,7 @@ snapshots: follow-redirects@1.15.2: {} - forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/74cfb77e308dd188d2f58864aaf44963ae6b88b1: {} + forge-std@https://codeload.github.com/foundry-rs/forge-std/tar.gz/1eea5bae12ae557d589f9f0f0edae2faa47cb262: {} fs.realpath@1.0.0: {} From f764565836a992f605c35933ec8386836b00a942 Mon Sep 17 00:00:00 2001 From: Vicente Dragicevic Date: Tue, 29 Oct 2024 17:44:34 -0300 Subject: [PATCH 3/5] Update MoveSystem address in store test snapshot --- packages/store/ts/flattenStoreLogs.test.ts | 4 ++-- packages/store/ts/getStoreLogs.test.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/store/ts/flattenStoreLogs.test.ts b/packages/store/ts/flattenStoreLogs.test.ts index 05c0ca5c34..0e170e82f1 100644 --- a/packages/store/ts/flattenStoreLogs.test.ts +++ b/packages/store/ts/flattenStoreLogs.test.ts @@ -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)", diff --git a/packages/store/ts/getStoreLogs.test.ts b/packages/store/ts/getStoreLogs.test.ts index ccae995140..72ca524f90 100644 --- a/packages/store/ts/getStoreLogs.test.ts +++ b/packages/store/ts/getStoreLogs.test.ts @@ -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)", From 6566ec4d741a94bc0416132488268a93c62ddd4a Mon Sep 17 00:00:00 2001 From: V Date: Wed, 30 Oct 2024 21:59:12 +0900 Subject: [PATCH 4/5] Create tricky-pants-yawn.md --- .changeset/tricky-pants-yawn.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .changeset/tricky-pants-yawn.md diff --git a/.changeset/tricky-pants-yawn.md b/.changeset/tricky-pants-yawn.md new file mode 100644 index 0000000000..0e1cf97e25 --- /dev/null +++ b/.changeset/tricky-pants-yawn.md @@ -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 +--- + +Bumped forge-std version and removed ds-test dependency (not needed in current forge-std versions) From 07ab863eeed72dfdb149e143b58cbe6d20e1f78b Mon Sep 17 00:00:00 2001 From: V Date: Wed, 30 Oct 2024 22:36:01 +0900 Subject: [PATCH 5/5] Update .changeset/tricky-pants-yawn.md Co-authored-by: Kevin Ingersoll --- .changeset/tricky-pants-yawn.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.changeset/tricky-pants-yawn.md b/.changeset/tricky-pants-yawn.md index 0e1cf97e25..7f4b965a49 100644 --- a/.changeset/tricky-pants-yawn.md +++ b/.changeset/tricky-pants-yawn.md @@ -5,6 +5,9 @@ "@latticexyz/store": patch "@latticexyz/world-module-erc20": patch "@latticexyz/world-module-metadata": patch +"@latticexyz/world-modules": patch +"@latticexyz/world": patch +"create-mud": patch --- Bumped forge-std version and removed ds-test dependency (not needed in current forge-std versions)