chore: fix conflits with base contract

paycrest · Jun 10, 2024 · e268ea7 · e268ea7
2 parents 0337fd7 + 2633b1c
commit e268ea7
Show file tree

Hide file tree

Showing 64 changed files with 11,981 additions and 107,540 deletions.
diff --git a/.env.example b/.env.example
@@ -1,10 +1,17 @@
 DEPLOYER_PRIVATE_KEY=
-TREASURY_ADDRESS=
-AGGREGATOR_ADDRESS=
 
 ETHERSCAN_API_KEY=
 POLYGONSCAN_API_KEY=
-BSCSCAN_API_KEY=
 BASESCAN_API_KEY=
 ARBISCAN_API_KEY=
+BSCSCAN_API_KEY=
+
 SHIELD3_API_KEY=
+
+TREASURY_ADDRESS=
+AGGREGATOR_ADDRESS=
+
+TREASURY_ADDRESS_TRON=
+AGGREGATOR_ADDRESS_TRON=
+DEPLOYER_PRIVATE_KEY_TRON=
+TRON_PRO_API_KEY=
diff --git a/.openzeppelin/unknown-2494104990.json b/.openzeppelin/unknown-2494104990.json
@@ -1,25 +1,271 @@
 {
   "manifestVersion": "3.2",
   "admin": {
-    "address": "0x0358870a7d2246c928b5c47e5ba23b57e1231aa4",
-    "txHash": "6b050b259ba7376574c58d76ed65ed51ba6ec2660fd0f19489dec1e4f6de9730"
+    "address": "0x8abdd946a41568fac23b0fbe0df7e6b3c7116efa",
+    "txHash": "8243e0c85e31ae287e183aadd1a76442cb0eff6d5af2d646fb20a219eabcc845"
   },
   "proxies": [
     {
-      "address": "0x314376445d0bd77065674c50b34e5123ed69b7ec",
-      "txHash": "0adbca79a5179d2f27173c2923ed9954f96342f980c9ce32c9266a79da978ab4",
+      "address": "0x25437c4f1a46405ae7f99b2b698206cfe073468c",
+      "txHash": "2d1e459141850ffb5a21f080a106100e023a0709a6d1d10af17c58dd9f904138",
       "kind": "transparent"
     },
     {
-      "address": "0x24a404df0bbbabafa030cd4462e4d94de6f12a46",
-      "txHash": "c5a587daffe94c490e015e1fb893acebb58070ca54625e9bc33e3c55807b0cfc",
+      "address": "0x08d650f780cc9959165d719130bcf04873d35377",
+      "txHash": "bd889a0c9718592d1b315d3d0d2b850de8dfe9ce1a9db427ee75e8b4da5aaefb",
       "kind": "transparent"
     }
   ],
   "impls": {
+    "92fb4619b2fdd2ca3c13acfa4ea17047cbb0fdd7901bf8b568f50b28bf47dd6f": {
+      "address": "0x86af88ccb34ec32aa4e22ebbba8c989058550f3c",
+      "txHash": "cba8a396158db7e3304cf2a749ae22111e15e63c03997a8a3939b7024cab8f09",
+      "layout": {
+        "solcVersion": "0.8.18",
+        "storage": [
+          {
+            "contract": "Initializable",
+            "label": "_initialized",
+            "type": "t_uint8",
+            "src": "../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "contract": "Initializable",
+            "label": "_initializing",
+            "type": "t_bool",
+            "src": "../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "contract": "ContextUpgradeable",
+            "label": "__gap",
+            "type": "t_array(t_uint256)50_storage",
+            "src": "../@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40"
+          },
+          {
+            "contract": "OwnableUpgradeable",
+            "label": "_owner",
+            "type": "t_address",
+            "src": "../@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22"
+          },
+          {
+            "contract": "OwnableUpgradeable",
+            "label": "__gap",
+            "type": "t_array(t_uint256)49_storage",
+            "src": "../@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94"
+          },
+          {
+            "contract": "Ownable2StepUpgradeable",
+            "label": "_pendingOwner",
+            "type": "t_address",
+            "src": "../@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:21"
+          },
+          {
+            "contract": "Ownable2StepUpgradeable",
+            "label": "__gap",
+            "type": "t_array(t_uint256)49_storage",
+            "src": "../@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:70"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "MAX_BPS",
+            "type": "t_uint256",
+            "src": "GatewaySettingManager.sol:14"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "protocolFeePercent",
+            "type": "t_uint64",
+            "src": "GatewaySettingManager.sol:15"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "treasuryAddress",
+            "type": "t_address",
+            "src": "GatewaySettingManager.sol:16"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "_aggregatorAddress",
+            "type": "t_address",
+            "src": "GatewaySettingManager.sol:17"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "__gap",
+            "type": "t_array(t_uint256)50_storage",
+            "src": "GatewaySettingManager.sol:20"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "_isTokenSupported",
+            "type": "t_mapping(t_address,t_uint256)",
+            "src": "GatewaySettingManager.sol:22"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "supportedInstitutions",
+            "type": "t_mapping(t_bytes32,t_array(t_struct(Institution)1062_storage)dyn_storage)",
+            "src": "GatewaySettingManager.sol:24"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "supportedInstitutionsByCode",
+            "type": "t_mapping(t_bytes32,t_struct(InstitutionByCode)1067_storage)",
+            "src": "GatewaySettingManager.sol:25"
+          },
+          {
+            "contract": "PausableUpgradeable",
+            "label": "_paused",
+            "type": "t_bool",
+            "src": "../@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29"
+          },
+          {
+            "contract": "PausableUpgradeable",
+            "label": "__gap",
+            "type": "t_array(t_uint256)49_storage",
+            "src": "../@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116"
+          },
+          {
+            "contract": "Gateway",
+            "label": "order",
+            "type": "t_mapping(t_bytes32,t_struct(Order)964_storage)",
+            "src": "Gateway.sol:20"
+          },
+          {
+            "contract": "Gateway",
+            "label": "_nonce",
+            "type": "t_mapping(t_address,t_uint256)",
+            "src": "Gateway.sol:21"
+          },
+          {
+            "contract": "Gateway",
+            "label": "__gap",
+            "type": "t_array(t_uint256)50_storage",
+            "src": "Gateway.sol:22"
+          }
+        ],
+        "types": {
+          "t_mapping(t_bytes32,t_struct(Order)964_storage)": {
+            "label": "mapping(bytes32 => struct IGateway.Order)"
+          },
+          "t_bytes32": {
+            "label": "bytes32"
+          },
+          "t_struct(Order)964_storage": {
+            "label": "struct IGateway.Order",
+            "members": [
+              {
+                "label": "sender",
+                "type": "t_address"
+              },
+              {
+                "label": "token",
+                "type": "t_address"
+              },
+              {
+                "label": "senderFeeRecipient",
+                "type": "t_address"
+              },
+              {
+                "label": "senderFee",
+                "type": "t_uint256"
+              },
+              {
+                "label": "protocolFee",
+                "type": "t_uint256"
+              },
+              {
+                "label": "isFulfilled",
+                "type": "t_bool"
+              },
+              {
+                "label": "isRefunded",
+                "type": "t_bool"
+              },
+              {
+                "label": "refundAddress",
+                "type": "t_address"
+              },
+              {
+                "label": "currentBPS",
+                "type": "t_uint96"
+              },
+              {
+                "label": "amount",
+                "type": "t_uint256"
+              }
+            ]
+          },
+          "t_address": {
+            "label": "address"
+          },
+          "t_uint256": {
+            "label": "uint256"
+          },
+          "t_bool": {
+            "label": "bool"
+          },
+          "t_uint96": {
+            "label": "uint96"
+          },
+          "t_mapping(t_address,t_uint256)": {
+            "label": "mapping(address => uint256)"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]"
+          },
+          "t_uint64": {
+            "label": "uint64"
+          },
+          "t_mapping(t_bytes32,t_array(t_struct(Institution)1062_storage)dyn_storage)": {
+            "label": "mapping(bytes32 => struct SharedStructs.Institution[])"
+          },
+          "t_array(t_struct(Institution)1062_storage)dyn_storage": {
+            "label": "struct SharedStructs.Institution[]"
+          },
+          "t_struct(Institution)1062_storage": {
+            "label": "struct SharedStructs.Institution",
+            "members": [
+              {
+                "label": "code",
+                "type": "t_bytes32"
+              },
+              {
+                "label": "name",
+                "type": "t_bytes32"
+              }
+            ]
+          },
+          "t_mapping(t_bytes32,t_struct(InstitutionByCode)1067_storage)": {
+            "label": "mapping(bytes32 => struct SharedStructs.InstitutionByCode)"
+          },
+          "t_struct(InstitutionByCode)1067_storage": {
+            "label": "struct SharedStructs.InstitutionByCode",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32"
+              },
+              {
+                "label": "currency",
+                "type": "t_bytes32"
+              }
+            ]
+          },
+          "t_uint8": {
+            "label": "uint8"
+          }
+        },
+        "namespaces": {}
+      }
+    },
     "fc77a9dc465278e19b73fa6203ba5fa413ee940980324324d901c460897b7cc9": {
-      "address": "0x7835d8b0fdb1dc072d909dffa66918cba4374347",
-      "txHash": "f0d52a8740a989db7e910870c6a9d7ac6e861c8a7444493f0ff7f1c2509c5fcd",
+      "address": "0x1b038c55f8718961445c15f07ca350a4b09ddea6",
+      "txHash": "b17575450fc2327d9bf6d8728fcb8cb7c5f6e6062ec1bb86b07e2458e2bf113b",
       "layout": {
         "solcVersion": "0.8.18",
         "storage": [
@@ -105,13 +351,13 @@
           {
             "contract": "GatewaySettingManager",
             "label": "supportedInstitutions",
-            "type": "t_mapping(t_bytes32,t_array(t_struct(Institution)1078_storage)dyn_storage)",
+            "type": "t_mapping(t_bytes32,t_array(t_struct(Institution)1692_storage)dyn_storage)",
             "src": "GatewaySettingManager.sol:24"
           },
           {
             "contract": "GatewaySettingManager",
             "label": "supportedInstitutionsByCode",
-            "type": "t_mapping(t_bytes32,t_struct(InstitutionByCode)1083_storage)",
+            "type": "t_mapping(t_bytes32,t_struct(InstitutionByCode)1697_storage)",
             "src": "GatewaySettingManager.sol:25"
           },
           {
@@ -129,7 +375,7 @@
           {
             "contract": "Gateway",
             "label": "order",
-            "type": "t_mapping(t_bytes32,t_struct(Order)980_storage)",
+            "type": "t_mapping(t_bytes32,t_struct(Order)1594_storage)",
             "src": "Gateway.sol:20"
           },
           {
@@ -146,13 +392,13 @@
           }
         ],
         "types": {
-          "t_mapping(t_bytes32,t_struct(Order)980_storage)": {
+          "t_mapping(t_bytes32,t_struct(Order)1594_storage)": {
             "label": "mapping(bytes32 => struct IGateway.Order)"
           },
           "t_bytes32": {
             "label": "bytes32"
           },
-          "t_struct(Order)980_storage": {
+          "t_struct(Order)1594_storage": {
             "label": "struct IGateway.Order",
             "members": [
               {
@@ -221,13 +467,13 @@
           "t_uint64": {
             "label": "uint64"
           },
-          "t_mapping(t_bytes32,t_array(t_struct(Institution)1078_storage)dyn_storage)": {
+          "t_mapping(t_bytes32,t_array(t_struct(Institution)1692_storage)dyn_storage)": {
             "label": "mapping(bytes32 => struct SharedStructs.Institution[])"
           },
-          "t_array(t_struct(Institution)1078_storage)dyn_storage": {
+          "t_array(t_struct(Institution)1692_storage)dyn_storage": {
             "label": "struct SharedStructs.Institution[]"
           },
-          "t_struct(Institution)1078_storage": {
+          "t_struct(Institution)1692_storage": {
             "label": "struct SharedStructs.Institution",
             "members": [
               {
@@ -240,10 +486,10 @@
               }
             ]
           },
-          "t_mapping(t_bytes32,t_struct(InstitutionByCode)1083_storage)": {
+          "t_mapping(t_bytes32,t_struct(InstitutionByCode)1697_storage)": {
             "label": "mapping(bytes32 => struct SharedStructs.InstitutionByCode)"
           },
-          "t_struct(InstitutionByCode)1083_storage": {
+          "t_struct(InstitutionByCode)1697_storage": {
             "label": "struct SharedStructs.InstitutionByCode",
             "members": [
               {

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ npx hardhat run scripts/setSupportedInstitutions.ts --network <network>
 
 npx hardhat run scripts/setSupportedTokens.ts --network <network>
 
-npx hardhat run scripts/updateProtocolAddress.ts --network <network>
+npx hardhat run scripts/updateProtocolAddresses.ts --network <network>
 
 npx hardhat run scripts/updateProtocolFee.ts --network <network>
 ```

diff --git a/...contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json b/...contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json