Merge pull request #420 from superform-xyz/main

chore: bring develop branch upto date with main
superform-xyz · Jan 3, 2024 · a144c9f · a144c9f
2 parents a160aae + ba1e671
commit a144c9f
Show file tree

Hide file tree

Showing 151 changed files with 6,580 additions and 2,740 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,11 +14,9 @@ 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

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -63,7 +63,7 @@ jobs:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -96,7 +96,7 @@ jobs:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
 
@@ -122,7 +122,7 @@ jobs:
     runs-on: SuperformCore2
     steps:
       - name: "Check out the repo"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
         with:
           submodules: "recursive"
       - name: "Install Foundry"

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