@juicedollar/jusd 1.0.3 → 1.0.4

package/contracts/MintingHubV2/MintingHub.sol

@@ -47,6 +47,12 @@ contract MintingHub is IMintingHub, ERC165 {
      */
     mapping(address collateral => mapping(address owner => uint256 amount)) public pendingReturns;
 
+    /**
+     * @notice Tracks whether the first position has been created.
+     * @dev The first position (genesis) can skip the 3-day init period requirement.
+     */
+    bool private _genesisPositionCreated;
+
     struct Challenge {
         address challenger; // the address from which the challenge was initiated
         uint40 start; // the start of the challenge
@@ -85,7 +91,7 @@ contract MintingHub is IMintingHub, ERC165 {
         _;
     }
 
-    constructor(address _jusd, address _leadrate, address _roller, address _factory, address _wcbtc) {
+    constructor(address _jusd, address _leadrate, address payable _roller, address _factory, address _wcbtc) {
         JUSD = IJuiceDollar(_jusd);
         RATE = ILeadrate(_leadrate);
         POSITION_FACTORY = IPositionFactory(_factory);
@@ -129,7 +135,12 @@ contract MintingHub is IMintingHub, ERC165 {
             if (CHALLENGER_REWARD > _reservePPM || _reservePPM > 1_000_000) revert InvalidReservePPM();
             if (IERC20Metadata(_collateralAddress).decimals() > 24) revert InvalidCollateralDecimals(); // leaves 12 digits for price
             if (_challengeSeconds < 1 days) revert ChallengeTimeTooShort();
-            if (_initPeriodSeconds < 3 days) revert InitPeriodTooShort();
+            // First position (genesis) can skip init period, all others require 3 days minimum
+            if (_genesisPositionCreated) {
+                if (_initPeriodSeconds < 3 days) revert InitPeriodTooShort();
+            } else {
+                _genesisPositionCreated = true;
+            }
             uint256 invalidAmount = IERC20(_collateralAddress).totalSupply() + 1;
             // TODO: Improve for older tokens that revert with assert,
             // which consumes all gas and makes the entire tx fail (uncatchable)

package/contracts/MintingHubV2/PositionRoller.sol

@@ -8,6 +8,7 @@ import {IMintingHubGateway} from "../gateway/interface/IMintingHubGateway.sol";
 import {IMintingHub} from "./interface/IMintingHub.sol";
 import {IPosition} from "./interface/IPosition.sol";
 import {IReserve} from "../interface/IReserve.sol";
+import {IWrappedNative} from "../interface/IWrappedNative.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 /**
@@ -15,13 +16,19 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
  *
  * Helper to roll over a debt from an old position to a new one.
  * Both positions should have the same collateral. Otherwise, it does not make much sense.
+ *
+ * For standard ERC20 positions, use roll/rollFully/rollFullyWithExpiration.
+ * Collateral flows through the user's wallet and requires approval.
+ *
+ * For native coin positions (e.g., WCBTC), use rollNative/rollFullyNative/rollFullyNativeWithExpiration.
+ * Collateral flows through the roller, no approval needed, and excess is returned as native coin.
  */
 contract PositionRoller {
     IJuiceDollar private jusd;
 
     error NotOwner(address pos);
     error NotPosition(address pos);
-    error Log(uint256, uint256, uint256);
+    error NativeTransferFailed();
 
     event Roll(address source, uint256 collWithdraw, uint256 repay, address target, uint256 collDeposit, uint256 mint);
 
@@ -32,8 +39,8 @@ contract PositionRoller {
     /**
      * Convenience method to roll an old position into a new one.
      *
-     * Pre-condition: an allowance for the roller to spend the collateral asset on behalf of the caller,
-     * i.e., one should set collateral.approve(roller, collateral.balanceOf(sourcePosition)).
+     * Pre-condition: an allowance for the roller to spend the collateral asset
+     * on behalf of the caller, i.e., collateral.approve(roller, collateral.balanceOf(sourcePosition)).
      *
      * The following is assumed:
      * - If the limit of the target position permits, the user wants to roll everything.
@@ -49,21 +56,12 @@ contract PositionRoller {
      */
     function rollFullyWithExpiration(IPosition source, IPosition target, uint40 expiration) public {
         require(source.collateral() == target.collateral());
-        uint256 principal = source.principal();
-        uint256 interest = source.getInterest();
-        uint256 usableMint = source.getUsableMint(principal) + interest; // Roll interest into principal
-        uint256 mintAmount = target.getMintAmount(usableMint);
-        uint256 collateralToWithdraw = IERC20(source.collateral()).balanceOf(address(source));
-        uint256 targetPrice = target.price();
-        uint256 depositAmount = (mintAmount * 10 ** 18 + targetPrice - 1) / targetPrice; // round up
-        if (depositAmount > collateralToWithdraw) {
-            // If we need more collateral than available from the old position, we opt for taking
-            // the missing funds from the caller instead of requiring additional collateral.
-            depositAmount = collateralToWithdraw;
-            mintAmount = (depositAmount * target.price()) / 10 ** 18; // round down, rest will be taken from caller
-        }
-
-        roll(source, principal + interest, collateralToWithdraw, target, mintAmount, depositAmount, expiration);
+        (uint256 repay, uint256 collWithdraw, uint256 mint, uint256 collDeposit) = _calculateRollParams(
+            source,
+            target,
+            0
+        );
+        roll(source, repay, collWithdraw, target, mint, collDeposit, expiration);
     }
 
     /**
@@ -72,12 +70,12 @@ contract PositionRoller {
      * It is the responsibility of the caller to ensure that both positions are valid contracts.
      *
      * @param source The source position, must be owned by the msg.sender.
-     * @param repay The amount of principal to repay from the source position using a flash loan, freeing up some or all collateral .
-     * @param collWithdraw Collateral to move from the source position to the msg.sender.
+     * @param repay The amount of principal to repay from the source position using a flash loan.
+     * @param collWithdraw Collateral to withdraw from the source position.
      * @param target The target position. If not owned by msg.sender or if it does not have the desired expiration,
      *               it is cloned to create a position owned by the msg.sender.
-     * @param mint The amount to be minted from the target position using collateral from msg.sender.
-     * @param collDeposit The amount of collateral to be sent from msg.sender to the target position.
+     * @param mint The amount to be minted from the target position.
+     * @param collDeposit The amount of collateral to deposit into the target position.
      * @param expiration The desired expiration date for the target position.
      */
     function roll(
@@ -94,9 +92,10 @@ contract PositionRoller {
         source.withdrawCollateral(msg.sender, collWithdraw);
         if (mint > 0) {
             IERC20 targetCollateral = IERC20(target.collateral());
-            if (Ownable(address(target)).owner() != msg.sender || expiration != target.expiration()) {
-                targetCollateral.transferFrom(msg.sender, address(this), collDeposit); // get the new collateral
-                targetCollateral.approve(target.hub(), collDeposit); // approve the new collateral and clone:
+            bool needsClone = Ownable(address(target)).owner() != msg.sender || expiration != target.expiration();
+            if (needsClone) {
+                targetCollateral.transferFrom(msg.sender, address(this), collDeposit);
+                targetCollateral.approve(target.hub(), collDeposit);
                 target = _cloneTargetPosition(target, source, collDeposit, mint, expiration);
             } else {
                 // We can roll into the provided existing position.
@@ -116,10 +115,125 @@ contract PositionRoller {
         emit Roll(address(source), collWithdraw, repay, address(target), collDeposit, mint);
     }
 
+    /**
+     * Convenience method to roll a native coin position into a new one.
+     *
+     * No collateral approval is needed - collateral flows through the roller
+     * and excess is returned as native coin.
+     *
+     * Additional collateral can be provided via msg.value.
+     */
+    function rollFullyNative(IPosition source, IPosition target) external payable {
+        rollFullyNativeWithExpiration(source, target, target.expiration());
+    }
+
+    /**
+     * Like rollFullyNative, but with a custom expiration date for the new position.
+     */
+    function rollFullyNativeWithExpiration(IPosition source, IPosition target, uint40 expiration) public payable {
+        require(source.collateral() == target.collateral());
+        (uint256 repay, uint256 collWithdraw, uint256 mint, uint256 collDeposit) = _calculateRollParams(
+            source,
+            target,
+            msg.value
+        );
+        rollNative(source, repay, collWithdraw, target, mint, collDeposit, expiration);
+    }
+
+    /**
+     * Rolls a native coin position into the target position using a flash loan.
+     * Collateral is routed through the roller and returned as native coin,
+     * eliminating the need for users to interact with wrapped native tokens directly.
+     *
+     * If additional collateral is needed (collDeposit > collWithdraw), it can be provided
+     * as native coin via msg.value.
+     *
+     * @param source The source position, must be owned by the msg.sender.
+     * @param repay The amount of principal to repay from the source position using a flash loan.
+     * @param collWithdraw Collateral to withdraw from the source position.
+     * @param target The target position. If not owned by msg.sender or if it does not have the desired expiration,
+     *               it is cloned to create a position owned by the msg.sender.
+     * @param mint The amount to be minted from the target position.
+     * @param collDeposit The amount of collateral to deposit into the target position.
+     * @param expiration The desired expiration date for the target position.
+     */
+    function rollNative(
+        IPosition source,
+        uint256 repay,
+        uint256 collWithdraw,
+        IPosition target,
+        uint256 mint,
+        uint256 collDeposit,
+        uint40 expiration
+    ) public payable valid(source) valid(target) own(source) {
+        address collateral = address(source.collateral());
+
+        jusd.mint(address(this), repay); // take a flash loan
+        uint256 used = source.repay(repay);
+        source.withdrawCollateral(address(this), collWithdraw);
+        if (msg.value > 0) {
+            IWrappedNative(collateral).deposit{value: msg.value}();
+        }
+
+        if (mint > 0) {
+            IERC20 targetCollateral = IERC20(collateral);
+            bool needsClone = Ownable(address(target)).owner() != msg.sender || expiration != target.expiration();
+            if (needsClone) {
+                targetCollateral.approve(target.hub(), collDeposit);
+                target = _cloneTargetPosition(target, source, collDeposit, mint, expiration);
+            } else {
+                targetCollateral.transfer(address(target), collDeposit);
+                target.mint(msg.sender, mint);
+            }
+        }
+
+        // Transfer remaining flash loan to caller for repayment
+        if (repay > used) {
+            jusd.transfer(msg.sender, repay - used);
+        }
+        jusd.burnFrom(msg.sender, repay); // repay the flash loan
+
+        // Return excess as native coin
+        uint256 remaining = IERC20(collateral).balanceOf(address(this));
+        if (remaining > 0) {
+            IWrappedNative(collateral).withdraw(remaining);
+            (bool success, ) = msg.sender.call{value: remaining}("");
+            if (!success) revert NativeTransferFailed();
+        }
+
+        emit Roll(address(source), collWithdraw, repay, address(target), collDeposit, mint);
+    }
+
+    /**
+     * Calculates the parameters for a roll operation.
+     * @param extraCollateral Additional collateral provided via msg.value (for native rolls).
+     */
+    function _calculateRollParams(
+        IPosition source,
+        IPosition target,
+        uint256 extraCollateral
+    ) internal view returns (uint256 repay, uint256 collWithdraw, uint256 mint, uint256 collDeposit) {
+        uint256 principal = source.principal();
+        uint256 interest = source.getInterest();
+        uint256 usableMint = source.getUsableMint(principal) + interest;
+        uint256 mintAmount = target.getMintAmount(usableMint);
+        uint256 collateralAvailable = IERC20(source.collateral()).balanceOf(address(source));
+        uint256 totalAvailable = collateralAvailable + extraCollateral;
+        uint256 targetPrice = target.price();
+        uint256 depositAmount = (mintAmount * 10 ** 18 + targetPrice - 1) / targetPrice;
+
+        if (depositAmount > totalAvailable) {
+            depositAmount = totalAvailable;
+            mintAmount = (depositAmount * target.price()) / 10 ** 18;
+        }
+
+        return (principal + interest, collateralAvailable, mintAmount, depositAmount);
+    }
+
     /**
      * Clones the target position and mints the specified amount using the given collateral.
      */
-    function _cloneTargetPosition (
+    function _cloneTargetPosition(
         IPosition target,
         IPosition source,
         uint256 collDeposit,
@@ -127,24 +241,24 @@ contract PositionRoller {
         uint40 expiration
     ) internal returns (IPosition) {
         if (IERC165(target.hub()).supportsInterface(type(IMintingHubGateway).interfaceId)) {
-            bytes32 frontendCode = IMintingHubGateway(target.hub()).GATEWAY().getPositionFrontendCode(
-                address(source)
-            );
-            return IPosition(
-                IMintingHubGateway(target.hub()).clone(
-                    msg.sender,
-                    address(target),
-                    collDeposit,
-                    mint,
-                    expiration,
-                    0, // inherit price from parent
-                    frontendCode // use the same frontend code
-                )
-            );
+            bytes32 frontendCode = IMintingHubGateway(target.hub()).GATEWAY().getPositionFrontendCode(address(source));
+            return
+                IPosition(
+                    IMintingHubGateway(target.hub()).clone(
+                        msg.sender,
+                        address(target),
+                        collDeposit,
+                        mint,
+                        expiration,
+                        0, // inherit price from parent
+                        frontendCode // use the same frontend code
+                    )
+                );
         } else {
-            return IPosition(
-                IMintingHub(target.hub()).clone(msg.sender, address(target), collDeposit, mint, expiration, 0)
-            );
+            return
+                IPosition(
+                    IMintingHub(target.hub()).clone(msg.sender, address(target), collDeposit, mint, expiration, 0)
+                );
         }
     }
 
@@ -157,4 +271,7 @@ contract PositionRoller {
         if (jusd.getPositionParent(address(pos)) == address(0x0)) revert NotPosition(address(pos));
         _;
     }
+
+    /// @notice Required to receive native coin when unwrapping
+    receive() external payable {}
 }

package/contracts/MintingHubV2/interface/IMintingHub.sol

@@ -10,6 +10,8 @@ interface IMintingHub {
 
     function ROLLER() external view returns (PositionRoller);
 
+    function WCBTC() external view returns (address);
+
     function challenge(
         address _positionAddr,
         uint256 _collateralAmount,

package/contracts/gateway/MintingHubGateway.sol

@@ -11,7 +11,7 @@ contract MintingHubGateway is MintingHub, IMintingHubGateway {
     constructor(
         address _jusd,
         address _leadrate,
-        address _roller,
+        address payable _roller,
         address _factory,
         address _gateway,
         address _wcbtc

package/dist/index.d.mts

@@ -2765,7 +2765,7 @@ declare const MintingHubGatewayABI: readonly [{
         readonly name: "_leadrate";
         readonly type: "address";
     }, {
-        readonly internalType: "address";
+        readonly internalType: "address payable";
         readonly name: "_roller";
         readonly type: "address";
     }, {
@@ -4609,20 +4609,8 @@ declare const PositionRollerABI: readonly [{
     readonly stateMutability: "nonpayable";
     readonly type: "constructor";
 }, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }];
-    readonly name: "Log";
+    readonly inputs: readonly [];
+    readonly name: "NativeTransferFailed";
     readonly type: "error";
 }, {
     readonly inputs: readonly [{
@@ -4723,6 +4711,38 @@ declare const PositionRollerABI: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }];
+    readonly name: "rollFullyNative";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint40";
+        readonly name: "expiration";
+        readonly type: "uint40";
+    }];
+    readonly name: "rollFullyNativeWithExpiration";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "contract IPosition";
@@ -4741,6 +4761,43 @@ declare const PositionRollerABI: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "repay";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "collWithdraw";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "mint";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "collDeposit";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint40";
+        readonly name: "expiration";
+        readonly type: "uint40";
+    }];
+    readonly name: "rollNative";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly stateMutability: "payable";
+    readonly type: "receive";
 }];
 
 declare const PositionV2ABI: readonly [{
@@ -7619,7 +7676,7 @@ declare const MintingHubV2ABI: readonly [{
         readonly name: "_leadrate";
         readonly type: "address";
     }, {
-        readonly internalType: "address";
+        readonly internalType: "address payable";
         readonly name: "_roller";
         readonly type: "address";
     }, {

package/dist/index.d.ts

@@ -2765,7 +2765,7 @@ declare const MintingHubGatewayABI: readonly [{
         readonly name: "_leadrate";
         readonly type: "address";
     }, {
-        readonly internalType: "address";
+        readonly internalType: "address payable";
         readonly name: "_roller";
         readonly type: "address";
     }, {
@@ -4609,20 +4609,8 @@ declare const PositionRollerABI: readonly [{
     readonly stateMutability: "nonpayable";
     readonly type: "constructor";
 }, {
-    readonly inputs: readonly [{
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }, {
-        readonly internalType: "uint256";
-        readonly name: "";
-        readonly type: "uint256";
-    }];
-    readonly name: "Log";
+    readonly inputs: readonly [];
+    readonly name: "NativeTransferFailed";
     readonly type: "error";
 }, {
     readonly inputs: readonly [{
@@ -4723,6 +4711,38 @@ declare const PositionRollerABI: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }];
+    readonly name: "rollFullyNative";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint40";
+        readonly name: "expiration";
+        readonly type: "uint40";
+    }];
+    readonly name: "rollFullyNativeWithExpiration";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
 }, {
     readonly inputs: readonly [{
         readonly internalType: "contract IPosition";
@@ -4741,6 +4761,43 @@ declare const PositionRollerABI: readonly [{
     readonly outputs: readonly [];
     readonly stateMutability: "nonpayable";
     readonly type: "function";
+}, {
+    readonly inputs: readonly [{
+        readonly internalType: "contract IPosition";
+        readonly name: "source";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "repay";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "collWithdraw";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "contract IPosition";
+        readonly name: "target";
+        readonly type: "address";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "mint";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint256";
+        readonly name: "collDeposit";
+        readonly type: "uint256";
+    }, {
+        readonly internalType: "uint40";
+        readonly name: "expiration";
+        readonly type: "uint40";
+    }];
+    readonly name: "rollNative";
+    readonly outputs: readonly [];
+    readonly stateMutability: "payable";
+    readonly type: "function";
+}, {
+    readonly stateMutability: "payable";
+    readonly type: "receive";
 }];
 
 declare const PositionV2ABI: readonly [{
@@ -7619,7 +7676,7 @@ declare const MintingHubV2ABI: readonly [{
         readonly name: "_leadrate";
         readonly type: "address";
     }, {
-        readonly internalType: "address";
+        readonly internalType: "address payable";
         readonly name: "_roller";
         readonly type: "address";
     }, {

package/dist/index.js

@@ -59,16 +59,16 @@ var ADDRESS = {
     positionFactoryV2: import_viem.zeroAddress
   },
   5115: {
-    juiceDollar: "0x0D511a9C1662924dd8f9c12D2Bd72B0264E48583",
-    equity: "0x8FF9be291A44CA3E7b45361bf6bbE1aCd0135c06",
-    frontendGateway: "0x6721aC661e52C6BA092debb6cc33Ee58F1a4D10A",
-    savingsGateway: "0xC638D446072416Aa1760A73748D291Af9f3925cB",
-    savingsVaultJUSD: "0x4bD31350f611b469bA7fCC2c5945aAEBefD7A191",
-    mintingHubGateway: "0x44B0727688F1839c2BF7b74686F04Cba0CfE89D6",
-    bridgeStartUSD: "0x8d149f42C8F73F9fC90e2CbED8eE0644e8837623",
-    startUSD: "0xf65BF14763699C08F9ff11e9Dc6706DdEB69b5b9",
-    roller: "0xD09CeBBac7cA43430A505CA7A78123D83d53Af39",
-    positionFactoryV2: "0xD6673d8Fc25094579Ae23802957e9084860F5d1a"
+    juiceDollar: "0x2742bb39221434bbfcac81959C8367fDE5d83ce9",
+    equity: "0xD6B9d4600C45eC4388e45A474C1C153828B7C018",
+    frontendGateway: "0x52C2d93DAC83Da412D93D035b017486DecCE782A",
+    savingsGateway: "0x2e1697e7BaA6CE62B0c36B015B7a5BEC6157B99e",
+    savingsVaultJUSD: "0x45DA5a722b591bBce0b87B192d846AB85EFA88d3",
+    mintingHubGateway: "0x57c4aB0f9480AC52a58C820a58ad802B0D4c23EB",
+    bridgeStartUSD: "0x8c5e5594c05205454BC09487ad53db4e4DB6564D",
+    startUSD: "0xa37f823Bd1bae4379265A4fF9cD5a68f402dE2f5",
+    roller: "0xB9B5f670A19E345fFb82D91e699a3f917E237f55",
+    positionFactoryV2: "0x70dDC84C79B724b247C10BB9a11Bd98c08Ee3C1a"
   }
 };
 
@@ -3651,7 +3651,7 @@ var MintingHubGatewayABI = [
         type: "address"
       },
       {
-        internalType: "address",
+        internalType: "address payable",
         name: "_roller",
         type: "address"
       },
@@ -6057,24 +6057,8 @@ var PositionRollerABI = [
     type: "constructor"
   },
   {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    name: "Log",
+    inputs: [],
+    name: "NativeTransferFailed",
     type: "error"
   },
   {
@@ -6203,6 +6187,47 @@ var PositionRollerABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      }
+    ],
+    name: "rollFullyNative",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      },
+      {
+        internalType: "uint40",
+        name: "expiration",
+        type: "uint40"
+      }
+    ],
+    name: "rollFullyNativeWithExpiration",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -6225,6 +6250,53 @@ var PositionRollerABI = [
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "repay",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "collWithdraw",
+        type: "uint256"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "mint",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "collDeposit",
+        type: "uint256"
+      },
+      {
+        internalType: "uint40",
+        name: "expiration",
+        type: "uint40"
+      }
+    ],
+    name: "rollNative",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
+  {
+    stateMutability: "payable",
+    type: "receive"
   }
 ];
 
@@ -9618,7 +9690,7 @@ var MintingHubV2ABI = [
         type: "address"
       },
       {
-        internalType: "address",
+        internalType: "address payable",
         name: "_roller",
         type: "address"
       },

package/dist/index.mjs

@@ -15,16 +15,16 @@ var ADDRESS = {
     positionFactoryV2: zeroAddress
   },
   5115: {
-    juiceDollar: "0x0D511a9C1662924dd8f9c12D2Bd72B0264E48583",
-    equity: "0x8FF9be291A44CA3E7b45361bf6bbE1aCd0135c06",
-    frontendGateway: "0x6721aC661e52C6BA092debb6cc33Ee58F1a4D10A",
-    savingsGateway: "0xC638D446072416Aa1760A73748D291Af9f3925cB",
-    savingsVaultJUSD: "0x4bD31350f611b469bA7fCC2c5945aAEBefD7A191",
-    mintingHubGateway: "0x44B0727688F1839c2BF7b74686F04Cba0CfE89D6",
-    bridgeStartUSD: "0x8d149f42C8F73F9fC90e2CbED8eE0644e8837623",
-    startUSD: "0xf65BF14763699C08F9ff11e9Dc6706DdEB69b5b9",
-    roller: "0xD09CeBBac7cA43430A505CA7A78123D83d53Af39",
-    positionFactoryV2: "0xD6673d8Fc25094579Ae23802957e9084860F5d1a"
+    juiceDollar: "0x2742bb39221434bbfcac81959C8367fDE5d83ce9",
+    equity: "0xD6B9d4600C45eC4388e45A474C1C153828B7C018",
+    frontendGateway: "0x52C2d93DAC83Da412D93D035b017486DecCE782A",
+    savingsGateway: "0x2e1697e7BaA6CE62B0c36B015B7a5BEC6157B99e",
+    savingsVaultJUSD: "0x45DA5a722b591bBce0b87B192d846AB85EFA88d3",
+    mintingHubGateway: "0x57c4aB0f9480AC52a58C820a58ad802B0D4c23EB",
+    bridgeStartUSD: "0x8c5e5594c05205454BC09487ad53db4e4DB6564D",
+    startUSD: "0xa37f823Bd1bae4379265A4fF9cD5a68f402dE2f5",
+    roller: "0xB9B5f670A19E345fFb82D91e699a3f917E237f55",
+    positionFactoryV2: "0x70dDC84C79B724b247C10BB9a11Bd98c08Ee3C1a"
   }
 };
 
@@ -3607,7 +3607,7 @@ var MintingHubGatewayABI = [
         type: "address"
       },
       {
-        internalType: "address",
+        internalType: "address payable",
         name: "_roller",
         type: "address"
       },
@@ -6013,24 +6013,8 @@ var PositionRollerABI = [
     type: "constructor"
   },
   {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256"
-      }
-    ],
-    name: "Log",
+    inputs: [],
+    name: "NativeTransferFailed",
     type: "error"
   },
   {
@@ -6159,6 +6143,47 @@ var PositionRollerABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      }
+    ],
+    name: "rollFullyNative",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      },
+      {
+        internalType: "uint40",
+        name: "expiration",
+        type: "uint40"
+      }
+    ],
+    name: "rollFullyNativeWithExpiration",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
   {
     inputs: [
       {
@@ -6181,6 +6206,53 @@ var PositionRollerABI = [
     outputs: [],
     stateMutability: "nonpayable",
     type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract IPosition",
+        name: "source",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "repay",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "collWithdraw",
+        type: "uint256"
+      },
+      {
+        internalType: "contract IPosition",
+        name: "target",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "mint",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "collDeposit",
+        type: "uint256"
+      },
+      {
+        internalType: "uint40",
+        name: "expiration",
+        type: "uint40"
+      }
+    ],
+    name: "rollNative",
+    outputs: [],
+    stateMutability: "payable",
+    type: "function"
+  },
+  {
+    stateMutability: "payable",
+    type: "receive"
   }
 ];
 
@@ -9574,7 +9646,7 @@ var MintingHubV2ABI = [
         type: "address"
       },
       {
-        internalType: "address",
+        internalType: "address payable",
         name: "_roller",
         type: "address"
       },

package/exports/abis/MintingHubV2/PositionRoller.ts

@@ -11,24 +11,8 @@ export const PositionRollerABI = [
     type: 'constructor',
   },
   {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    name: 'Log',
+    inputs: [],
+    name: 'NativeTransferFailed',
     type: 'error',
   },
   {
@@ -157,6 +141,47 @@ export const PositionRollerABI = [
     stateMutability: 'nonpayable',
     type: 'function',
   },
+  {
+    inputs: [
+      {
+        internalType: 'contract IPosition',
+        name: 'source',
+        type: 'address',
+      },
+      {
+        internalType: 'contract IPosition',
+        name: 'target',
+        type: 'address',
+      },
+    ],
+    name: 'rollFullyNative',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    inputs: [
+      {
+        internalType: 'contract IPosition',
+        name: 'source',
+        type: 'address',
+      },
+      {
+        internalType: 'contract IPosition',
+        name: 'target',
+        type: 'address',
+      },
+      {
+        internalType: 'uint40',
+        name: 'expiration',
+        type: 'uint40',
+      },
+    ],
+    name: 'rollFullyNativeWithExpiration',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
   {
     inputs: [
       {
@@ -180,4 +205,51 @@ export const PositionRollerABI = [
     stateMutability: 'nonpayable',
     type: 'function',
   },
+  {
+    inputs: [
+      {
+        internalType: 'contract IPosition',
+        name: 'source',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'repay',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'collWithdraw',
+        type: 'uint256',
+      },
+      {
+        internalType: 'contract IPosition',
+        name: 'target',
+        type: 'address',
+      },
+      {
+        internalType: 'uint256',
+        name: 'mint',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint256',
+        name: 'collDeposit',
+        type: 'uint256',
+      },
+      {
+        internalType: 'uint40',
+        name: 'expiration',
+        type: 'uint40',
+      },
+    ],
+    name: 'rollNative',
+    outputs: [],
+    stateMutability: 'payable',
+    type: 'function',
+  },
+  {
+    stateMutability: 'payable',
+    type: 'receive',
+  },
 ] as const;

package/exports/abis/core/MintingHubGateway.ts

@@ -12,7 +12,7 @@ export const MintingHubGatewayABI = [
         type: 'address',
       },
       {
-        internalType: 'address',
+        internalType: 'address payable',
         name: '_roller',
         type: 'address',
       },

package/exports/abis/utils/MintingHubV2.ts

@@ -12,7 +12,7 @@ export const MintingHubV2ABI = [
         type: 'address',
       },
       {
-        internalType: 'address',
+        internalType: 'address payable',
         name: '_roller',
         type: 'address',
       },

package/exports/address.config.ts

@@ -30,15 +30,15 @@ export const ADDRESS: Record<number, ChainAddress> = {
     positionFactoryV2: zeroAddress,
   },
   5115: {
-    juiceDollar: "0x0D511a9C1662924dd8f9c12D2Bd72B0264E48583",
-    equity: "0x8FF9be291A44CA3E7b45361bf6bbE1aCd0135c06",
-    frontendGateway: "0x6721aC661e52C6BA092debb6cc33Ee58F1a4D10A",
-    savingsGateway: "0xC638D446072416Aa1760A73748D291Af9f3925cB",
-    savingsVaultJUSD: "0x4bD31350f611b469bA7fCC2c5945aAEBefD7A191",
-    mintingHubGateway: "0x44B0727688F1839c2BF7b74686F04Cba0CfE89D6",
-    bridgeStartUSD: "0x8d149f42C8F73F9fC90e2CbED8eE0644e8837623",
-    startUSD: "0xf65BF14763699C08F9ff11e9Dc6706DdEB69b5b9",
-    roller: "0xD09CeBBac7cA43430A505CA7A78123D83d53Af39",
-    positionFactoryV2: "0xD6673d8Fc25094579Ae23802957e9084860F5d1a",
+    juiceDollar: "0x2742bb39221434bbfcac81959C8367fDE5d83ce9",
+    equity: "0xD6B9d4600C45eC4388e45A474C1C153828B7C018",
+    frontendGateway: "0x52C2d93DAC83Da412D93D035b017486DecCE782A",
+    savingsGateway: "0x2e1697e7BaA6CE62B0c36B015B7a5BEC6157B99e",
+    savingsVaultJUSD: "0x45DA5a722b591bBce0b87B192d846AB85EFA88d3",
+    mintingHubGateway: "0x57c4aB0f9480AC52a58C820a58ad802B0D4c23EB",
+    bridgeStartUSD: "0x8c5e5594c05205454BC09487ad53db4e4DB6564D",
+    startUSD: "0xa37f823Bd1bae4379265A4fF9cD5a68f402dE2f5",
+    roller: "0xB9B5f670A19E345fFb82D91e699a3f917E237f55",
+    positionFactoryV2: "0x70dDC84C79B724b247C10BB9a11Bd98c08Ee3C1a",
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juicedollar/jusd",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "JuiceDollar (JUSD) - Oracle-free, Bitcoin-collateralized stablecoin on Citrea. Decentralized minting with democratic governance.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",