Update storage slots checks

JoinColony · May 30, 2024 · a78f8c2 · a78f8c2
1 parent 869dcbd
commit a78f8c2
Show file tree

Hide file tree

Showing 65 changed files with 938 additions and 981 deletions.
diff --git a/...rage-layouts-normalized/contracts/extensions/StreamingPayments.sol:StreamingPayments.json b/...rage-layouts-normalized/contracts/extensions/StreamingPayments.sol:StreamingPayments.json
@@ -511,64 +511,42 @@
                 "label": "uint256",
                 "numberOfBytes": "32"
               }
+            },
+            {
+              "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
+              "label": "token",
+              "offset": 0,
+              "slot": "5",
+              "type": {
+                "encoding": "inplace",
+                "label": "address",
+                "numberOfBytes": "20"
+              }
+            },
+            {
+              "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
+              "label": "amount",
+              "offset": 0,
+              "slot": "6",
+              "type": {
+                "encoding": "inplace",
+                "label": "uint256",
+                "numberOfBytes": "32"
+              }
+            },
+            {
+              "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
+              "label": "pseudoAmountClaimedFromStart",
+              "offset": 0,
+              "slot": "7",
+              "type": {
+                "encoding": "inplace",
+                "label": "uint256",
+                "numberOfBytes": "32"
+              }
             }
           ],
-          "numberOfBytes": "160"
-        }
-      }
-    },
-    {
-      "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
-      "label": "paymentTokens",
-      "offset": 0,
-      "slot": "39",
-      "type": {
-        "encoding": "mapping",
-        "key": {
-          "encoding": "inplace",
-          "label": "uint256",
-          "numberOfBytes": "32"
-        },
-        "label": "mapping(uint256 => mapping(address => struct StreamingPayments.PaymentToken))",
-        "numberOfBytes": "32",
-        "value": {
-          "encoding": "mapping",
-          "key": {
-            "encoding": "inplace",
-            "label": "address",
-            "numberOfBytes": "20"
-          },
-          "label": "mapping(address => struct StreamingPayments.PaymentToken)",
-          "numberOfBytes": "32",
-          "value": {
-            "encoding": "inplace",
-            "label": "struct StreamingPayments.PaymentToken",
-            "members": [
-              {
-                "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
-                "label": "amount",
-                "offset": 0,
-                "slot": "0",
-                "type": {
-                  "encoding": "inplace",
-                  "label": "uint256",
-                  "numberOfBytes": "32"
-                }
-              },
-              {
-                "contract": "contracts/extensions/StreamingPayments.sol:StreamingPayments",
-                "label": "pseudoAmountClaimedFromStart",
-                "offset": 0,
-                "slot": "1",
-                "type": {
-                  "encoding": "inplace",
-                  "label": "uint256",
-                  "numberOfBytes": "32"
-                }
-              }
-            ],
-            "numberOfBytes": "64"
-          }
+          "numberOfBytes": "256"
         }
       }
     }

diff --git a/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json b/.storage-layouts/contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/bridging/WormholeBridgeForColony.sol:WormholeBridgeForColony",
       "label": "owner",
       "offset": 0,
@@ -30,7 +30,7 @@
       "label": "wormhole",
       "offset": 0,
       "slot": "3",
-      "type": "t_contract(IWormhole)54429"
+      "type": "t_contract(IWormhole)54240"
     },
     {
       "astId": 2588,
@@ -55,12 +55,12 @@
       "label": "address",
       "numberOfBytes": "20"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"
     },
-    "t_contract(IWormhole)54429": {
+    "t_contract(IWormhole)54240": {
       "encoding": "inplace",
       "label": "contract IWormhole",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/Colony.sol:Colony.json b/.storage-layouts/contracts/colony/Colony.sol:Colony.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/Colony.sol:Colony",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/Colony.sol:Colony",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/...e-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json b/...e-layouts/contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyArbitraryTransaction.sol:ColonyArbitraryTransaction",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json b/.storage-layouts/contracts/colony/ColonyAuthority.sol:ColonyAuthority.json
@@ -1,47 +1,47 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "owner",
       "offset": 0,
       "slot": "1",
       "type": "t_address"
     },
     {
-      "astId": 51037,
+      "astId": 50848,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "_root_users",
       "offset": 0,
       "slot": "2",
       "type": "t_mapping(t_address,t_bool)"
     },
     {
-      "astId": 51041,
+      "astId": 50852,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "_user_roles",
       "offset": 0,
       "slot": "3",
       "type": "t_mapping(t_address,t_bytes32)"
     },
     {
-      "astId": 51047,
+      "astId": 50858,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "_capability_roles",
       "offset": 0,
       "slot": "4",
       "type": "t_mapping(t_address,t_mapping(t_bytes4,t_bytes32))"
     },
     {
-      "astId": 51053,
+      "astId": 50864,
       "contract": "contracts/colony/ColonyAuthority.sol:ColonyAuthority",
       "label": "_public_capabilities",
       "offset": 0,
@@ -86,7 +86,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json b/.storage-layouts/contracts/colony/ColonyDomains.sol:ColonyDomains.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyDomains.sol:ColonyDomains",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json b/.storage-layouts/contracts/colony/ColonyExpenditure.sol:ColonyExpenditure.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyExpenditure.sol:ColonyExpenditure",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json b/.storage-layouts/contracts/colony/ColonyFunding.sol:ColonyFunding.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyFunding.sol:ColonyFunding",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"

diff --git a/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json b/.storage-layouts/contracts/colony/ColonyRewards.sol:ColonyRewards.json
@@ -1,15 +1,15 @@
 {
   "storage": [
     {
-      "astId": 50553,
+      "astId": 50364,
       "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards",
       "label": "authority",
       "offset": 0,
       "slot": "0",
-      "type": "t_contract(DSAuthority)50539"
+      "type": "t_contract(DSAuthority)50350"
     },
     {
-      "astId": 50555,
+      "astId": 50366,
       "contract": "contracts/colony/ColonyRewards.sol:ColonyRewards",
       "label": "owner",
       "offset": 0,
@@ -359,7 +359,7 @@
       "label": "bytes4",
       "numberOfBytes": "4"
     },
-    "t_contract(DSAuthority)50539": {
+    "t_contract(DSAuthority)50350": {
       "encoding": "inplace",
       "label": "contract DSAuthority",
       "numberOfBytes": "20"