PWNDAO · ashhanai · Jul 18, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,6 +15,7 @@ jobs:
       CRONOS_URL: ${{ secrets.CRONOS_URL }}
       MANTLE_URL: ${{ secrets.MANTLE_URL }}
       BSC_URL: ${{ secrets.BSC_URL }}
+      LINEA_URL: ${{ secrets.LINEA_URL }}
       SEPOLIA_URL: ${{ secrets.SEPOLIA_URL }}
       GOERLI_URL: ${{ secrets.GOERLI_URL }}
       BASE_GOERLI_URL: ${{ secrets.BASE_GOERLI_URL }}

diff --git a/README.md b/README.md
diff --git a/deployments/latest.json b/deployments/latest.json
@@ -0,0 +1,176 @@
+{
+    "deployedChains": [1, 10, 25, 56, 137, 8453, 42161, 59144, 11155111],
+    "chains": {
+        "1": {
+            "dao": "0x1B8383D2726E7e18189205337424a2631A2102F4",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0xd56635c0E91D31F88B89F195D3993a9e34516e59",
+            "deployerSafe": "0x42Cad20c964067f8e8b5c3E13fd0aa3C20a964C4",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "10": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0x282D9663815b1F9929a3C84a9a1290BE882E125f",
+            "deployerSafe": "0x1B4B37738De3bb9E6a7a4f99aFe4C145734c071d",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "25": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0x282D9663815b1F9929a3C84a9a1290BE882E125f",
+            "deployerSafe": "0x1B4B37738De3bb9E6a7a4f99aFe4C145734c071d",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "56": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0xd56635c0E91D31F88B89F195D3993a9e34516e59",
+            "deployerSafe": "0x42Cad20c964067f8e8b5c3E13fd0aa3C20a964C4",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "137": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0xd56635c0E91D31F88B89F195D3993a9e34516e59",
+            "deployerSafe": "0x42Cad20c964067f8e8b5c3E13fd0aa3C20a964C4",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "8453": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0x282D9663815b1F9929a3C84a9a1290BE882E125f",
+            "deployerSafe": "0x1B4B37738De3bb9E6a7a4f99aFe4C145734c071d",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "42161": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0xd56635c0E91D31F88B89F195D3993a9e34516e59",
+            "deployerSafe": "0x42Cad20c964067f8e8b5c3E13fd0aa3C20a964C4",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "59144": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0x282D9663815b1F9929a3C84a9a1290BE882E125f",
+            "deployerSafe": "0x1B4B37738De3bb9E6a7a4f99aFe4C145734c071d",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        },
+        "11155111": {
+            "dao": "0x0000000000000000000000000000000000000000",
+            "adminTimelock": "0xd57e72A328AB1deC6b374c2babe2dc489819B5Ea",
+            "protocolTimelock": "0xd8dbdDf1c0FDdf9b5eCFA5C067C38DB66739FBAB",
+            "daoSafe": "0x282D9663815b1F9929a3C84a9a1290BE882E125f",
+            "deployerSafe": "0x1B4B37738De3bb9E6a7a4f99aFe4C145734c071d",
+            "deployer": "0x706c9F2dd328E2C01483eCF705D2D9708F4aB727",
+            "categoryRegistry": "0xbB2168d5546A94AE2DA9254e63D88F7f137B2534",
+            "configSingleton": "0x1f5febF0efA3aD487508b6Cc7f39a0a54DE9De72",
+            "config": "0xd52a2898d61636bB3eEF0d145f05352FF543bdCC",
+            "hub": "0x37807A2F031b3B44081F4b21500E5D70EbaDAdd5",
+            "loanToken": "0x4440C069272cC34b80C7B11bEE657D0349Ba9C23",
+            "revokedNonce": "0x972204fF33348ee6889B2d0A3967dB67d7b08e4c",
+            "simpleLoan": "0x9A93AE395F09C6F350E3306aec592763c517072e",
+            "simpleLoanSimpleProposal": "0xEb3e6B9B51911175F3a121b5Efb46Fa354520f41",
+            "simpleLoanListProposal": "0x0E6cE603d328de0D357D624F10f3f448855fFBDC",
+            "simpleLoanFungibleProposal": "0x0618504Fa17888ec36AC5D46A4A0Ed59436Fb77E",
+            "simpleLoanDutchAuctionProposal": "0x807eb2A61B2d0193b0696436BeFFcFE4d6D520CB"
+        }
+    }
+}
diff --git a/deployments.json → deployments/v1.1.json b/deployments.json → deployments/v1.1.json
@@ -262,4 +262,4 @@
             "simpleLoanSimpleRequest": "0x9Cb87eC6448299aBc326F32d60E191Ef32Ab225D"
         }
     }
