Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

# 4.3.0

- Delay automatic rebalancing after a collateral default while allowing issuance against the backup basket.
- Allow governance-triggered basket changes to rebalance without waiting for `tradingDelay`.

# 4.2.0

Bump solidity version to 0.8.28
Expand Down
3 changes: 3 additions & 0 deletions contracts/interfaces/IBasketHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ interface IBasketHandler is IComponent {
/// @return If the basket is ready to issue and trade
function isReady() external view returns (bool);

/// @return Whether the BackingManager's trading delay is bypassed for this basket
function tradingDelayBypassed() external view returns (bool);

/// Returns basket quantity rounded up, wihout any issuance premium
/// @param erc20 The ERC20 token contract for the asset
/// @return {tok/BU} The redemption quantity of token in the reference basket, rounded up
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IDeployer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct DeploymentParams {
bool enableIssuancePremium; // whether to enable the issuance premium
//
// === BackingManager ===
uint48 tradingDelay; // {s} how long to wait until starting auctions after switching basket
uint48 tradingDelay; // {s} delay for automatic trading after default
uint48 batchAuctionLength; // {s} the length of a Gnosis EasyAuction
uint48 dutchAuctionLength; // {s} the length of a falling-price dutch auction
uint192 backingBuffer; // {1} how much extra backing collateral to keep
Expand Down
2 changes: 1 addition & 1 deletion contracts/mixins/Versioned.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity 0.8.28;
import "../interfaces/IVersioned.sol";

// This value should be updated on each release
string constant VERSION = "4.2.0";
string constant VERSION = "4.3.0";

/**
* @title Versioned
Expand Down
8 changes: 5 additions & 3 deletions contracts/p0/BackingManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager {
uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year
uint192 public constant MAX_BACKING_BUFFER = 1e18; // {%}

uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching
uint48 public tradingDelay; // {s} delay for automatic trading after default
uint192 public backingBuffer; // {%} how much extra backing collateral to keep

mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind
Expand Down Expand Up @@ -95,7 +95,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager {
require(tradesOpen == 0, "trade open");
require(main.basketHandler().isReady(), "basket not ready");
require(
block.timestamp >= main.basketHandler().timestamp() + tradingDelay,
block.timestamp >= main.basketHandler().timestamp() + tradingDelay ||
main.basketHandler().tradingDelayBypassed(),
"trading delayed"
);
require(!main.basketHandler().fullyCollateralized(), "already collateralized");
Expand Down Expand Up @@ -152,7 +153,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager {
require(tradesOpen == 0, "trade open");
require(main.basketHandler().isReady(), "basket not ready");
require(
block.timestamp >= main.basketHandler().timestamp() + tradingDelay,
block.timestamp >= main.basketHandler().timestamp() + tradingDelay ||
main.basketHandler().tradingDelayBypassed(),
"trading delayed"
);
require(main.basketHandler().fullyCollateralized(), "undercollateralized");
Expand Down
10 changes: 8 additions & 2 deletions contracts/p0/BasketHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler {

bool public enableIssuancePremium;

// === 4.3.0 ===

/// Whether the trading delay is bypassed for the current basket
bool public tradingDelayBypassed;

// ==== Invariants ====
// basket is a valid Basket:
// basket.erc20s is a valid collateral array and basket.erc20s == keys(basket.refAmts)
Expand Down Expand Up @@ -214,11 +219,12 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler {
function refreshBasket() external {
main.assetRegistry().refresh();

bool isOwner = main.hasRole(OWNER, _msgSender());
require(
main.hasRole(OWNER, _msgSender()) ||
(lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()),
isOwner || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()),
"basket unrefreshable"
);
tradingDelayBypassed = isOwner;
_switchBasket();

trackStatus();
Expand Down
14 changes: 11 additions & 3 deletions contracts/p1/BackingManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager {
uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year
uint192 public constant MAX_BACKING_BUFFER = FIX_ONE; // {1} 100%

uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching
uint48 public tradingDelay; // {s} delay for automatic trading after default
uint192 public backingBuffer; // {1} how much extra backing collateral to keep

// === 3.0.0 ===
Expand Down Expand Up @@ -120,7 +120,11 @@ contract BackingManagerP1 is TradingP1, IBackingManager {

require(tradesOpen == 0, "trade open");
require(basketHandler.isReady(), "basket not ready");
require(block.timestamp >= basketHandler.timestamp() + tradingDelay, "trading delayed");
require(
block.timestamp >= basketHandler.timestamp() + tradingDelay ||
basketHandler.tradingDelayBypassed(),
"trading delayed"
);

BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(this));
require(basketsHeld.bottom < rToken.basketsNeeded(), "already collateralized");
Expand Down Expand Up @@ -185,7 +189,11 @@ contract BackingManagerP1 is TradingP1, IBackingManager {

require(tradesOpen == 0, "trade open");
require(basketHandler.isReady(), "basket not ready");
require(block.timestamp >= basketHandler.timestamp() + tradingDelay, "trading delayed");
require(
block.timestamp >= basketHandler.timestamp() + tradingDelay ||
basketHandler.tradingDelayBypassed(),
"trading delayed"
);
require(basketsHeld.bottom >= rToken.basketsNeeded(), "undercollateralized");
// require(basketHandler.fullyCollateralized())

Expand Down
10 changes: 8 additions & 2 deletions contracts/p1/BasketHandler.sol
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {

bool public enableIssuancePremium;

// === 4.3.0 ===

/// Whether the trading delay is bypassed for the current basket
bool public tradingDelayBypassed;

// ==== Invariants ====
// basket is a valid Basket:
// basket.erc20s is a valid collateral array and basket.erc20s == keys(basket.refAmts)
Expand Down Expand Up @@ -159,11 +164,12 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
function refreshBasket() external {
assetRegistry.refresh();

bool isOwner = main.hasRole(OWNER, _msgSender());
require(
main.hasRole(OWNER, _msgSender()) ||
(lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()),
isOwner || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()),
"basket unrefreshable"
);
tradingDelayBypassed = isOwner;
_switchBasket();

trackStatus();
Expand Down
2 changes: 1 addition & 1 deletion contracts/plugins/assets/VersionedAsset.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity 0.8.28;
import "../../interfaces/IVersioned.sol";

// This value should be updated on each release
string constant ASSET_VERSION = "4.2.0";
string constant ASSET_VERSION = "4.3.0";

/**
* @title VersionedAsset
Expand Down
57 changes: 57 additions & 0 deletions test/RToken.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {

let collateral0: Collateral
let collateral1: Collateral
let collateral: Collateral[]
let collateral2: ATokenFiatCollateral
let collateral3: CTokenFiatCollateral
let basket: Collateral[]
Expand Down Expand Up @@ -98,6 +99,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {
assetRegistry,
backingManager,
basket,
collateral,
basketHandler,
config,
facadeTest,
Expand Down Expand Up @@ -1671,6 +1673,61 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => {
)
})

it('Should redeem across the pre-default and backup baskets', async function () {
const backupToken = <ERC20Mock>(
await ethers.getContractAt('ERC20Mock', await collateral[2].erc20())
)
await assetRegistry.connect(owner).register(collateral[2].address)
await basketHandler
.connect(owner)
.setBackupConfig(ethers.utils.formatBytes32String('USD'), 1, [backupToken.address])
await backupToken.connect(owner).mint(addr1.address, initialBal)

await setOraclePrice(collateral1.address, bn('0.5e8'))
await collateral1.refresh()
await advanceTime((await collateral1.delayUntilDefault()).toString())
await collateral1.refresh()
await basketHandler.connect(addr2).refreshBasket()

await advanceTime(Number(config.warmupPeriod) + 1)
await backupToken.connect(addr1).approve(rToken.address, initialBal)
await rToken.connect(addr1).issue(issueAmount)

await rToken.connect(owner).setRedemptionThrottleParams({
amtRate: fp('1e9'),
pctRate: fp('1'),
})

const redeemAmount = issueAmount.mul(2)
const basketNonces = [1, 2]
const portions = [fp('0.5'), fp('0.5')]
const quote = await basketHandler.quoteCustomRedemption(
basketNonces,
portions,
redeemAmount
)

await rToken
.connect(addr1)
.redeemCustom(
addr1.address,
redeemAmount,
basketNonces,
portions,
quote.erc20s,
quote.quantities
)

expect(await rToken.totalSupply()).to.equal(0)
expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal(0)
await Promise.all(
tokens.map(async (token) => {
expect(await token.balanceOf(addr1.address)).to.equal(initialBal)
})
)
expect(await backupToken.balanceOf(addr1.address)).to.equal(initialBal)
})

it('Should redeem to a different account', async function () {
// Provide approvals
await Promise.all(tokens.map((t) => t.connect(addr1).approve(rToken.address, initialBal)))
Expand Down
65 changes: 55 additions & 10 deletions test/Recollateralization.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => {
})
})

it('Should skip start recollateralization after tradingDelay', async () => {
it('Should skip tradingDelay after governance basket switch', async () => {
// Set trading delay
const newDelay = 3600
await backingManager.connect(owner).setTradingDelay(newDelay) // 1 hour
Expand All @@ -977,19 +977,13 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => {
.to.emit(basketHandler, 'BasketSet')
.withArgs(3, [token1.address], [fp('1')], false)

expect(await basketHandler.tradingDelayBypassed()).to.equal(true)

// Trigger recollateralization
const sellAmt: BigNumber = await token0.balanceOf(backingManager.address)
const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1'))

// Attempt to trigger before trading delay - Should revert
await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith(
'trading delayed'
)

// Advance time post trading delay
await advanceTime(newDelay + 1)

// Auction can be run now
// Auction can be run immediately
await expect(facadeTest.runAuctionsForAllTraders(rToken.address))
.to.emit(backingManager, 'TradeStarted')
.withArgs(
Expand All @@ -1012,6 +1006,57 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => {
})
})

it('Should delay automatic rebalance after default', async () => {
const newDelay = 3600
await backingManager.connect(owner).setTradingDelay(newDelay)

await assetRegistry.connect(owner).register(backupCollateral1.address)
await basketHandler
.connect(owner)
.setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [backupToken1.address])

await setOraclePrice(collateral0.address, bn('0.5e8'))
await collateral0.refresh()
await advanceTime((await collateral0.delayUntilDefault()).toString())
await collateral0.refresh()

await basketHandler.connect(addr1).refreshBasket()
expect(await basketHandler.tradingDelayBypassed()).to.equal(false)

await advanceTime(config.warmupPeriod.add(1).toString())
await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith(
'trading delayed'
)

await advanceTime(newDelay + 1)
await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.emit(
backingManager,
'TradeStarted'
)
})

it('Should delay automatic rebalance after governance disables basket', async () => {
const newDelay = 3600
await backingManager.connect(owner).setTradingDelay(newDelay)
expect(await basketHandler.tradingDelayBypassed()).to.equal(true)

await assetRegistry.connect(owner).register(backupCollateral1.address)
await basketHandler
.connect(owner)
.setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [backupToken1.address])

// Governance disables the basket without refreshing it
await assetRegistry.connect(owner).unregister(collateral0.address)

await basketHandler.connect(addr1).refreshBasket()
expect(await basketHandler.tradingDelayBypassed()).to.equal(false)

await advanceTime(config.warmupPeriod.add(1).toString())
await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith(
'trading delayed'
)
})

it('Should not recollateralize when switching basket if all assets are UNPRICED', async () => {
// Setup prime basket
await basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')])
Expand Down
Loading
Loading