Merge pull request #417 from superform-xyz/cantina-remediations

feat: merge cantina remediations
superform-xyz · Dec 27, 2023 · ba1e671 · ba1e671
2 parents 29aa051 + 749f6f9
commit ba1e671
Show file tree

Hide file tree

Showing 156 changed files with 6,697 additions and 2,765 deletions.
diff --git a/.env.example b/.env.example
@@ -2,7 +2,6 @@ REPORT_GAS=false
 PRODUCTION=false
 POLYGON_RPC_URL=
 AVALANCHE_RPC_URL=
-FANTOM_RPC_URL=
 BSC_RPC_URL=
 ARBITRUM_RPC_URL=
 OPTIMISM_RPC_URL=
@@ -15,12 +14,13 @@ BSC_LOCAL_URL=http://127.0.0.1:8546
 AVALANCHE_LOCAL_URL=http://127.0.0.1:8547
 ARBITRUM_LOCAL_URL=http://127.0.0.1:8549
 OPTIMISM_LOCAL_URL=http://127.0.0.1:8550
-FANTOM_LOCAL_URL=http://127.0.0.1:8551
 BASE_LOCAL_URL=http://127.0.0.1:8552
 GNOSIS_LOCAL_URL=http://127.0.0.1:8553
 OWNER_ADDRESS=
-MULTI_SIG_ADDRESS=
 DEPLOYER_KEY=
 FOUNDRY_EXPORTS_OVERWRITE_LATEST=true
 RUST_BACKTRACE=full
-FOUNDRY_PROFILE=localdev
+FOUNDRY_PROFILE=localdev
+TENDERLY_PROJECT_SLUG=
+TENDERLY_ACCOUNT_ID=
+TENDERLY_ACCESS_KEY=
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -18,13 +18,17 @@ env:
   POLYGON_RPC_URL: ${{ secrets.POLYGON_RPC_URL }}
   AVALANCHE_RPC_URL: ${{ secrets.AVALANCHE_RPC_URL }}
   FANTOM_RPC_URL: ${{ secrets.FANTOM_RPC_URL }}
+  TENDERLY_ACCESS_KEY: ${{ secrets.TENDERLY_ACCESS_KEY }}
+  TENDERLY_PROJECT_SLUG: 'superform-v1-d5' # your project slug
+  TENDERLY_ACCOUNT_ID: 'superform' # your username or organization name
+  FOUNDRY_EXPORTS_OVERWRITE_LATEST: 'true'
 
 jobs:
   build:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -59,7 +63,7 @@ jobs:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -85,15 +89,14 @@ jobs:
 
       - name: "Add test summary"
         run: |
-          echo "## Fork tests result" >> $GITHUB_STEP_SUMMARY
+          echo "## Tests result" >> $GITHUB_STEP_SUMMARY
           echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
                   
   coverage:
-    needs: ["build"]
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -114,3 +117,22 @@ jobs:
         run: |
           echo "## Coverage result" >> $GITHUB_STEP_SUMMARY
           echo "✅ Uploaded to Codecov" >> $GITHUB_STEP_SUMMARY
+
+  deploy-tenderly-devnets:
+    runs-on: SuperformCore2
+    steps:
+      - name: "Check out the repo"
+        uses: "actions/checkout@v4"
+        with:
+          submodules: "recursive"
+      - name: "Install Foundry"
+        uses: "foundry-rs/foundry-toolchain@v1"
+      - name: 'Install Tenderly CLI'
+        run: curl https://raw.githubusercontent.com/Tenderly/tenderly-cli/master/scripts/install-linux.sh | sudo sh
+      - name: 'Deploy to Tenderly Devnets'
+        run: ./utils/run_script_tenderly.sh
+        shell: bash
+      - name: "Add devnet deployment summary"
+        run: |
+          echo "## Devnet deployment result" >> $GITHUB_STEP_SUMMARY
+          echo "✅ Deployed to Tenderly Devnet" >> $GITHUB_STEP_SUMMARY
diff --git a/README.md b/README.md
@@ -178,6 +178,6 @@ $ forge test
 
 ## Audits
 
-- [Gerard Pearson](https://twitter.com/gpersoon): [2023-09-superform.pdf](https://github.com/superform-xyz/superform-core/files/13300598/2023-09-superform.pdf)
+- [Gerard Persoon](https://twitter.com/gpersoon): [2023-09-superform.pdf](https://github.com/superform-xyz/superform-core/files/13300598/2023-09-superform.pdf)
 
 - [Hans Friese](https://twitter.com/hansfriese): [Superform_Core_Review_Final_Hans_20230921.pdf](https://github.com/superform-xyz/superform-core/files/13300591/Superform_Core_Review_Final_Hans_20230921.pdf)
diff --git a/foundry.toml b/foundry.toml
@@ -43,7 +43,6 @@ bsc = "${BSC_RPC_URL}"
 avalanche = "${AVALANCHE_RPC_URL}"
 arbitrum = "${ARBITRUM_RPC_URL}"
 optimism = "${OPTIMISM_RPC_URL}"
-fantom = "${FANTOM_RPC_URL}"
 base = "${BASE_RPC_URL}"
 gnosis = "${GNOSIS_RPC_URL}"
 ethereum_fork = "${ETHEREUM_LOCAL_URL}"
@@ -52,7 +51,6 @@ bsc_fork = "${BSC_LOCAL_URL}"
 avalanche_fork = "${AVALANCHE_LOCAL_URL}"
 arbitrum_fork = "${ARBITRUM_LOCAL_URL}"
 optimism_fork = "${OPTIMISM_LOCAL_URL}"
-fantom_fork = "${FANTOM_LOCAL_URL}"
 base_fork = "${BASE_LOCAL_URL}"
 gnosis_fork = "${GNOSIS_LOCAL_URL}"
 

diff --git a/lib/ERC1155A b/lib/ERC1155A
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
+359 −340		src/ERC1155A.sol
+34 −15		src/aERC20.sol
+119 −92		src/interfaces/IERC1155A.sol
+8 −3		src/interfaces/IaERC20.sol
+89 −2		src/test/ERC1155.t.sol
+51 −16		src/test/ERC1155_A.t.sol
+10 −2		src/test/mocks/MockERC1155A.sol