@juicedollar/jusd 1.0.6 → 1.1.0

package/contracts/StablecoinBridge.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {IJuiceDollar} from "./interface/IJuiceDollar.sol";
+import {IReserve} from "./interface/IReserve.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
@@ -13,6 +14,11 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 contract StablecoinBridge {
     using SafeERC20 for IERC20;
 
+    /**
+     * @notice Emergency quorum in basis points. 1000 = 10%.
+     */
+    uint32 private constant EMERGENCY_QUORUM = 1000;
+
     IERC20 public immutable usd; // the source stablecoin
     IJuiceDollar public immutable JUSD; // the JUSD
     uint8 private immutable usdDecimals;
@@ -29,9 +35,20 @@ contract StablecoinBridge {
     uint256 public immutable limit;
     uint256 public minted;
 
+    /**
+     * @notice Whether this bridge has been permanently stopped via emergency stop.
+     */
+    bool public stopped;
+
+    event EmergencyStopped(address indexed caller, string message);
+
     error Limit(uint256 amount, uint256 limit);
     error Expired(uint256 time, uint256 expiration);
     error UnsupportedToken(address token);
+    error Stopped();
+    error AlreadyStopped();
+    error NotQualified();
+    error NoGovernance();
 
     constructor(address other, address JUSDAddress, uint256 limit_, uint256 weeks_) {
         usd = IERC20(other);
@@ -56,19 +73,47 @@ contract StablecoinBridge {
      * @param amount The amount of the source stablecoin to bridge (convert).
      */
     function mintTo(address target, uint256 amount) public {
+        if (stopped) revert Stopped();
+
         usd.safeTransferFrom(msg.sender, address(this), amount);
-        
+
         uint256 targetAmount = _convertAmount(amount, usdDecimals, JUSDDecimals);
         _mint(target, targetAmount);
     }
 
     function _mint(address target, uint256 amount) internal {
+        if (stopped) revert Stopped();
         if (block.timestamp > horizon) revert Expired(block.timestamp, horizon);
         JUSD.mint(target, amount);
         minted += amount;
         if (minted > limit) revert Limit(amount, limit);
     }
 
+    /**
+     * @notice Permanently stop this bridge in case of emergency.
+     * @dev Requires 10% governance power. Once stopped, cannot be reactivated.
+     * Users can still burn JUSD to retrieve their stablecoins.
+     * @param _helpers Addresses that delegated their votes to the caller (must be sorted ascending, no duplicates)
+     * @param _message Reason for the emergency stop
+     */
+    function emergencyStop(address[] calldata _helpers, string calldata _message) external {
+        if (stopped) revert AlreadyStopped();
+
+        IReserve reserve = JUSD.reserve();
+        uint256 _totalVotes = reserve.totalVotes();
+        if (_totalVotes == 0) revert NoGovernance();
+
+        // Use votesDelegated from Equity which validates:
+        // - helpers are sorted and unique
+        // - helpers have delegated to sender
+        // - sender is not in helpers list
+        uint256 _votes = reserve.votesDelegated(msg.sender, _helpers);
+        if (_votes * 10_000 < EMERGENCY_QUORUM * _totalVotes) revert NotQualified();
+
+        stopped = true;
+        emit EmergencyStopped(msg.sender, _message);
+    }
+
     /**
      * @notice Convenience method for burnAndSend(msg.sender, amount)
      * @param amount The amount of JUSD to burn.
@@ -99,11 +144,11 @@ contract StablecoinBridge {
      */
     function _convertAmount(uint256 amount, uint8 fromDecimals, uint8 toDecimals) internal pure returns (uint256) {
         if (fromDecimals < toDecimals) {
-            return amount * 10**(toDecimals - fromDecimals);
+            return amount * 10 ** (toDecimals - fromDecimals);
         } else if (fromDecimals > toDecimals) {
-            return amount / 10**(fromDecimals - toDecimals);
+            return amount / 10 ** (fromDecimals - toDecimals);
         } else {
             return amount;
         }
     }
-}
+}

package/contracts/interface/IReserve.sol

@@ -6,4 +6,6 @@ import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 interface IReserve is IERC20 {
     function invest(uint256 amount, uint256 expected) external returns (uint256);
     function checkQualified(address sender, address[] calldata helpers) external view;
+    function votesDelegated(address sender, address[] calldata helpers) external view returns (uint256);
+    function totalVotes() external view returns (uint256);
 }

package/contracts/test/PositionExpirationTest.sol

@@ -32,7 +32,7 @@ contract PositionExpirationTest {
                 10,
                 100 /* collateral */,
                 1000000 * 10 ** 18,
-                7 days,
+                14 days,
                 30 days,
                 1 days,
                 50000,
@@ -46,7 +46,7 @@ contract PositionExpirationTest {
                 10,
                 100 /* collateral */,
                 1000000 * 10 ** 18,
-                7 days,
+                14 days,
                 30 days,
                 1 days,
                 50000,

package/contracts/test/PositionRollingTest.sol

@@ -29,9 +29,9 @@ contract PositionRollingTest {
 
     function openTwoPositions() public {
         jusd.approve(address(hub), hub.OPENING_FEE());
-        p1 = IPosition(openPosition(100, uint40(3 days)));
+        p1 = IPosition(openPosition(100, uint40(14 days)));
         jusd.approve(address(hub), hub.OPENING_FEE());
-        p2 = IPosition(openPosition(10, uint40(7 days)));
+        p2 = IPosition(openPosition(10, uint40(21 days)));
     }
 
     function mintFromFirstPosition(uint256 amount) public {

package/dist/index.d.mts

@@ -7,8 +7,16 @@ interface ChainAddress {
     savingsGateway: Address;
     savingsVaultJUSD: Address;
     mintingHubGateway: Address;
+    /** Bridge contract addresses */
     bridgeStartUSD: Address;
+    bridgeUSDC?: Address;
+    bridgeUSDT?: Address;
+    bridgeCTUSD?: Address;
+    /** Underlying stablecoin token addresses */
     startUSD: Address;
+    USDC?: Address;
+    USDT?: Address;
+    CTUSD?: Address;
     roller: Address;
     positionFactoryV2: Address;
     genesisPosition: Address;
@@ -2788,6 +2796,10 @@ declare const MintingHubGatewayABI: readonly [{
     readonly inputs: readonly [];
     readonly name: "ChallengeTimeTooShort";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "EmptyMessage";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [];
     readonly name: "IncompatibleCollateral";
@@ -2824,6 +2836,18 @@ declare const MintingHubGatewayABI: readonly [{
     }];
     readonly name: "LeaveNoDust";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "length";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "maxLength";
+        readonly type: "uint256";
+    }];
+    readonly name: "MessageTooLong";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [];
     readonly name: "NativeOnlyForWCBTC";
@@ -2935,6 +2959,26 @@ declare const MintingHubGatewayABI: readonly [{
     }];
     readonly name: "ForcedSale";
     readonly type: "event";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "position";
+        readonly type: "address";
+    }, {
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "denier";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "string";
+        readonly name: "message";
+        readonly type: "string";
+    }];
+    readonly name: "PositionDeniedByGovernance";
+    readonly type: "event";
 }, {
     readonly anonymous: false;
     readonly inputs: readonly [{
@@ -2960,6 +3004,31 @@ declare const MintingHubGatewayABI: readonly [{
     }];
     readonly name: "PositionOpened";
     readonly type: "event";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "position";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "collateral";
+        readonly type: "uint256";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "price";
+        readonly type: "uint256";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "principal";
+        readonly type: "uint256";
+    }];
+    readonly name: "PositionUpdate";
+    readonly type: "event";
 }, {
     readonly anonymous: false;
     readonly inputs: readonly [{
@@ -3260,6 +3329,38 @@ declare const MintingHubGatewayABI: readonly [{
     }];
     readonly stateMutability: "payable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "denier";
+        readonly type: "address";
+    }, {
+        readonly internalType: "string";
+        readonly name: "message";
+        readonly type: "string";
+    }];
+    readonly name: "emitPositionDenied";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "_collateral";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "_price";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "_principal";
+        readonly type: "uint256";
+    }];
+    readonly name: "emitPositionUpdate";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "contract IPosition";
@@ -4069,6 +4170,10 @@ declare const SavingsVaultJUSDABI: readonly [{
     }];
     readonly name: "SafeERC20FailedOperation";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "ZeroShares";
+    readonly type: "error";
 }, {
     readonly anonymous: false;
     readonly inputs: readonly [{
@@ -4946,6 +5051,10 @@ declare const PositionV2ABI: readonly [{
     readonly inputs: readonly [];
     readonly name: "Closed";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "EmptyMessage";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "uint40";
@@ -4994,6 +5103,18 @@ declare const PositionV2ABI: readonly [{
     }];
     readonly name: "LimitExceeded";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "length";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "maxLength";
+        readonly type: "uint256";
+    }];
+    readonly name: "MessageTooLong";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [];
     readonly name: "NativeTransferFailed";
@@ -7596,6 +7717,10 @@ declare const StablecoinBridgeABI: readonly [{
     }];
     readonly stateMutability: "nonpayable";
     readonly type: "constructor";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "AlreadyStopped";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "uint256";
@@ -7620,6 +7745,14 @@ declare const StablecoinBridgeABI: readonly [{
     }];
     readonly name: "Limit";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "NoGovernance";
+    readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "NotQualified";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "address";
@@ -7628,6 +7761,10 @@ declare const StablecoinBridgeABI: readonly [{
     }];
     readonly name: "SafeERC20FailedOperation";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "Stopped";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "address";
@@ -7636,6 +7773,21 @@ declare const StablecoinBridgeABI: readonly [{
     }];
     readonly name: "UnsupportedToken";
     readonly type: "error";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "caller";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "string";
+        readonly name: "message";
+        readonly type: "string";
+    }];
+    readonly name: "EmergencyStopped";
+    readonly type: "event";
 }, {
     readonly inputs: readonly [];
     readonly name: "JUSD";
@@ -7670,6 +7822,20 @@ declare const StablecoinBridgeABI: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address[]";
+        readonly name: "_helpers";
+        readonly type: "address[]";
+    }, {
+        readonly internalType: "string";
+        readonly name: "_message";
+        readonly type: "string";
+    }];
+    readonly name: "emergencyStop";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [];
     readonly name: "horizon";
@@ -7724,6 +7890,16 @@ declare const StablecoinBridgeABI: readonly [{
     }];
     readonly stateMutability: "view";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "stopped";
+    readonly outputs: readonly [{
+        readonly internalType: "bool";
+        readonly name: "";
+        readonly type: "bool";
+    }];
+    readonly stateMutability: "view";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [];
     readonly name: "usd";
@@ -7764,6 +7940,10 @@ declare const MintingHubV2ABI: readonly [{
     readonly inputs: readonly [];
     readonly name: "ChallengeTimeTooShort";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [];
+    readonly name: "EmptyMessage";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [];
     readonly name: "IncompatibleCollateral";
@@ -7800,6 +7980,18 @@ declare const MintingHubV2ABI: readonly [{
     }];
     readonly name: "LeaveNoDust";
     readonly type: "error";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "length";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "maxLength";
+        readonly type: "uint256";
+    }];
+    readonly name: "MessageTooLong";
+    readonly type: "error";
 }, {
     readonly inputs: readonly [];
     readonly name: "NativeOnlyForWCBTC";
@@ -7911,6 +8103,26 @@ declare const MintingHubV2ABI: readonly [{
     }];
     readonly name: "ForcedSale";
     readonly type: "event";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "position";
+        readonly type: "address";
+    }, {
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "denier";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "string";
+        readonly name: "message";
+        readonly type: "string";
+    }];
+    readonly name: "PositionDeniedByGovernance";
+    readonly type: "event";
 }, {
     readonly anonymous: false;
     readonly inputs: readonly [{
@@ -7936,6 +8148,31 @@ declare const MintingHubV2ABI: readonly [{
     }];
     readonly name: "PositionOpened";
     readonly type: "event";
+}, {
+    readonly anonymous: false;
+    readonly inputs: readonly [{
+        readonly indexed: true;
+        readonly internalType: "address";
+        readonly name: "position";
+        readonly type: "address";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "collateral";
+        readonly type: "uint256";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "price";
+        readonly type: "uint256";
+    }, {
+        readonly indexed: false;
+        readonly internalType: "uint256";
+        readonly name: "principal";
+        readonly type: "uint256";
+    }];
+    readonly name: "PositionUpdate";
+    readonly type: "event";
 }, {
     readonly anonymous: false;
     readonly inputs: readonly [{
@@ -8188,6 +8425,38 @@ declare const MintingHubV2ABI: readonly [{
     }];
     readonly stateMutability: "payable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "address";
+        readonly name: "denier";
+        readonly type: "address";
+    }, {
+        readonly internalType: "string";
+        readonly name: "message";
+        readonly type: "string";
+    }];
+    readonly name: "emitPositionDenied";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "uint256";
+        readonly name: "_collateral";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "_price";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "_principal";
+        readonly type: "uint256";
+    }];
+    readonly name: "emitPositionUpdate";
+    readonly outputs: readonly [];
+    readonly stateMutability: "nonpayable";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "contract IPosition";