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.

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

[WIP] Separate & Upgradable Randomness #27

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
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
Binary file added .DS_Store
Binary file not shown.
25 changes: 12 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
out/
cache/
node_modules/
bindings/
artifacts/
deployments
deploys
abi/
types/
broadcast/
.env
latticeEnv.sh
foundry.toml
**/out/
**/cache/
**/node_modules/
**/bindings/
**/artifacts/
**/deployments
**/deploys
**/abi/
**/types/
**/broadcast/
**/.env
**/latticeEnv.sh
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "src/test/murky"]
path = src/test/murky
path = packages/game/src/test/murky
url = https://github.com/dmfxyz/murky
5 changes: 3 additions & 2 deletions .solhintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
src/test
src/codegen
**/src/codegen
**/src/test
**/node_modules
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"solidity.formatter": "forge",
"solidity.enabledAsYouTypeCompilationErrorCheck": true
"solidity.enabledAsYouTypeCompilationErrorCheck": true,
"solidity.compileUsingRemoteVersion": "v0.8.24+commit.e11b9ed9"
}
Binary file added bun.lockb
Binary file not shown.
32 changes: 2 additions & 30 deletions foundry.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
[fmt]
sort_imports=true
bracket_spacing = true
int_types = "long"
line_length = 120
multiline_func_header = "all"
number_underscore = "thousands"
quote_style = "double"
tab_width = 4
wrap_comments = true


[profile.default]
solc_version = "0.8.24"
ffi = false
optimizer = true
optimizer_runs = 3000
verbosity = 1
src = "src"
test = "test"
out = "out"
allow_paths = ["./node_modules"]
extra_output_files = [
"abi",
"evm.bytecode"
]
fs_permissions = [{ access = "read", path = "./"}]

[fuzz]
runs = 1028

Expand All @@ -41,5 +13,5 @@
[profile.base-testnet]
eth_rpc_url = "https://goerli.base.org"

[profile.base-mainnet]
eth_rpc_url = "https://base-mainnet.blastapi.io/"
[profile.base]
eth_rpc_url = "https://base-mainnet.blastapi.io"
246 changes: 0 additions & 246 deletions mud/contractComponents.ts

This file was deleted.

56 changes: 11 additions & 45 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,12 @@
{
"name": "contracts",
"version": "0.0.0",
"private": true,
"license": "MIT",
"scripts": {
"clean-murky": "rm -rf src/test/murky/lib && rm -rf src/test/murky/differential_testing && rm -rf src/test/murky/src/test",
"build": "mud worldgen && mud tablegen && forge build",
"clean": "forge clean && rimraf src/codegen",
"deploy:local": "pnpm run build && mud deploy",
"deploy:testnet": "pnpm run build && mud deploy --profile=redstone-garnet",
"deploy:testnet-legacy": "pnpm run build && mud deploy --profile=redstone-holesky-legacy",
"deploy:base": "pnpm run build && mud deploy --profile=base-mainnet",
"dev": "pnpm mud dev-contracts",
"faucet": "DEBUG=mud:faucet pnpm faucet-server",
"lint": "forge fmt && pnpm run solhint",
"solhint": "solhint --config ./.solhint.json 'src/**/*.sol' --fix",
"test": "mud test"
},
"devDependencies": {
"@latticexyz/cli": "2.0.1",
"@latticexyz/config": "2.0.1",
"@latticexyz/faucet": "2.0.1",
"@latticexyz/store": "2.0.1",
"@latticexyz/schema-type": "2.0.1",
"@latticexyz/world": "2.0.1",
"@latticexyz/world-modules": "2.0.1",
"@openzeppelin/contracts": "^4.8.3",
"@solidstate/contracts": "^0.0.52",
"@types/node": "^18.15.11",
"ds-test": "https://github.com/dapphub/ds-test.git#c9ce3f25bde29fc5eb9901842bf02850dfd2d084",
"ethers": "^5.7.2",
"forge-std": "https://github.com/foundry-rs/forge-std.git#b4f121555729b3afb3c5ffccb62ff4b6e2818fd3",
"prettier": "^2.6.2",
"prettier-plugin-solidity": "^1.0.0-beta.19",
"rimraf": "^3.0.2",
"run-pty": "^4.0.3",
"solhint": "^3.4.1",
"solhint-config-mud": "2.0.1",
"solhint-plugin-mud": "2.0.1",
"solmate": "6.1.0",
"ts-node": "^10.9.1",
"typechain": "^8.1.1",
"typescript": "^5.0.4"
}
}
"name": "words3-contracts",
"workspaces": [
"packages/*"
],
"private": true,
"scripts": {
"lint": "cd packages/game && forge fmt && cd ../rng && forge fmt && cd ../.. && bun run solhint",
"solhint": "solhint --config ./.solhint.json '**/src/**/*.sol' --fix"
},
"engines": {}
}
Binary file added packages/.DS_Store
Binary file not shown.
Binary file added packages/game/.DS_Store
Binary file not shown.
Loading