-}
+}
diff --git a/foundry.toml b/foundry.toml
@@ -1,6 +1,7 @@
 [profile.default]
 solc_version = '0.8.16'
-fs_permissions = [{ access = "read", path = "./deployments.json"}]
+fs_permissions = [{ access = "read", path = "./deployments/latest.json"}]
+gas_reports = ["PWNSimpleLoan"]
 
 
 [rpc_endpoints]
@@ -13,6 +14,7 @@ base = "${BASE_URL}"
 cronos = "${CRONOS_URL}"
 mantle = "${MANTLE_URL}"
 bsc = "${BSC_URL}"
+linea = "${LINEA_URL}"
 
 # Testnets
 sepolia = "${SEPOLIA_URL}"
@@ -21,4 +23,5 @@ base_goerli = "${BASE_GOERLI_URL}"
 cronos_testnet = "${CRONOS_TESTNET_URL}"
 mantle_testnet = "${MANTLE_TESTNET_URL}"
 
+tenderly = "${TENDERLY_URL}"
 local = "${LOCAL_URL}"
diff --git a/lib/MultiToken b/lib/MultiToken
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -1,9 +1 @@
-@MT/=lib/MultiToken/src/
-@openzeppelin/=lib/openzeppelin-contracts/contracts/
-@pwn-test/=test/
-@pwn/=src/
-
-MultiToken/=lib/MultiToken/src/
-ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-openzeppelin-contracts/=lib/openzeppelin-contracts/
+pwn/=src/
-Original file line number
+Diff line change
@@ Expand Up / @@ -262,4 +262,4 @@ @@
                 "simpleLoanSimpleRequest": "0x9Cb87eC6448299aBc326F32d60E191Ef32Ab225D"
             }
         }
-    }
+    }
+1 −0		.gitattributes
+48 −6		.github/workflows/ci.yml
+29 −0		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+2 −2		package.json
+635 −0		scripts/vm.py
+7 −3		src/Base.sol
+4 −3		src/Script.sol
+191 −24		src/StdAssertions.sol
+106 −47		src/StdChains.sol
+287 −35		src/StdCheats.sol
+107 −0		src/StdInvariant.sol
+18 −14		src/StdJson.sol
+55 −4		src/StdStorage.sol
+333 −0		src/StdStyle.sol
+142 −39		src/StdUtils.sol
+7 −2		src/Test.sol
+1,004 −275		src/Vm.sol
+394 −382		src/console2.sol
+73 −0		src/interfaces/IMulticall3.sol
+216 −0		src/mocks/MockERC20.sol
+221 −0		src/mocks/MockERC721.sol
+13,248 −0		src/safeconsole.sol
+474 −46		test/StdAssertions.t.sol
+147 −54		test/StdChains.t.sol
+334 −29		test/StdCheats.t.sol
+13 −11		test/StdError.t.sol
+27 −12		test/StdMath.t.sol
+66 −34		test/StdStorage.t.sol
+110 −0		test/StdStyle.t.sol
+185 −34		test/StdUtils.t.sol
+15 −0		test/Vm.t.sol
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol