Merge pull request #154 from nayms/dev

Next MAINNET upgrade

Author: amarinkovic

.gitignore

@@ -41,20 +41,8 @@ facetsdeployed.txt
 .DS_Store
 
 bin/
-.idea/.gitignore
-.idea/contracts-next.iml
-.idea/misc.xml
-.idea/modules.xml
-.idea/runConfigurations.xml
-.idea/vcs.xml
-.metals
-.supermaven
 
 broadcast/**/31337/*
-
-# subgraph artifact
-NaymsDiamond.json
-
 broadcast/**/dry-run
 
 # coverage report
@@ -64,5 +52,3 @@ cov-html
 # gemforge.deployments.json
 .gemforge/*.json
 
-# Generated files
-script/deployment/S03UpgradeDiamond.s.sol

.gitmodules

@@ -7,15 +7,6 @@
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate
-[submodule "lib/solidity-lib"]
-	path = lib/solidity-lib
-	url = https://github.com/uniswap/solidity-lib
-[submodule "lib/v3-periphery-foundry"]
-	path = lib/v3-periphery-foundry
-	url = https://github.com/gakonst/v3-periphery-foundry
-[submodule "lib/solidity-stringutils"]
-	path = lib/solidity-stringutils
-	url = https://github.com/arachnid/solidity-stringutils
 [submodule "lib/oz"]
 	path = lib/oz
 	url = https://github.com/openzeppelin/openzeppelin-contracts

.solhint.json

@@ -9,6 +9,7 @@
     "const-name-snakecase": "off",
     "reason-string": "off",
     "var-name-mixedcase": "off",
-    "func-name-mixedcase": "off"
+    "func-name-mixedcase": "off",
+    "immutable-vars-naming": "off"
   }
 }

Makefile

@@ -63,7 +63,7 @@ gasforksnap: ## gas snapshot mainnet fork
 	forge snapshot --snap .gas-snapshot \
 		-f ${ETH_MAINNET_RPC_URL} \
 		--fork-block-number 15078000
-
+		
 gasforkcheck: ## gas check mainnet fork
 	forge snapshot --check \
 		-f ${ETH_MAINNET_RPC_URL} \
@@ -82,9 +82,6 @@ cov: ## coverage report -vvv
 coverage: ## coverage report (lcov), filtered for CI
 	forge coverage --no-match-test testFork -vvv --report lcov --via-ir && node ./cli-tools/filter-lcov.js
 
-lcov: ## coverage report (lcov)
-	forge coverage --report lcov --via-ir
-
 gencov: ## generate html coverage report
 	forge coverage --report lcov && genhtml -o cov-html --branch-coverage lcov.info
 
@@ -139,9 +136,6 @@ anvil-docker:	## run anvil in a container
 		ghcr.io/nayms/contracts-builder:latest \
 		-c "cd nayms && make anvil"
 
-anvil-dbg:	## run anvil in debug mode with shared wallet
-	RUST_LOG=backend,api,node,rpc=warn anvil --host 0.0.0.0 --chain-id 31337 -m "${shell cat ./nayms_mnemonic.txt}" --state anvil.json
-
 fork-mainnet: ## fork mainnet locally with anvil
 	anvil -f ${ETH_MAINNET_RPC_URL} --accounts 20 -m "${shell cat ./nayms_mnemonic.txt}"
 
@@ -208,72 +202,9 @@ create-entity: ## create an entity on the Nayms platform (using some default val
 		-vv \
 		--broadcast
 
-update-entity: ## update
-	forge script UpdateEntity \
-		-f ${ETH_GOERLI_RPC_URL} \
-		--chain-id 5 \
-		--sender ${ownerAddress} \
-		--mnemonic-paths ./nayms_mnemonic.txt \
-		--mnemonic-indexes 19 \
-		-vvvv \
-		--broadcast
-
-update-commissions: ## update trading and premium commissions
-	forge script UpdateCommissions \
-		-s "tradingAndPremium(address)" ${naymsDiamondAddress} \
-		-f ${ETH_GOERLI_RPC_URL} \
-		--chain-id 5 \
-		--sender ${ownerAddress} \
-		--mnemonic-paths ./nayms_mnemonic.txt \
-		--mnemonic-indexes 19 \
-		-vv \
-		--broadcast
-
-docs: ## generate docs from natspec comments
-	yarn docgen
-
 slither:	## run slither static analysis
 	slither src/generated --config-file=slither.config.json --fail-none
 
-verify-dry-run:	## dry run verify script, prints out commands to be executed
-	node cli-tools/verify.js --dry-run
-
-verify:	## verify contracts on chain (goerli)
-	node cli-tools/verify.js
-
-coderecon: ## code recon
-	@forge script CodeRecon \
-		-s "run(string[] memory)" ${contractNames} \
-		-f ${ETH_MAINNET_RPC_URL} \
-		--chain-id 1 \
-		--etherscan-api-key ${ETHERSCAN_API_KEY} \
-		-vv \
-		; node cli-tools/parse-json.js
-
-compb: ## Compare bytecode
-	@forge script CheckBytecode \
-		-s "run(uint8)" ${checkBytecodeAction} \
-		-f ${ETH_MAINNET_RPC_URL} \
-		--chain-id 1 \
-		--etherscan-api-key ${ETHERSCAN_API_KEY} \
-		--sender ${senderAddress} \
-		--mnemonic-paths ./nayms_mnemonic.txt \
-		--mnemonic-indexes 19 \
-		-v \
-		--ffi
-
-checkf: ## Check if facet exists in a diamond
-	@forge script DiamondChecker \
-		-s "run(address, bytes4)" ${chkFacetAddress} ${selectorChk} \
-		-f ${ETH_SEPOLIA_RPC_URL} \
-		--chain-id 11155111 \
-		--etherscan-api-key ${ETHERSCAN_API_KEY} \
-		--sender ${ownerAddress} \
-		--mnemonic-paths ./nayms_mnemonic.txt \
-		--mnemonic-indexes 19 \
-		-vv \
-		--ffi
-	
 bn-mainnet: ## get block number for mainnet and replace FORK_BLOCK_1 in .env
 	@result=$$(cast bn -r mainnet) && \
 	sed -i '' "s/^export FORK_BLOCK_1=.*/export FORK_BLOCK_1=$$result/" .env

README.md

@@ -108,10 +108,7 @@ Following commands are provided for working with `anvil`, to make it more conven
 | Command | Description |
 | ----------- | ----------- |
 | `make anvil` | Run the local node seeding it with Nayms' shared wallet |
-| `make anvil-debug` | Run Anvil in debug mode to get verbose log output |
-| `make anvil-deploy` | Do a full deployment of Nayms' contracts to local node |
-| `make anvil-upgrade` | Upgrade deployment of Nayms' contracts on local node |
-| `make anvil-gtoken` | Deploy `GToken` to local node |
+| `make anvil-docker` | Rund the local node inside a container, also seeding it with Nayms' shared wallet |
 | `make anvil-add-supported-external-token` | Add `GToken` as supported external token |
 | `make fork-sepolia`| Fork `Sepolia` test net locally |
 | `make fork-base-sepolia`| Fork `Base Sepolia` test net locally |