Skip to content

Jung/two step to instant #94

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

Open
wants to merge 6 commits into
base: arbitrum
Choose a base branch
from
Open

Jung/two step to instant #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2eafc6
feat: Add role for pausable and pause/unpause functions
Frenchkebab Mar 25, 2025
0c1d7b1
test: add tests for Credit contract
Frenchkebab Mar 25, 2025
2a4121c
move pause/unpause below
Frenchkebab Mar 26, 2025
f5f24f0
add comments
Frenchkebab Mar 26, 2025
b8e73b0
test: fix failing test
Frenchkebab Mar 26, 2025
c38ff81
Upgrade: Upgrade MarketV1 in Arb Sepolia
Frenchkebab Mar 26, 2025
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
2 changes: 1 addition & 1 deletion addresses/421614.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"credit": "0x1343d88885eE888CEe79FEb3DfD0C5fC8fd65Af1"
},
"implementation": {
"marketV1": "0x573B6a07d1Eb414B9CED0707DEca19b07798D105",
"marketV1": "0xC1162a62E48Dc8bb215Bd445D724c8f4EeF59586",
"credit": "0x587A50Fd13161503384A2a431b838868Db0b3b39"
}
}
8 changes: 4 additions & 4 deletions contracts/enclaves/MarketV1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ contract MarketV1 is
event CreditTokenUpdated(address indexed oldCreditToken, address indexed newCreditToken);
event NoticePeriodUpdated(uint256 noticePeriod);

event JobOpened(bytes32 indexed jobId, string metadata, address indexed owner, address indexed provider);
event JobOpened(bytes32 indexed jobId, string metadata, address indexed owner, address indexed provider, uint256 timestamp);
event JobSettled(bytes32 indexed jobId, uint256 lastSettled);
event JobClosed(bytes32 indexed jobId);
event JobClosed(bytes32 indexed jobId, uint256 timestamp);
event JobDeposited(bytes32 indexed jobId, address indexed token, address indexed from, uint256 amount);
event JobWithdrawn(bytes32 indexed jobId, address indexed token, address indexed to, uint256 amount);
event JobSettlementWithdrawn(
Expand Down Expand Up @@ -275,7 +275,7 @@ contract MarketV1 is

// create job with initial balance 0
jobs[jobId] = Job(_metadata, _owner, _provider, 0, 0, block.timestamp);
emit JobOpened(jobId, _metadata, _owner, _provider);
emit JobOpened(jobId, _metadata, _owner, _provider, block.timestamp);

// deposit initial balance
_deposit(jobId, _msgSender(), _balance);
Expand Down Expand Up @@ -311,7 +311,7 @@ contract MarketV1 is
}

delete jobs[_jobId];
emit JobClosed(_jobId);
emit JobClosed(_jobId, block.timestamp);
}

