Merge branch 'main' into yash/update-deploy-script

thirdweb-dev · Oct 19, 2023 · ea9b912 · ea9b912
2 parents 4d6a393 + 005d6d7
commit ea9b912
Show file tree

Hide file tree

Showing 25 changed files with 4,271 additions and 1 deletion.
diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml
@@ -39,6 +39,7 @@ jobs:
         id: slither
         with:
           sarif: results.sarif
+          slither-args: --foundry-out-directory artifacts_forge
 
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v2

diff --git a/foundry.toml b/foundry.toml
@@ -2,7 +2,7 @@
 solc-version = "0.8.12"
 #auto_detect_solc = false
 cache = true
-evm_version = 'shanghai'
+evm_version = 'london'
 force = false
 gas_reports = [
   "DropERC721Benchmark",
@@ -21,6 +21,7 @@ gas_reports = [
   "TokenStakeBenchmark",
   "PackBenchmark",
   "PackVRFDirectBenchmark",
+  "AccountBenchmark",
 ]
 libraries = []
 libs = ['lib']
@@ -37,6 +38,7 @@ remappings = [
   'erc721a-upgradeable/=lib/ERC721A-Upgradeable/',
   'erc721a/=lib/ERC721A/',
   '@thirdweb-dev/dynamic-contracts/=lib/dynamic-contracts/',
+  'lib/sstore2=lib/dynamic-contracts/lib/sstore2/'
 ]
 src = 'contracts'
 test = 'src/test'