Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zero transfer check during refund #55

Merged
merged 5 commits into from
Dec 9, 2024
Merged

Zero transfer check during refund #55

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9655145
fix: transfer refund fee to treasury if fee is greater than zero
OnahProsperity Sep 12, 2024
9d08879
chore: pull update from main branch
OnahProsperity Nov 20, 2024
61c671d
chore: implementation contract added to config
OnahProsperity Nov 20, 2024
d3fdec8
chore: deployment json file
OnahProsperity Nov 20, 2024
0b7fb54
chore: upgrade BSC, Arbitrum, Optimsm, and Scroll with support for ze…
OnahProsperity Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
270 changes: 270 additions & 0 deletions .openzeppelin/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,276 @@
},
"namespaces": {}
}
},
"8689ffc4c401435f48792097adca219ffd47d52aa60869b4623055b9563f9927": {
"address": "0xd2d97002Ec87ba57FCf3f6b510f20d5A80A6C33a",
"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)2466_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)2466_storage)": {
"label": "mapping(bytes32 => struct IGateway.Order)",
"numberOfBytes": "32"
},
"t_struct(Order)2466_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": {}
},
"allAddresses": [
"0xd2d97002Ec87ba57FCf3f6b510f20d5A80A6C33a",
"0xd28da2E11FCd2A9F44D5a4952430CE8b4f3Ee05f"
]
}
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ npx hardhat run scripts/tron/updateProtocolFee.ts
</tr>
<tr>
<td>Gateway Implementation</td>
<td>0xd2d97002ec87ba57fcf3f6b510f20d5a80a6c33a</td>
<td>0xd28da2E11FCd2A9F44D5a4952430CE8b4f3Ee05f</td>
</tr>
<tr>
<td colspan="3"></td>
Expand Down
2 changes: 1 addition & 1 deletion ...contracts-upgradeable/access/Ownable2StepUpgradeable.sol/Ownable2StepUpgradeable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion ...nzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol/OwnableUpgradeable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion .../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol/Initializable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion ...pelin/contracts-upgradeable/security/PausableUpgradeable.sol/PausableUpgradeable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion ...enzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol/AddressUpgradeable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion ...enzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol/ContextUpgradeable.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion artifacts/@openzeppelin/contracts/token/ERC20/ERC20.sol/ERC20.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion artifacts/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion ...@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol/IERC20Metadata.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion artifacts/@openzeppelin/contracts/utils/Context.sol/Context.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
1 change: 1 addition & 0 deletions artifacts/build-info/b8a88c4b130e7a569c3029307ef5f126.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion artifacts/build-info/f2f315820550fce3188425b80157c6c8.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion artifacts/build-info/fa700a78f436b6502082c7497f88c048.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion artifacts/contracts/Gateway.sol/Gateway.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/f2f315820550fce3188425b80157c6c8.json"
"buildInfo": "../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
4 changes: 2 additions & 2 deletions artifacts/contracts/Gateway.sol/Gateway.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion artifacts/contracts/GatewaySettingManager.sol/GatewaySettingManager.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion artifacts/contracts/interfaces/IGateway.sol/IGateway.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
2 changes: 1 addition & 1 deletion artifacts/contracts/mocks/MockUSDC.sol/MockUSDT.dbg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"_format": "hh-sol-dbg-1",
"buildInfo": "../../../build-info/fa700a78f436b6502082c7497f88c048.json"
"buildInfo": "../../../build-info/b8a88c4b130e7a569c3029307ef5f126.json"
}
4 changes: 2 additions & 2 deletions contracts/Gateway.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ contract Gateway is IGateway, GatewaySettingManager, PausableUpgradeable {
require(!order[_orderId].isRefunded, 'OrderRefunded');
require(order[_orderId].protocolFee >= _fee, 'FeeExceedsProtocolFee');

if (order[_orderId].protocolFee > 0) {
// transfer protocol fee
if (_fee > 0) {
// transfer refund fee to the treasury
IERC20(order[_orderId].token).transfer(treasuryAddress, _fee);
}

Expand Down
1 change: 1 addition & 0 deletions scripts/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const NETWORKS = {
* @dev Base
*/
8453: {
GATEWAY_IMPLEMENTATION: "0xd28da2E11FCd2A9F44D5a4952430CE8b4f3Ee05f",
RPC_URL: `https://rpc.shield3.com/v3/0x2105/${SHIELD3_API_KEY}/rpc`,
SUPPORTED_TOKENS: {
USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
Expand Down
2 changes: 1 addition & 1 deletion scripts/forceImport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ethers, upgrades } from "hardhat";
async function main() {
// Define the address of the existing implementation contract
const existingContractAddress: string =
"0x5E7eC39915F6CD48829d06648F6682765846602a";
"0xd28da2E11FCd2A9F44D5a4952430CE8b4f3Ee05f";

// Define the implementation contract factory
const deployedImplementation = await ethers.getContractFactory("Gateway");
Expand Down