Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"ethers": "^5.7.2",
"execa": "^6.1.0",
"figlet": "^1.5.2",
"forge-std": "https://github.com/foundry-rs/forge-std.git#f36dab24d63d1c1945a05ed375ce341d3c1a49ed",
"forge-std": "https://github.com/foundry-rs/forge-std.git#b4f121555729b3afb3c5ffccb62ff4b6e2818fd3",
"glob": "^8.0.3",
"inquirer": "^8.2.4",
"inquirer-prompt-suggest": "^0.1.0",
Expand Down
16 changes: 7 additions & 9 deletions packages/cli/src/contracts/BulkUpload.sol
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// SPDX-License-Identifier: MIT
pragma solidity >=0.8.0;

import "ds-test/test.sol";
import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
import {Cheats} from "./Cheats.sol";

import {BulkSetStateSystem, ID as BulkSetStateSystemID, ECSEvent} from "std-contracts/systems/BulkSetStateSystem.sol";
import {World} from "solecs/World.sol";
import {System} from "solecs/System.sol";
Expand Down Expand Up @@ -32,24 +32,22 @@ struct State {
* Usage:
* forge script --sig "run(string, address)" --rpc-url http://localhost:8545 src/contracts/BulkUpload.sol:BulkUpload path/to/ecs-map-test.json <WORLD_ADDRESS>
*/
contract BulkUpload is DSTest {
Cheats internal immutable vm = Cheats(HEVM_ADDRESS);

contract BulkUpload is Script {
function run(
string memory path,
address worldAddress,
uint256 eventsPerTx
) public {
vm.startBroadcast();
vmSafe.startBroadcast();

// Read JSON
console.log(path);
string memory json = vm.readFile(path);
string memory json = vmSafe.readFile(path);

console.log(worldAddress);

// Parse JSON
ParsedState memory parsedState = abi.decode(vm.parseJson(json), (ParsedState));
ParsedState memory parsedState = abi.decode(vmSafe.parseJson(json), (ParsedState));

// Convert component ids
uint256[] memory componentIds = new uint256[](parsedState.componentIds.length);
Expand Down Expand Up @@ -106,7 +104,7 @@ contract BulkUpload is DSTest {

bulkSetStateSystem.execute(abi.encode(componentIds, newOverflowEntities, newOverflowEvents));

vm.stopBroadcast();
vmSafe.stopBroadcast();
}
}

Expand Down
320 changes: 0 additions & 320 deletions packages/cli/src/contracts/Cheats.sol

This file was deleted.

Loading