Skip to content

Commit

Permalink
chore: update with main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
OnahProsperity committed Jun 26, 2024
2 parents e1eabbd + 18577e0 commit ce47435
Show file tree
Hide file tree
Showing 6 changed files with 361 additions and 20 deletions.
5 changes: 5 additions & 0 deletions .openzeppelin/optimism.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"address": "0x431b48b30485Bc9b153599b32b5DdC8e1003AfDD",
"txHash": "0xa769313f13851764f211323e0f55bf995ee73ddb12b71a1ff06a4285c42b6c7d",
"kind": "transparent"
},
{
"address": "0xD293fCd3dBc025603911853d893A4724CF9f70a0",
"txHash": "0xc8e05500dcbcfbe5930323d0ddde1411dc8f5125c767eebd92896d6e0a1df9bc",
"kind": "transparent"
}
],
"impls": {
Expand Down
283 changes: 283 additions & 0 deletions .openzeppelin/unknown-534352.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,283 @@
{
"manifestVersion": "3.2",
"admin": {
"address": "0x16c9C78Dbb224889E3e2ADef991C8c4438ea797B",
"txHash": "0x966238b7d78785d06be3ce4a0d5cec16124e226b327bdf714be62d66a66fa78e"
},
"proxies": [
{
"address": "0x663C5BfE7d44bA946C2dd4b2D1Cf9580319F9338",
"txHash": "0x1e1325adb76f01ce1cce80062612ac5eb3f2c0847ff3c1f014256709928a2a42",
"kind": "transparent"
}
],
"impls": {
"056b3403c14493917c8bfaa99095b137aa28f666f706bfc65f694ea338f7248d": {
"address": "0xD293fCd3dBc025603911853d893A4724CF9f70a0",
"txHash": "0x163686528336b0b6869c280935c2fca08e2c80daa13e51aa7bf55a0b020c5557",
"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:40"
},
{
"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": "_pendingOwner",
"offset": 0,
"slot": "101",
"type": "t_address",
"contract": "Ownable2StepUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:21"
},
{
"label": "__gap",
"offset": 0,
"slot": "102",
"type": "t_array(t_uint256)49_storage",
"contract": "Ownable2StepUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol:70"
},
{
"label": "MAX_BPS",
"offset": 0,
"slot": "151",
"type": "t_uint256",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:12"
},
{
"label": "protocolFeePercent",
"offset": 0,
"slot": "152",
"type": "t_uint64",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:13"
},
{
"label": "treasuryAddress",
"offset": 8,
"slot": "152",
"type": "t_address",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:14"
},
{
"label": "_aggregatorAddress",
"offset": 0,
"slot": "153",
"type": "t_address",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:15"
},
{
"label": "_isTokenSupported",
"offset": 0,
"slot": "154",
"type": "t_mapping(t_address,t_uint256)",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:16"
},
{
"label": "__gap",
"offset": 0,
"slot": "155",
"type": "t_array(t_uint256)50_storage",
"contract": "GatewaySettingManager",
"src": "contracts/GatewaySettingManager.sol:19"
},
{
"label": "_paused",
"offset": 0,
"slot": "205",
"type": "t_bool",
"contract": "PausableUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:29"
},
{
"label": "__gap",
"offset": 0,
"slot": "206",
"type": "t_array(t_uint256)49_storage",
"contract": "PausableUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol:116"
},
{
"label": "order",
"offset": 0,
"slot": "255",
"type": "t_mapping(t_bytes32,t_struct(Order)1830_storage)",
"contract": "Gateway",
"src": "contracts/Gateway.sol:19"
},
{
"label": "_nonce",
"offset": 0,
"slot": "256",
"type": "t_mapping(t_address,t_uint256)",
"contract": "Gateway",
"src": "contracts/Gateway.sol:20"
},
{
"label": "__gap",
"offset": 0,
"slot": "257",
"type": "t_array(t_uint256)50_storage",
"contract": "Gateway",
"src": "contracts/Gateway.sol:21"
}
],
"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_bytes32": {
"label": "bytes32",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_uint256)": {
"label": "mapping(address => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_bytes32,t_struct(Order)1830_storage)": {
"label": "mapping(bytes32 => struct IGateway.Order)",
"numberOfBytes": "32"
},
"t_struct(Order)1830_storage": {
"label": "struct IGateway.Order",
"members": [
{
"label": "sender",
"type": "t_address",
"offset": 0,
"slot": "0"
},
{
"label": "token",
"type": "t_address",
"offset": 0,
"slot": "1"
},
{
"label": "senderFeeRecipient",
"type": "t_address",
"offset": 0,
"slot": "2"
},
{
"label": "senderFee",
"type": "t_uint256",
"offset": 0,
"slot": "3"
},
{
"label": "protocolFee",
"type": "t_uint256",
"offset": 0,
"slot": "4"
},
{
"label": "isFulfilled",
"type": "t_bool",
"offset": 0,
"slot": "5"
},
{
"label": "isRefunded",
"type": "t_bool",
"offset": 1,
"slot": "5"
},
{
"label": "refundAddress",
"type": "t_address",
"offset": 2,
"slot": "5"
},
{
"label": "currentBPS",
"type": "t_uint96",
"offset": 0,
"slot": "6"
},
{
"label": "amount",
"type": "t_uint256",
"offset": 0,
"slot": "7"
}
],
"numberOfBytes": "256"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint64": {
"label": "uint64",
"numberOfBytes": "8"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
},
"t_uint96": {
"label": "uint96",
"numberOfBytes": "12"
}
},
"namespaces": {}
}
}
}
}
20 changes: 15 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,27 @@ npx hardhat run scripts/tron/updateProtocolFee.ts
<td>Gateway Implementation</td>
<td>0x87B321fc77A0fDD0ca1fEe7Ab791131157B9841A</td>
</tr>
<tr>
<td colspan="3"></td>
<tr>
<td rowspan="2">Optimism Ethereum</td>
<td>Gateway Proxy</td>
<td>0xD293fCd3dBc025603911853d893A4724CF9f70a0</td>
<td>Gateway Admin</td>
<td>0xb9B5280AB99E48a9662D4740B1e1398abdf87b6D</td>
</tr>
<tr>
<td rowspan="2">Tron</td>
<td>Gateway Implementation</td>
<td>0x7bA90e38327A4B82D8BF6B481C1b2Ed14228E91A</td>
</tr>
<tr>
<td rowspan="2">Scroll</td>
<td>Gateway Proxy</td>
<td>THyFP5ST9YyLZn6EzjKjFhZti6aKPgEXNU</td>
<td>0x663C5BfE7d44bA946C2dd4b2D1Cf9580319F9338</td>
<td>Gateway Admin</td>
<td>0x16c9C78Dbb224889E3e2ADef991C8c4438ea797B</td>
</tr>
<tr>
<td>Gateway Implementation</td>
<td>TDhBvHbnF8nN7YctokpdZAVPcmBx2Jrn2d</td>
<td>0xD293fCd3dBc025603911853d893A4724CF9f70a0</td>
</tr>
</tbody>
</table>
Expand Down
10 changes: 10 additions & 0 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ let {
BSCSCAN_API_KEY,
POLYGONSCAN_API_KEY,
OPTIMISM_API,
SCROLL_API,
} = process.env;

const testPrivateKey = "0000000000000000000000000000000000000000000000000000000000000001"
Expand Down Expand Up @@ -132,6 +133,7 @@ const config: HardhatUserConfig = {
mainnet: ETHERSCAN_API_KEY!,
sepolia: ETHERSCAN_API_KEY!,
optimisticEthereum: OPTIMISM_API!,
scroll: SCROLL_API!,
},
customChains: [
{
Expand All @@ -142,6 +144,14 @@ const config: HardhatUserConfig = {
browserURL: "https://basescan.org",
},
},
{
network: "scroll",
chainId: 534352,
urls: {
apiURL: "https://api.scrollscan.com/api",
browserURL: "https://scrollscan.com/",
},
},
{
network: "baseSepolia",
chainId: 84532,
Expand Down
Loading

0 comments on commit ce47435

Please sign in to comment.