function _jobDeposit(bytes32 _jobId, uint256 _amount) internal {
Expand Down
62 changes: 54 additions & 8 deletions contracts/token/Credit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";


/**
* @title Credit
* @notice To transfer Credit tokens, either the sender or the recipient must have `TRANSFER_ALLOWED_ROLE`.
* @dev Admin must track the balance of USDC in the contract compared to the total supply of Credit.
*/

contract Credit is
ContextUpgradeable, // _msgSender, _msgData
AccessControlEnumerableUpgradeable, // RBAC enumeration
Expand All @@ -29,19 +35,18 @@ contract Credit is

uint256[500] private __gap0;

error OnlyAdmin();
error OnlyTransferAllowedRole();
error NoAdminExists();
error OnlyOysterMarket();
error NotEnoughUSDC();
error OnlyAdmin();
error OnlyToEmergencyWithdrawRole();
error OnlyTransferAllowedRole();

bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE"); // 0x9f2df0fed2c77648de5860a4cc508cd0818c85b8b8a1ab4ceeef8d981c8956a6
bytes32 public constant BURNER_ROLE = keccak256("BURNER_ROLE"); // 0x3c11d16cbaffd01df69ce1c404f6340ee057498f5f00246190ea54220576a848
bytes32 public constant TRANSFER_ALLOWED_ROLE = keccak256("TRANSFER_ALLOWED_ROLE"); // 0xed89ee80d998965e2804dad373576bf7ffc490ba5986d52deb7d526e93617101
bytes32 public constant REDEEMER_ROLE = keccak256("REDEEMER_ROLE"); // 0x44ac9762eec3a11893fefb11d028bb3102560094137c3ed4518712475b2577cc
bytes32 public constant EMERGENCY_WITHDRAW_ROLE = keccak256("EMERGENCY_WITHDRAW_ROLE"); // 0x66f144ecd65ad16d38ecdba8687842af4bc05fde66fe3d999569a3006349785f

bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE"); // 0x65d7a28e3265b37a6474929f336521b332c1681b933f6cb9f3376673440d862a

modifier onlyAdmin() {
require(hasRole(DEFAULT_ADMIN_ROLE, _msgSender()), OnlyAdmin());
_;
Expand Down Expand Up @@ -75,7 +80,7 @@ contract Credit is
//-------------------------------- Overrides end --------------------------------//

/// @custom:oz-upgrades-unsafe-allow state-variable-immutable
address immutable USDC;
address public immutable USDC;

uint256[500] private __gap1;

Expand All @@ -92,18 +97,31 @@ contract Credit is
__AccessControlEnumerable_init_unchained();
__ERC20_init_unchained("Oyster Credit", "CREDIT");
__UUPSUpgradeable_init_unchained();

__Pausable_init_unchained();

_grantRole(DEFAULT_ADMIN_ROLE, _admin);
}

//-------------------------------- Initializer end --------------------------------/

//-------------------------------- Token Mint/Burn start --------------------------------/

/**
* @notice Mint Credit tokens.
* @dev Caller must have `MINTER_ROLE`.
* @param _to Address to mint tokens to. Must have `TRANSFER_ALLOWED_ROLE`.
* @param _amount Amount of tokens to mint.
*/
function mint(address _to, uint256 _amount) external whenNotPaused onlyRole(MINTER_ROLE) {
_mint(_to, _amount);
}

/**
* @notice Burn Credit tokens.
* @dev Caller must have `BURNER_ROLE`.
* @param _from Address to burn tokens from. Must have `TRANSFER_ALLOWED_ROLE`
* @param _amount Amount of tokens to burn.
*/
function burn(address _from, uint256 _amount) external whenNotPaused onlyRole(BURNER_ROLE) {
_burn(_from, _amount);
}
Expand All @@ -112,15 +130,43 @@ contract Credit is

//-------------------------------- Oyster Market start --------------------------------//

/**
* @notice Burn Credit tokens and receive USDC.
* `_amount` of Credit tokens will be burned and `_amount` of USDC will be sent to `_to`.
* @dev Caller must have `REDEEMER_ROLE`.
* @dev Can revert if `Credit` contract does not have enough balance of USDC.
* @param _to Address to receive USDC.
* @param _amount Amount of tokens to redeem.
*/
function redeemAndBurn(address _to, uint256 _amount) external whenNotPaused onlyRole(REDEEMER_ROLE) {
_burn(_msgSender(), _amount);
IERC20(USDC).safeTransfer(_to, _amount);
_burn(_msgSender(), _amount);
}

//-------------------------------- Oyster Market end --------------------------------//

//-------------------------------- Pause/Unpause start --------------------------------//

function pause() external onlyRole(PAUSER_ROLE) {
_pause();
}

function unpause() external onlyRole(PAUSER_ROLE) {
_unpause();
}

//-------------------------------- Pause/Unpause end --------------------------------//

//-------------------------------- Emergency Withdraw start --------------------------------//

/**
* @notice Emergency withdraw tokens from the contract.
* @dev Caller must have `DEFAULT_ADMIN_ROLE`
* and `_to` address must have `EMERGENCY_WITHDRAW_ROLE`.
* @param _token Address of the token to withdraw.
* @param _to Address to receive the tokens. Must have `EMERGENCY_WITHDRAW_ROLE`.
* @param _amount Amount of tokens to withdraw.
*/
function emergencyWithdraw(address _token, address _to, uint256 _amount) external onlyAdmin {
require(hasRole(EMERGENCY_WITHDRAW_ROLE, _to), OnlyToEmergencyWithdrawRole());
IERC20(_token).safeTransfer(_to, _amount);
Expand Down
8 changes: 4 additions & 4 deletions scripts/deploy/enclaves/UpgradeMarketV1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ async function deployAndUpgradeMarketV1() {
const marketV1UpgradeTx = await marketV1Proxy.connect(admin).upgradeTo(newMarketV1Impl.address);
await marketV1UpgradeTx.wait();

// Reinitialize MarketV1 (noticePeriod, creditToken)
const marketV1 = MarketV1__factory.connect(marketV1Proxy.address, admin);
const reinitializeTx = await marketV1.connect(admin).reinitialize(FIVE_MINUTES, addresses.proxy.credit);
await reinitializeTx.wait();
// // Reinitialize MarketV1 (noticePeriod, creditToken)
// const marketV1 = MarketV1__factory.connect(marketV1Proxy.address, admin);
// const reinitializeTx = await marketV1.connect(admin).reinitialize(FIVE_MINUTES, addresses.proxy.credit);
// await reinitializeTx.wait();

/*//////////////////////////////////////////////////////////////
VERIFY CONTRACTS
Expand Down
Loading