feat: remove validator, update test, and deploy to mumbai and base te…

…stnet
paycrest · Nov 7, 2023 · 58f8586 · 58f8586
1 parent 55e70d7
commit 58f8586
Show file tree

Hide file tree

Showing 25 changed files with 158 additions and 1,648 deletions.
diff --git a/.openzeppelin/polygon-mumbai.json b/.openzeppelin/polygon-mumbai.json
diff --git a/.openzeppelin/unknown-84531.json b/.openzeppelin/unknown-84531.json
@@ -1,25 +1,20 @@
 {
   "manifestVersion": "3.2",
   "admin": {
-    "address": "0x92368Ad043cCe95b02F4F3beA9765Aa9caF3E070",
-    "txHash": "0xe6bee607fefad61671ca4c77d3d903d9092a132f0c493822dbac7db3f0e3171b"
+    "address": "0xEeeE313F91926C19Fdb9FD748762311046f87dd7",
+    "txHash": "0x53c2f74eb54fac908667c5559bc5acf851e3a9cbb15e42e38b39b66e34ddf5d8"
   },
   "proxies": [
     {
-      "address": "0x566dEA5BB1888C33bD3F1274168E0Fa91b9d51C8",
-      "txHash": "0xcf79399bdc6d70247a32f9dd1dc2c489fe4d8b6403d3cf3a907f1db2aed7bee3",
-      "kind": "transparent"
-    },
-    {
-      "address": "0x5151739085Ad69b21b374A03A7c4AE6450A43B52",
-      "txHash": "0x1773683aa82cc21acd71b4f4e2ae261ec961b819383f78d8d64d04f09444b32a",
+      "address": "0xd7BD20A48430F6207d87D75E037820F63C174b96",
+      "txHash": "0xf0feecfba71b4f0d36f15d6eb48220dab15edc4ead1664e7b4a706eb7c9fef91",
       "kind": "transparent"
     }
   ],
   "impls": {
-    "8a47b1c9a4810df657ffeaa2dfddc691801b84230ce7251030e694afd0b68a3a": {
-      "address": "0xd39074fe0B5A571b7F09F42C736a88b01298d70D",
-      "txHash": "0xf3ff85c83044f1718348182548419fd5ad6335b736c04adb69b7a30785959a07",
+    "951609168512da20c94b0b8689859956b09d89540f2220f5cdb31f5d102ee872": {
+      "address": "0xf415a842677BEc3734c1c0c3F828d2Af8CeaFf13",
+      "txHash": "0xe66a612f80fb04256116df4cc1b7ce429b8de27326b93c99e6f4495ddc923a75",
       "layout": {
         "solcVersion": "0.8.18",
         "storage": [
@@ -76,113 +71,105 @@
             "label": "protocolFeePercent",
             "offset": 0,
             "slot": "102",
-            "type": "t_uint128",
+            "type": "t_uint64",
             "contract": "PaycrestSettingManager",
             "src": "contracts/PaycrestSettingManager.sol:15"
           },
           {
-            "label": "validatorFeePercent",
-            "offset": 16,
+            "label": "feeRecipient",
+            "offset": 8,
             "slot": "102",
-            "type": "t_uint128",
+            "type": "t_address",
             "contract": "PaycrestSettingManager",
             "src": "contracts/PaycrestSettingManager.sol:16"
           },
           {
-            "label": "feeRecipient",
+            "label": "_aggregatorAddress",
             "offset": 0,
             "slot": "103",
             "type": "t_address",
             "contract": "PaycrestSettingManager",
             "src": "contracts/PaycrestSettingManager.sol:17"
           },
-          {
-            "label": "_aggregatorAddress",
-            "offset": 0,
-            "slot": "104",
-            "type": "t_address",
-            "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:18"
-          },
           {
             "label": "_aggregator",
             "offset": 0,
-            "slot": "105",
+            "slot": "104",
             "type": "t_bytes_storage",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:19"
+            "src": "contracts/PaycrestSettingManager.sol:18"
           },
           {
             "label": "__gap",
             "offset": 0,
-            "slot": "106",
+            "slot": "105",
             "type": "t_array(t_uint256)50_storage",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:22"
+            "src": "contracts/PaycrestSettingManager.sol:21"
           },
           {
             "label": "_isTokenSupported",
             "offset": 0,
-            "slot": "156",
+            "slot": "155",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:24"
+            "src": "contracts/PaycrestSettingManager.sol:23"
           },
           {
             "label": "_isWhitelisted",
             "offset": 0,
-            "slot": "157",
+            "slot": "156",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:25"
+            "src": "contracts/PaycrestSettingManager.sol:24"
           },
           {
             "label": "supportedInstitutions",
             "offset": 0,
-            "slot": "158",
-            "type": "t_mapping(t_bytes32,t_array(t_struct(Institution)3612_storage)dyn_storage)",
+            "slot": "157",
+            "type": "t_mapping(t_bytes32,t_array(t_struct(Institution)3526_storage)dyn_storage)",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:27"
+            "src": "contracts/PaycrestSettingManager.sol:26"
           },
           {
             "label": "supportedInstitutionsByCode",
             "offset": 0,
-            "slot": "159",
-            "type": "t_mapping(t_bytes32,t_struct(InstitutionByCode)3617_storage)",
+            "slot": "158",
+            "type": "t_mapping(t_bytes32,t_struct(InstitutionByCode)3531_storage)",
             "contract": "PaycrestSettingManager",
-            "src": "contracts/PaycrestSettingManager.sol:28"
+            "src": "contracts/PaycrestSettingManager.sol:27"
           },
           {
             "label": "order",
             "offset": 0,
-            "slot": "160",
-            "type": "t_mapping(t_bytes32,t_struct(Order)3938_storage)",
+            "slot": "159",
+            "type": "t_mapping(t_bytes32,t_struct(Order)3841_storage)",
             "contract": "Paycrest",
-            "src": "contracts/Paycrest.sol:15"
+            "src": "contracts/Paycrest.sol:14"
           },
           {
             "label": "_nonce",
             "offset": 0,
-            "slot": "161",
+            "slot": "160",
             "type": "t_mapping(t_address,t_uint256)",
             "contract": "Paycrest",
-            "src": "contracts/Paycrest.sol:16"
+            "src": "contracts/Paycrest.sol:15"
           },
           {
             "label": "__gap",
             "offset": 0,
-            "slot": "162",
+            "slot": "161",
             "type": "t_array(t_uint256)50_storage",
             "contract": "Paycrest",
-            "src": "contracts/Paycrest.sol:17"
+            "src": "contracts/Paycrest.sol:16"
           }
         ],
         "types": {
           "t_address": {
             "label": "address",
             "numberOfBytes": "20"
           },
-          "t_array(t_struct(Institution)3612_storage)dyn_storage": {
+          "t_array(t_struct(Institution)3526_storage)dyn_storage": {
             "label": "struct PaycrestSettingManager.Institution[]",
             "numberOfBytes": "32"
           },
@@ -214,19 +201,19 @@
             "label": "mapping(address => uint256)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_array(t_struct(Institution)3612_storage)dyn_storage)": {
+          "t_mapping(t_bytes32,t_array(t_struct(Institution)3526_storage)dyn_storage)": {
             "label": "mapping(bytes32 => struct PaycrestSettingManager.Institution[])",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(InstitutionByCode)3617_storage)": {
+          "t_mapping(t_bytes32,t_struct(InstitutionByCode)3531_storage)": {
             "label": "mapping(bytes32 => struct PaycrestSettingManager.InstitutionByCode)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(Order)3938_storage)": {
+          "t_mapping(t_bytes32,t_struct(Order)3841_storage)": {
             "label": "mapping(bytes32 => struct IPaycrest.Order)",
             "numberOfBytes": "32"
           },
-          "t_struct(Institution)3612_storage": {
+          "t_struct(Institution)3526_storage": {
             "label": "struct PaycrestSettingManager.Institution",
             "members": [
               {
@@ -244,7 +231,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(InstitutionByCode)3617_storage": {
+          "t_struct(InstitutionByCode)3531_storage": {
             "label": "struct PaycrestSettingManager.InstitutionByCode",
             "members": [
               {
@@ -262,7 +249,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(Order)3938_storage": {
+          "t_struct(Order)3841_storage": {
             "label": "struct IPaycrest.Order",
             "members": [
               {
@@ -322,14 +309,14 @@
             ],
             "numberOfBytes": "224"
           },
-          "t_uint128": {
-            "label": "uint128",
-            "numberOfBytes": "16"
-          },
           "t_uint256": {
             "label": "uint256",
             "numberOfBytes": "32"
           },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
           "t_uint8": {
             "label": "uint8",
             "numberOfBytes": "1"
@@ -340,146 +327,6 @@
           }
         }
       }
-    },
-    "24a5650cd12a3752212397740793a1612121247a69399118c59ab53164f2f942": {
-      "address": "0x58a6F98E3E2a048c07B7a250a14133D51545F53F",
-      "txHash": "0x16137a5c8a6c9aa881c03258fe90d15b07e4a7b7c06bb8f56e2c0c34ed4b2dfc",
-      "layout": {
-        "solcVersion": "0.8.18",
-        "storage": [
-          {
-            "label": "_initialized",
-            "offset": 0,
-            "slot": "0",
-            "type": "t_uint8",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
-            "retypedFrom": "bool"
-          },
-          {
-            "label": "_initializing",
-            "offset": 1,
-            "slot": "0",
-            "type": "t_bool",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "1",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ContextUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
-          },
-          {
-            "label": "_owner",
-            "offset": 0,
-            "slot": "51",
-            "type": "t_address",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "52",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "OwnableUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
-          },
-          {
-            "label": "_status",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_uint256",
-            "contract": "ReentrancyGuardUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "102",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "ReentrancyGuardUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88"
-          },
-          {
-            "label": "Paycrest",
-            "offset": 0,
-            "slot": "151",
-            "type": "t_address",
-            "contract": "PaycrestValidator",
-            "src": "contracts/PaycrestValidator.sol:11"
-          },
-          {
-            "label": "initialization",
-            "offset": 20,
-            "slot": "151",
-            "type": "t_bool",
-            "contract": "PaycrestValidator",
-            "src": "contracts/PaycrestValidator.sol:12"
-          },
-          {
-            "label": "minimumAmount",
-            "offset": 0,
-            "slot": "152",
-            "type": "t_mapping(t_address,t_uint256)",
-            "contract": "PaycrestValidator",
-            "src": "contracts/PaycrestValidator.sol:13"
-          },
-          {
-            "label": "_balance",
-            "offset": 0,
-            "slot": "153",
-            "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))",
-            "contract": "PaycrestValidator",
-            "src": "contracts/PaycrestValidator.sol:14"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "154",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "PaycrestValidator",
-            "src": "contracts/PaycrestValidator.sol:15"
-          }
-        ],
-        "types": {
-          "t_address": {
-            "label": "address",
-            "numberOfBytes": "20"
-          },
-          "t_array(t_uint256)49_storage": {
-            "label": "uint256[49]",
-            "numberOfBytes": "1568"
-          },
-          "t_array(t_uint256)50_storage": {
-            "label": "uint256[50]",
-            "numberOfBytes": "1600"
-          },
-          "t_bool": {
-            "label": "bool",
-            "numberOfBytes": "1"
-          },
-          "t_mapping(t_address,t_mapping(t_address,t_uint256))": {
-            "label": "mapping(address => mapping(address => uint256))",
-            "numberOfBytes": "32"
-          },
-          "t_mapping(t_address,t_uint256)": {
-            "label": "mapping(address => uint256)",
-            "numberOfBytes": "32"
-          },
-          "t_uint256": {
-            "label": "uint256",
-            "numberOfBytes": "32"
-          },
-          "t_uint8": {
-            "label": "uint8",
-            "numberOfBytes": "1"
-          }
-        }
-      }
     }
   }
 }
diff --git a/artifacts/build-info/5175d152885cc005596ba10118454f6e.json b/artifacts/build-info/5175d152885cc005596ba10118454f6e.json
diff --git a/artifacts/build-info/ad4e1f20b6468568d873cd5ca3fdd61b.json b/artifacts/build-info/ad4e1f20b6468568d873cd5ca3fdd61b.json
diff --git a/artifacts/build-info/c1e7e423d2b99f08521b07865d24a278.json b/artifacts/build-info/c1e7e423d2b99f08521b07865d24a278.json
diff --git a/artifacts/build-info/ca9c3aad2893934d15dc9e3926dda80c.json b/artifacts/build-info/ca9c3aad2893934d15dc9e3926dda80c.json
diff --git a/artifacts/build-info/db0d458556d1546ee8cdf3464fede1b0.json b/artifacts/build-info/db0d458556d1546ee8cdf3464fede1b0.json
diff --git a/artifacts/contracts/Paycrest.sol/Paycrest.dbg.json b/artifacts/contracts/Paycrest.sol/Paycrest.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/5175d152885cc005596ba10118454f6e.json"
+  "buildInfo": "../../build-info/c1e7e423d2b99f08521b07865d24a278.json"
 }