Merge pull request #37 from paycrest/tron

chore: tron shasta upgrade to v2
paycrest · Jun 12, 2024 · eb26777 · eb26777
2 parents 8d3398d + ac624bd
commit eb26777
Show file tree

Hide file tree

Showing 58 changed files with 19,247 additions and 38,214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 node_modules
 .env
+.vscode
 coverage
 coverage.json
 typechain
@@ -11,3 +12,7 @@ publicKey.txt
 cache
 # artifacts
 
+# Tron Package
+src/js/metacoin-config.js
+
+
diff --git a/.openzeppelin/unknown-2494104990.json b/.openzeppelin/unknown-2494104990.json
@@ -14,6 +14,11 @@
       "address": "0x08d650f780cc9959165d719130bcf04873d35377",
       "txHash": "bd889a0c9718592d1b315d3d0d2b850de8dfe9ce1a9db427ee75e8b4da5aaefb",
       "kind": "transparent"
+    },
+    {
+      "address": "0xadcd442c3605d4beec551b9505c1f051bc638011",
+      "txHash": "2aa271ccbaaac8b05860378090c687d04aff139e68e9704a850a079d01504b8e",
+      "kind": "transparent"
     }
   ],
   "impls": {
@@ -508,6 +513,205 @@
         },
         "namespaces": {}
       }
+    },
+    "8e07f2115f4c1497ea960d739431d778511f0fa07a20cf26a97567bb7df1e232": {
+      "address": "0x3ed371e17efeace4a4c0cbae6d01a393a8b996a5",
+      "txHash": "95c8e4f91fef7a0e7dd43c30fdcf8b2ad3f02152ddd9e685e5f457fa526c6064",
+      "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:12"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "protocolFeePercent",
+            "type": "t_uint64",
+            "src": "GatewaySettingManager.sol:13"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "treasuryAddress",
+            "type": "t_address",
+            "src": "GatewaySettingManager.sol:14"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "_aggregatorAddress",
+            "type": "t_address",
+            "src": "GatewaySettingManager.sol:15"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "_isTokenSupported",
+            "type": "t_mapping(t_address,t_uint256)",
+            "src": "GatewaySettingManager.sol:16"
+          },
+          {
+            "contract": "GatewaySettingManager",
+            "label": "__gap",
+            "type": "t_array(t_uint256)50_storage",
+            "src": "GatewaySettingManager.sol:19"
+          },
+          {
+            "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)842_storage)",
+            "src": "Gateway.sol:19"
+          },
+          {
+            "contract": "Gateway",
+            "label": "_nonce",
+            "type": "t_mapping(t_address,t_uint256)",
+            "src": "Gateway.sol:20"
+          },
+          {
+            "contract": "Gateway",
+            "label": "__gap",
+            "type": "t_array(t_uint256)50_storage",
+            "src": "Gateway.sol:21"
+          }
+        ],
+        "types": {
+          "t_mapping(t_bytes32,t_struct(Order)842_storage)": {
+            "label": "mapping(bytes32 => struct IGateway.Order)"
+          },
+          "t_bytes32": {
+            "label": "bytes32"
+          },
+          "t_struct(Order)842_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_uint8": {
+            "label": "uint8"
+          }
+        },
+        "namespaces": {}
+      }
     }
   }
 }
diff --git a/README.md b/README.md
@@ -29,8 +29,6 @@ npx hardhat run scripts/upgrade.ts --network <network>
 Update network settings, currencies, and supported institutions in `scripts/config.ts`
 
 ```bash
-npx hardhat run scripts/setSupportedInstitutions.ts --network <network>
-
 npx hardhat run scripts/setSupportedTokens.ts --network <network>
 
 npx hardhat run scripts/updateProtocolAddresses.ts --network <network>

diff --git a/...contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json b/...contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/...nzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol/OwnableUpgradeable.dbg.json b/...nzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol/OwnableUpgradeable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/.../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol/Initializable.dbg.json b/.../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol/Initializable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/...pelin/contracts-upgradeable/security/PausableUpgradeable.sol/PausableUpgradeable.dbg.json b/...pelin/contracts-upgradeable/security/PausableUpgradeable.sol/PausableUpgradeable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/...enzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol/AddressUpgradeable.dbg.json b/...enzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol/AddressUpgradeable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/...enzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol/ContextUpgradeable.dbg.json b/...enzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol/ContextUpgradeable.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json b/artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json b/artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/...@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json b/...@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json b/artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/be92c7424fbba6d94f9f797b1fbd8e03.json"
+  "buildInfo": "../../../../build-info/d775da09ef809423b637832990bde81f.json"
 }
diff --git a/artifacts/build-info/0dbe503a07cb4d0e0edd2b1d16930510.json b/artifacts/build-info/0dbe503a07cb4d0e0edd2b1d16930510.json
diff --git a/artifacts/build-info/be92c7424fbba6d94f9f797b1fbd8e03.json b/artifacts/build-info/be92c7424fbba6d94f9f797b1fbd8e03.json
diff --git a/artifacts/build-info/eb9240473b2cb7463d0c0c1e49e041e7.json b/artifacts/build-info/eb9240473b2cb7463d0c0c1e49e041e7.json
diff --git a/artifacts/contracts/Gateway.sol/Gateway.dbg.json b/artifacts/contracts/Gateway.sol/Gateway.dbg.json
@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../build-info/eb9240473b2cb7463d0c0c1e49e041e7.json"
+  "buildInfo": "../../build-info/0dbe503a07cb4d0e0edd2b1d16930510.json"
 }