Merge pull request #15 from Synaps3Protocol/recursive/remmapping

Recursive/remmapping
Synaps3Protocol · Nov 21, 2024 · 0f5dfbd · 0f5dfbd
2 parents b564bc6 + 7027805
commit 0f5dfbd
Show file tree

Hide file tree

Showing 64 changed files with 7,134 additions and 1,627 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
         "Reentrancy",
         "solhint",
         "synaps",
+        "uids",
         "UUPS"
     ]
 }
diff --git a/broadcast/01_Deploy_Base_Create3.s.sol/80002/run-1732122281.json b/broadcast/01_Deploy_Base_Create3.s.sol/80002/run-1732122281.json
@@ -0,0 +1,69 @@
+{
+  "transactions": [
+    {
+      "hash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
+      "transactionType": "CREATE2",
+      "contractName": "CREATE3Factory",
+      "contractAddress": "0x04f66f9d6ac01de95faf3c29d7397d73c83ef8b6",
+      "function": null,
+      "arguments": null,
+      "transaction": {
+        "from": "0xefbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
+        "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
+        "gas": "0x3fe04",
+        "value": "0x0",
+        "input": "0x3bc658bd8e0ebd184972b389ee653c995631c8e3aa8e3a2c139587fdd80376c060808060405234601557610273908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c908163cdcb760a146100d4575063df20e25214610032575f80fd5b346100d05760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d057604051305f5260ff600b536004356020527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f6040526055600b2060145260405261d6945f52600160345360206017601e2073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b5f80fd5b346100d05760407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d05760243567ffffffffffffffff81116100d057366023820112156100d057806004013567ffffffffffffffff8111610210577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f8401160116830183811067ffffffffffffffff82111761021057604052808352602083019136602483830101116100d057815f926024602093018537840101526f67363d3d37363d34f03d5260086018f35f526004356010805ff590811561020357815f9291839260145261d69483526001603453826017601e209551925af1813b02156102035760209073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b63301164255f526004601cfd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffdfea2646970667358221220fef1b2a8228e26231d5b76e8ede4531be23f9717395e9e3ebf4fa68a134bcfc764736f6c634300081a0033",
+        "nonce": "0x634",
+        "chainId": "0x13882"
+      },
+      "additionalContracts": [],
+      "isFixedGasLimit": false
+    }
+  ],
+  "receipts": [
+    {
+      "status": "0x1",
+      "cumulativeGasUsed": "0xb70bf",
+      "logs": [
+        {
+          "address": "0x0000000000000000000000000000000000001010",
+          "topics": [
+            "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+            "0x0000000000000000000000000000000000000000000000000000000000001010",
+            "0x000000000000000000000000efbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
+            "0x000000000000000000000000033aaded92ebfec6c818624f28a8e4b3c571ab6f"
+          ],
+          "data": "0x000000000000000000000000000000000000000000000000001af1d08d348cc00000000000000000000000000000000000000000000000001c34c784487c66720000000000000000000000000000000000000000000000c00caa80f16d45504d0000000000000000000000000000000000000000000000001c19d5b3bb47d9b20000000000000000000000000000000000000000000000c00cc572c1fa79dd0d",
+          "blockHash": "0xa89fcb515f3257999e5051a53b68da33cfed242e54d67834adff22a636b2ff8c",
+          "blockNumber": "0xdfc042",
+          "transactionHash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
+          "transactionIndex": "0x2",
+          "logIndex": "0xa",
+          "removed": false
+        }
+      ],
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000008000000000000000000000000000800000000000000000000100000000000000080000000000000000000000000000000000000000000080000000000000000800010000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000400000000000000000000000004000000000000000000001000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000100000",
+      "type": "0x2",
+      "transactionHash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
+      "transactionIndex": "0x2",
+      "blockHash": "0xa89fcb515f3257999e5051a53b68da33cfed242e54d67834adff22a636b2ff8c",
+      "blockNumber": "0xdfc042",
+      "gasUsed": "0x2e3ed",
+      "effectiveGasPrice": "0x95282a7cf",
+      "from": "0xefbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
+      "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
+      "contractAddress": "0x04f66f9d6ac01de95faf3c29d7397d73c83ef8b6"
+    }
+  ],
+  "libraries": [],
+  "pending": [],
+  "returns": {
+    "factory": {
+      "internal_type": "address",
+      "value": "0x04F66F9d6aC01dE95fAf3c29D7397D73C83eF8b6"
+    }
+  },
+  "timestamp": 1732122281,
+  "chain": 80002,
+  "commit": "acf7e0f"
+}
diff --git a/broadcast/01_Deploy_Base_Create3.s.sol/80002/run-latest.json b/broadcast/01_Deploy_Base_Create3.s.sol/80002/run-latest.json
@@ -1,19 +1,19 @@
 {
   "transactions": [
     {
-      "hash": "0xf6a54d79233cf6b5f80aead5fa1d50d6f426585e54e33ecefbb00226b8ce26f6",
+      "hash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
       "transactionType": "CREATE2",
       "contractName": "CREATE3Factory",
-      "contractAddress": "0x79e0ad0cdc478096f28eef7f0f96f3b65c861e9d",
+      "contractAddress": "0x04f66f9d6ac01de95faf3c29d7397d73c83ef8b6",
       "function": null,
       "arguments": null,
       "transaction": {
         "from": "0xefbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
         "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
         "gas": "0x3fe04",
         "value": "0x0",
-        "input": "0x3bc658bd8e0ebd184972b389ee653c995631c8e3aa8e3a2c139587fdd80376c060808060405234601557610273908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c908163cdcb760a146100d4575063df20e25214610032575f80fd5b346100d05760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d057604051305f5260ff600b536004356020527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f6040526055600b2060145260405261d6945f52600160345360206017601e2073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b5f80fd5b346100d05760407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d05760243567ffffffffffffffff81116100d057366023820112156100d057806004013567ffffffffffffffff8111610210577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f8401160116830183811067ffffffffffffffff82111761021057604052808352602083019136602483830101116100d057815f926024602093018537840101526f67363d3d37363d34f03d5260086018f35f526004356010805ff590811561020357815f9291839260145261d69483526001603453826017601e209551925af1813b02156102035760209073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b63301164255f526004601cfd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffdfea2646970667358221220f267b07b1d5fa30a587692b0e517195cd7ac68b52e69a8d6ea6c2840d64231df64736f6c634300081a0033",
-        "nonce": "0x5df",
+        "input": "0x3bc658bd8e0ebd184972b389ee653c995631c8e3aa8e3a2c139587fdd80376c060808060405234601557610273908161001a8239f35b5f80fdfe6080806040526004361015610012575f80fd5b5f3560e01c908163cdcb760a146100d4575063df20e25214610032575f80fd5b346100d05760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d057604051305f5260ff600b536004356020527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f6040526055600b2060145260405261d6945f52600160345360206017601e2073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b5f80fd5b346100d05760407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126100d05760243567ffffffffffffffff81116100d057366023820112156100d057806004013567ffffffffffffffff8111610210577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f81601f8401160116830183811067ffffffffffffffff82111761021057604052808352602083019136602483830101116100d057815f926024602093018537840101526f67363d3d37363d34f03d5260086018f35f526004356010805ff590811561020357815f9291839260145261d69483526001603453826017601e209551925af1813b02156102035760209073ffffffffffffffffffffffffffffffffffffffff60405191168152f35b63301164255f526004601cfd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffdfea2646970667358221220fef1b2a8228e26231d5b76e8ede4531be23f9717395e9e3ebf4fa68a134bcfc764736f6c634300081a0033",
+        "nonce": "0x634",
         "chainId": "0x13882"
       },
       "additionalContracts": [],
@@ -23,47 +23,47 @@
   "receipts": [
     {
       "status": "0x1",
-      "cumulativeGasUsed": "0x2e3ed",
+      "cumulativeGasUsed": "0xb70bf",
       "logs": [
         {
           "address": "0x0000000000000000000000000000000000001010",
           "topics": [
             "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
             "0x0000000000000000000000000000000000000000000000000000000000001010",
             "0x000000000000000000000000efbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
-            "0x0000000000000000000000006dc2dd54f24979ec26212794c71afefed722280c"
+            "0x000000000000000000000000033aaded92ebfec6c818624f28a8e4b3c571ab6f"
           ],
-          "data": "0x000000000000000000000000000000000000000000000000003730e411e5915c0000000000000000000000000000000000000000000000001f7dfe5544e78593000000000000000000000000000000000000000000000407c607ec77b42004e40000000000000000000000000000000000000000000000001f46cd713301f437000000000000000000000000000000000000000000000407c63f1d5bc6059640",
-          "blockHash": "0xcb7d73ecda74bb1ada22927a5ee4caeba7ec7eb6c37146ab9e5bfa9dbef06403",
-          "blockNumber": "0xdcaceb",
-          "transactionHash": "0xf6a54d79233cf6b5f80aead5fa1d50d6f426585e54e33ecefbb00226b8ce26f6",
-          "transactionIndex": "0x0",
-          "logIndex": "0x0",
+          "data": "0x000000000000000000000000000000000000000000000000001af1d08d348cc00000000000000000000000000000000000000000000000001c34c784487c66720000000000000000000000000000000000000000000000c00caa80f16d45504d0000000000000000000000000000000000000000000000001c19d5b3bb47d9b20000000000000000000000000000000000000000000000c00cc572c1fa79dd0d",
+          "blockHash": "0xa89fcb515f3257999e5051a53b68da33cfed242e54d67834adff22a636b2ff8c",
+          "blockNumber": "0xdfc042",
+          "transactionHash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
+          "transactionIndex": "0x2",
+          "logIndex": "0xa",
           "removed": false
         }
       ],
-      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000008000000000000000000000000000800000000000000000000100080000000000000000000000000000000000000000000000000000000080000000000000020800000000000000000000000040000000000000000000000000000000000000200000000000000000000000000000000000400000000000000000000000004000000000000000000001000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000100000",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000008000000000000000000000000000800000000000000000000100000000000000080000000000000000000000000000000000000000000080000000000000000800010000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000400000000000000000000000004000000000000000000001000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000000000000100000",
       "type": "0x2",
-      "transactionHash": "0xf6a54d79233cf6b5f80aead5fa1d50d6f426585e54e33ecefbb00226b8ce26f6",
-      "transactionIndex": "0x0",
-      "blockHash": "0xcb7d73ecda74bb1ada22927a5ee4caeba7ec7eb6c37146ab9e5bfa9dbef06403",
-      "blockNumber": "0xdcaceb",
+      "transactionHash": "0xaff56bd604f2cd9cc524610eadc4cea33f84cf2a036a2bf9c4d017e36629cb54",
+      "transactionIndex": "0x2",
+      "blockHash": "0xa89fcb515f3257999e5051a53b68da33cfed242e54d67834adff22a636b2ff8c",
+      "blockNumber": "0xdfc042",
       "gasUsed": "0x2e3ed",
-      "effectiveGasPrice": "0x131852a35b",
+      "effectiveGasPrice": "0x95282a7cf",
       "from": "0xefbbd14082cf2fbcf5badc7ee619f0f4e36d0a5b",
       "to": "0x4e59b44847b379578588920ca78fbf26c0b4956c",
-      "contractAddress": "0x79e0ad0cdc478096f28eef7f0f96f3b65c861e9d"
+      "contractAddress": "0x04f66f9d6ac01de95faf3c29d7397d73c83ef8b6"
     }
   ],
   "libraries": [],
   "pending": [],
   "returns": {
     "factory": {
       "internal_type": "address",
-      "value": "0x79E0aD0cDc478096f28EeF7F0f96F3B65C861e9D"
+      "value": "0x04F66F9d6aC01dE95fAf3c29D7397D73C83eF8b6"
     }
   },
-  "timestamp": 1731685964,
+  "timestamp": 1732122281,
   "chain": 80002,
-  "commit": "5d3485c"
+  "commit": "acf7e0f"
 }