@superfluid-finance/ethereum-contracts 1.3.2-dev.bf84335.0 → 1.3.2-dev.de7575d.0

package/contracts/interfaces/superfluid/ISuperfluid.sol

@@ -269,7 +269,7 @@ interface ISuperfluid {
      * Agreement Framework
      *
      * Agreements use these function to trigger super app callbacks, updates
-     * app allowance and charge gas fees.
+     * app credit and charge gas fees.
      *
      * These functions can only be called by registered agreements.
      *************************************************************************/
@@ -316,16 +316,16 @@ interface ISuperfluid {
      * @dev (For agreements) Create a new callback stack
      * @param  ctx                     The current ctx, it will be validated.
      * @param  app                     The super app.
-     * @param  appAllowanceGranted     App allowance granted so far.
-     * @param  appAllowanceUsed        App allowance used so far.
+     * @param  appCreditGranted        App credit granted so far.
+     * @param  appCreditUsed           App credit used so far.
      * @return newCtx                  The current context of the transaction.
      */
     function appCallbackPush(
         bytes calldata ctx,
         ISuperApp app,
-        uint256 appAllowanceGranted,
-        int256 appAllowanceUsed,
-        ISuperfluidToken appAllowanceToken
+        uint256 appCreditGranted,
+        int256 appCreditUsed,
+        ISuperfluidToken appCreditToken
     )
         external
         // onlyAgreement
@@ -335,32 +335,30 @@ interface ISuperfluid {
     /**
      * @dev (For agreements) Pop from the current app callback stack
      * @param  ctx                     The ctx that was pushed before the callback stack.
-     * @param  appAllowanceUsedDelta   App allowance used by the app.
+     * @param  appCreditUsedDelta      App credit used by the app.
      * @return newCtx                  The current context of the transaction.
      *
-     * @custom:security 
+     * @custom:security
      * - Here we cannot do assertValidCtx(ctx), since we do not really save the stack in memory.
      * - Hence there is still implicit trust that the agreement handles the callback push/pop pair correctly.
      */
     function appCallbackPop(
         bytes calldata ctx,
-        int256 appAllowanceUsedDelta
+        int256 appCreditUsedDelta
     )
         external
         // onlyAgreement
         returns (bytes memory newCtx);
 
     /**
-     * @dev (For agreements) Use app allowance.
+     * @dev (For agreements) Use app credit.
      * @param  ctx                      The current ctx, it will be validated.
-     * @param  appAllowanceWantedMore   See app allowance for more details.
-     * @param  appAllowanceUsedDelta    See app allowance for more details.
+     * @param  appCreditUsedMore        See app credit for more details.
      * @return newCtx                   The current context of the transaction.
      */
-    function ctxUseAllowance(
+    function ctxUseCredit(
         bytes calldata ctx,
-        uint256 appAllowanceWantedMore,
-        int256 appAllowanceUsedDelta
+        int256 appCreditUsedMore
     )
         external
         // onlyAgreement
@@ -455,6 +453,7 @@ interface ISuperfluid {
      * - The order of the fields hence should not be rearranged in order to be backward compatible:
      *    - non-dynamic fields will be parsed at the same memory location,
      *    - and dynamic fields will simply have a greater offset than it was.
+     * - We cannot change the structure of the Context struct because of ABI compatibility requirements
      */
     struct Context {
         //
@@ -480,16 +479,23 @@ interface ISuperfluid {
         //
         // App context
         //
-        // app allowance granted
-        uint256 appAllowanceGranted;
-        // app allowance wanted by the app callback
-        uint256 appAllowanceWanted;
-        // app allowance used, allowing negative values over a callback session
-        int256 appAllowanceUsed;
+        // app credit granted
+        uint256 appCreditGranted;
+        // app credit wanted by the app callback
+        uint256 appCreditWantedDeprecated;
+        // app credit used, allowing negative values over a callback session
+        // the appCreditUsed value over a callback sessions is calculated with:
+        // existing flow data owed deposit + sum of the callback agreements
+        // deposit deltas 
+        // the final value used to modify the state is determined by the
+        // _adjustNewAppCreditUsed function (in AgreementLibrary.sol) which takes 
+        // the appCreditUsed value reached in the callback session and the app
+        // credit granted
+        int256 appCreditUsed;
         // app address
         address appAddress;
-        // app allowance in super token
-        ISuperfluidToken appAllowanceToken;
+        // app credit in super token
+        ISuperfluidToken appCreditToken;
     }
 
     function callAgreementWithContext(

package/contracts/mocks/AgreementMock.sol

@@ -193,10 +193,10 @@ contract AgreementMock is AgreementBase {
         return host.appCallbackPop(ctx, 0);
     }
 
-    function tryCtxUseAllowance(ISuperfluid host, bool hackCtx, bytes calldata ctx)
+    function tryCtxUseCredit(ISuperfluid host, bool hackCtx, bytes calldata ctx)
         external returns (bytes memory newCtx)
     {
-        return host.ctxUseAllowance(hackCtx ? new bytes(0) : ctx, 0, 0);
+        return host.ctxUseCredit(hackCtx ? new bytes(0) : ctx, 0);
     }
 
     function tryJailApp(ISuperfluid host, ISuperApp appMock, bool hackCtx, bytes calldata ctx)

package/contracts/mocks/CFAAppMocks.sol

@@ -12,7 +12,7 @@ import { IConstantFlowAgreementV1 } from "../interfaces/agreements/IConstantFlow
 /**
  * @dev This is a CFA SuperApp that maintains at most one inflow from a sender at any moment.
  *
- * This can test the deposit allowance logic in the deleteFlow as a recipient.
+ * This can test the deposit credit logic in the deleteFlow as a recipient.
  */
 contract ExclusiveInflowTestApp is SuperAppBase {
 

package/contracts/mocks/MultiFlowTesterApp.sol

@@ -77,7 +77,7 @@ contract MultiFlowTesterApp is SuperAppBase {
         ISuperToken superToken,
         bytes4 selector,
         int96 flowRate,
-        uint256 appAllowanceGranted,
+        uint256 appCreditGranted,
         bytes calldata ctx
     )
         private
@@ -87,21 +87,22 @@ contract MultiFlowTesterApp is SuperAppBase {
 
         newCtx = ctx;
 
-        // in case of mfa, we underutlize the app allowance for simplicity
-        int96 safeFlowRate = _cfa.getMaximumFlowRateFromDeposit(superToken, appAllowanceGranted - 1);
-        appAllowanceGranted = _cfa.getDepositRequiredForFlowRate(superToken, safeFlowRate);
+        // in case of mfa, we underutlize the app credit for simplicity
+        uint256 flowRateDeposit = _cfa.getDepositRequiredForFlowRate(superToken, flowRate);
+        int96 safeFlowRate = _cfa.getMaximumFlowRateFromDeposit(superToken, flowRateDeposit - 1);
+        appCreditGranted = _cfa.getDepositRequiredForFlowRate(superToken, safeFlowRate);
 
-        // scale the flow rate and app allowance numbers
-        appAllowanceGranted = appAllowanceGranted * configuration.ratioPct / 100;
+        // scale the flow rate and app credit numbers
+        appCreditGranted = appCreditGranted * configuration.ratioPct / 100;
         // NOTE casting to int96 is okay here because ratioPct is uint8
         flowRate = flowRate * int96(uint96(configuration.ratioPct)) / 100;
 
         for(uint256 i = 0; i < configuration.receivers.length; i++) {
             ReceiverData memory receiverData = configuration.receivers[i];
-            uint256 targetAllowance = appAllowanceGranted * receiverData.proportion / sum;
+            uint256 targetCredit = appCreditGranted * receiverData.proportion / sum;
             int96 targetFlowRate = _cfa.getMaximumFlowRateFromDeposit(
                 superToken,
-                targetAllowance
+                targetCredit
             );
             flowRate -= targetFlowRate;
             bytes memory callData = abi.encodeWithSelector(
@@ -179,7 +180,7 @@ contract MultiFlowTesterApp is SuperAppBase {
             (vars.flowSender, vars.flowReceiver) = abi.decode(agreementData, (address, address));
             assert(vars.flowSender == vars.context.msgSender);
             assert(vars.flowReceiver == address(this));
-            assert(vars.context.appAllowanceGranted > 0);
+            assert(vars.context.appCreditGranted > 0);
         }
         int96 flowRate;
         (,flowRate,,) = _cfa.getFlowByID(superToken, agreementId);
@@ -188,7 +189,7 @@ contract MultiFlowTesterApp is SuperAppBase {
             superToken,
             _cfa.createFlow.selector,
             flowRate,
-            vars.context.appAllowanceGranted,
+            vars.context.appCreditGranted,
             ctx);
     }
 
@@ -231,7 +232,7 @@ contract MultiFlowTesterApp is SuperAppBase {
             (vars.flowSender, vars.flowReceiver) = abi.decode(agreementData, (address, address));
             assert(vars.flowSender == vars.context.msgSender);
             assert(vars.flowReceiver == address(this));
-            assert(vars.context.appAllowanceGranted > 0);
+            assert(vars.context.appCreditGranted > 0);
         }
         int96 flowRate;
         (,flowRate,,) = _cfa.getFlowByID(superToken, agreementId);
@@ -240,7 +241,7 @@ contract MultiFlowTesterApp is SuperAppBase {
             superToken,
             _cfa.updateFlow.selector,
             flowRate,
-            vars.context.appAllowanceGranted,
+            vars.context.appCreditGranted,
             ctx);
     }
 

package/contracts/mocks/SuperTokenMock.sol

@@ -27,8 +27,8 @@ contract SuperTokenStorageLayoutTester is SuperToken {
         assembly { slot:= _inactiveAgreementBitmap.slot offset := _inactiveAgreementBitmap.offset }
         require (slot == 1 && offset == 0, "_inactiveAgreementBitmap changed location");
 
-        assembly { slot:= _balances.slot offset := _balances.offset }
-        require (slot == 2 && offset == 0, "_balances changed location");
+        assembly { slot:= _sharedSettledBalances.slot offset := _sharedSettledBalances.offset }
+        require (slot == 2 && offset == 0, "_sharedSettledBalances changed location");
 
         assembly { slot:= _totalSupply.slot offset := _totalSupply.offset }
         require (slot == 3 && offset == 0, "_totalSupply changed location");

package/contracts/mocks/SuperfluidMock.sol

@@ -94,35 +94,35 @@ contract SuperfluidUpgradabilityTester is Superfluid {
             assembly { dataLen := mload(dataOffset) }
             require(dataLen == 42, "userData changed location");
         }
-        // context.appAllowanceGranted
+        // context.appCreditGranted
         {
             Context memory context;
             assembly { mstore(add(context, mul(32, 6)), 42) }
-            require(context.appAllowanceGranted == 42, "appAllowanceGranted changed location");
+            require(context.appCreditGranted == 42, "appCreditGranted changed location");
         }
-        // context.appAllowanceGranted
+        // context.appCreditWantedDeprecated
         {
             Context memory context;
             assembly { mstore(add(context, mul(32, 7)), 42) }
-            require(context.appAllowanceWanted == 42, "appAllowanceWanted changed location");
+            require(context.appCreditWantedDeprecated == 42, "appCreditWantedDeprecated changed location");
         }
-        // context.appAllowanceGranted
+        // context.appCreditUsed
         {
             Context memory context;
             assembly { mstore(add(context, mul(32, 8)), 42) }
-            require(context.appAllowanceUsed == 42, "appAllowanceUsed changed location");
+            require(context.appCreditUsed == 42, "appCreditUsed changed location");
         }
-        // context.appAllowanceGranted
+        // context.appAddress
         {
             Context memory context;
             assembly { mstore(add(context, mul(32, 9)), 42) }
             require(context.appAddress == address(42), "appAddress changed location");
         }
-        // context.appAllowanceToken
+        // context.appCreditToken
         {
             Context memory context;
             assembly { mstore(add(context, mul(32, 10)), 42) }
-            require(address(context.appAllowanceToken) == address(42), "appAllowanceToken changed location");
+            require(address(context.appCreditToken) == address(42), "appCreditToken changed location");
         }
     }
 }

package/contracts/superfluid/Superfluid.sol

@@ -507,9 +507,9 @@ contract Superfluid is
     function appCallbackPush(
         bytes calldata ctx,
         ISuperApp app,
-        uint256 appAllowanceGranted,
-        int256 appAllowanceUsed,
-        ISuperfluidToken appAllowanceToken
+        uint256 appCreditGranted,
+        int256 appCreditUsed,
+        ISuperfluidToken appCreditToken
     )
         external override
         onlyAgreement
@@ -525,31 +525,29 @@ contract Superfluid is
         }
         context.appCallbackLevel++;
         context.callType = ContextDefinitions.CALL_INFO_CALL_TYPE_APP_CALLBACK;
-        context.appAllowanceGranted = appAllowanceGranted;
-        context.appAllowanceWanted = 0;
-        context.appAllowanceUsed = appAllowanceUsed;
+        context.appCreditGranted = appCreditGranted;
+        context.appCreditUsed = appCreditUsed;
         context.appAddress = address(app);
-        context.appAllowanceToken = appAllowanceToken;
+        context.appCreditToken = appCreditToken;
         appCtx = _updateContext(context);
     }
 
     function appCallbackPop(
         bytes calldata ctx,
-        int256 appAllowanceUsedDelta
+        int256 appCreditUsedDelta
     )
         external override
         onlyAgreement
         returns (bytes memory newCtx)
     {
         Context memory context = decodeCtx(ctx);
-        context.appAllowanceUsed = context.appAllowanceUsed + appAllowanceUsedDelta;
+        context.appCreditUsed += appCreditUsedDelta;
         newCtx = _updateContext(context);
     }
 
-    function ctxUseAllowance(
+    function ctxUseCredit(
         bytes calldata ctx,
-        uint256 appAllowanceWantedMore,
-        int256 appAllowanceUsedDelta
+        int256 appCreditUsedMore
     )
         external override
         onlyAgreement
@@ -557,9 +555,7 @@ contract Superfluid is
         returns (bytes memory newCtx)
     {
         Context memory context = decodeCtx(ctx);
-
-        context.appAllowanceWanted = context.appAllowanceWanted + appAllowanceWantedMore;
-        context.appAllowanceUsed = context.appAllowanceUsed + appAllowanceUsedDelta;
+        context.appCreditUsed += appCreditUsedMore;
 
         newCtx = _updateContext(context);
     }
@@ -604,11 +600,11 @@ contract Superfluid is
             msgSender: msgSender,
             agreementSelector: agreementSelector,
             userData: userData,
-            appAllowanceGranted: 0,
-            appAllowanceWanted: 0,
-            appAllowanceUsed: 0,
+            appCreditGranted: 0,
+            appCreditWantedDeprecated: 0,
+            appCreditUsed: 0,
             appAddress: address(0),
-            appAllowanceToken: ISuperfluidToken(address(0))
+            appCreditToken: ISuperfluidToken(address(0))
         }));
         bool success;
         (success, returnedData) = _callExternalWithReplacedCtx(address(agreementClass), callData, ctx);
@@ -649,11 +645,11 @@ contract Superfluid is
             msgSender: msgSender,
             agreementSelector: 0,
             userData: "",
-            appAllowanceGranted: 0,
-            appAllowanceWanted: 0,
-            appAllowanceUsed: 0,
+            appCreditGranted: 0,
+            appCreditWantedDeprecated: 0,
+            appCreditUsed: 0,
             appAddress: address(app),
-            appAllowanceToken: ISuperfluidToken(address(0))
+            appCreditToken: ISuperfluidToken(address(0))
         }));
         bool success;
         (success, returnedData) = _callExternalWithReplacedCtx(address(app), callData, ctx);
@@ -868,9 +864,9 @@ contract Superfluid is
     {
         require(context.appCallbackLevel <= MAX_APP_CALLBACK_LEVEL, "SF: APP_RULE_MAX_APP_LEVEL_REACHED");
         uint256 callInfo = ContextDefinitions.encodeCallInfo(context.appCallbackLevel, context.callType);
-        uint256 allowanceIO =
-            context.appAllowanceGranted.toUint128() |
-            (uint256(context.appAllowanceWanted.toUint128()) << 128);
+        uint256 creditIO =
+            context.appCreditGranted.toUint128() |
+            (uint256(context.appCreditWantedDeprecated.toUint128()) << 128);
         // NOTE: nested encoding done due to stack too deep error when decoding in _decodeCtx
         ctx = abi.encode(
             abi.encode(
@@ -881,10 +877,10 @@ contract Superfluid is
                 context.userData
             ),
             abi.encode(
-                allowanceIO,
-                context.appAllowanceUsed,
+                creditIO,
+                context.appCreditUsed,
                 context.appAddress,
-                context.appAllowanceToken
+                context.appCreditToken
             )
         );
         _ctxStamp = keccak256(ctx);
@@ -914,19 +910,19 @@ contract Superfluid is
             (context.appCallbackLevel, context.callType) = ContextDefinitions.decodeCallInfo(callInfo);
         }
         {
-            uint256 allowanceIO;
+            uint256 creditIO;
             (
-                allowanceIO,
-                context.appAllowanceUsed,
+                creditIO,
+                context.appCreditUsed,
                 context.appAddress,
-                context.appAllowanceToken
+                context.appCreditToken
             ) = abi.decode(ctx2, (
                 uint256,
                 int256,
                 address,
                 ISuperfluidToken));
-            context.appAllowanceGranted = allowanceIO & type(uint128).max;
-            context.appAllowanceWanted = allowanceIO >> 128;
+            context.appCreditGranted = creditIO & type(uint128).max;
+            context.appCreditWantedDeprecated = creditIO >> 128;
         }
     }
 
@@ -1019,7 +1015,7 @@ contract Superfluid is
             // NOTE: len(data) is data.length + 32 https://docs.soliditylang.org/en/latest/abi-spec.html
             // solhint-disable-next-line no-inline-assembly
             assembly { placeHolderCtxLength := mload(add(data, dataLen)) }
-            require(placeHolderCtxLength == 0, "SF: placerholder ctx should have zero length");
+            require(placeHolderCtxLength == 0, "SF: placeholder ctx should have zero length");
         }
 
         // 1.b remove the placeholder ctx
@@ -1055,7 +1051,7 @@ contract Superfluid is
     }
 
     modifier isAgreement(ISuperAgreement agreementClass) {
-        require(isAgreementClassListed(agreementClass), "SF: only listed agreeement allowed");
+        require(isAgreementClassListed(agreementClass), "SF: only listed agreement allowed");
         _;
     }
 
@@ -1065,7 +1061,7 @@ contract Superfluid is
     }
 
     modifier onlyAgreement() {
-        require(isAgreementClassListed(ISuperAgreement(msg.sender)), "SF: sender is not listed agreeement");
+        require(isAgreementClassListed(ISuperAgreement(msg.sender)), "SF: sender is not listed agreement");
         _;
     }
 

package/contracts/superfluid/SuperfluidToken.sol

@@ -30,8 +30,8 @@ abstract contract SuperfluidToken is ISuperfluidToken
     /// @dev Active agreement bitmap
     mapping(address => uint256) internal _inactiveAgreementBitmap;
 
-    /// @dev Settled balance for the account
-    mapping(address => int256) internal _balances;
+    /// @dev Shared Settled balance for the account
+    mapping(address => int256) internal _sharedSettledBalances;
 
     /// @dev Total supply
     uint256 internal _totalSupply;
@@ -79,7 +79,7 @@ abstract contract SuperfluidToken is ISuperfluidToken
            uint256 deposit,
            uint256 owedDeposit)
     {
-        availableBalance = _balances[account];
+        availableBalance = _sharedSettledBalances[account];
         ISuperAgreement[] memory activeAgreements = getAccountActiveAgreements(account);
         for (uint256 i = 0; i < activeAgreements.length; i++) {
             (
@@ -185,7 +185,7 @@ abstract contract SuperfluidToken is ISuperfluidToken
     )
         internal
     {
-        _balances[account] = _balances[account] + amount.toInt256();
+        _sharedSettledBalances[account] = _sharedSettledBalances[account] + amount.toInt256();
         _totalSupply = _totalSupply + amount;
     }
 
@@ -197,7 +197,7 @@ abstract contract SuperfluidToken is ISuperfluidToken
     {
         (int256 availableBalance,,) = realtimeBalanceOf(account, _host.getNow());
         require(availableBalance >= amount.toInt256(), "SuperfluidToken: burn amount exceeds balance");
-        _balances[account] = _balances[account] - amount.toInt256();
+        _sharedSettledBalances[account] = _sharedSettledBalances[account] - amount.toInt256();
         _totalSupply = _totalSupply - amount;
     }
 
@@ -210,8 +210,8 @@ abstract contract SuperfluidToken is ISuperfluidToken
     {
         (int256 availableBalance,,) = realtimeBalanceOf(from, _host.getNow());
         require(availableBalance >= amount, "SuperfluidToken: move amount exceeds balance");
-        _balances[from] = _balances[from] - amount;
-        _balances[to] = _balances[to] + amount;
+        _sharedSettledBalances[from] = _sharedSettledBalances[from] - amount;
+        _sharedSettledBalances[to] = _sharedSettledBalances[to] + amount;
     }
 
     function _getRewardAccount() internal view returns (address rewardAccount) {
@@ -311,7 +311,7 @@ abstract contract SuperfluidToken is ISuperfluidToken
         external override
         onlyAgreement
     {
-        _balances[account] = _balances[account] + delta;
+        _sharedSettledBalances[account] = _sharedSettledBalances[account] + delta;
     }
 
     /// @dev ISuperfluidToken.makeLiquidationPayoutsV2 implementation
@@ -338,17 +338,17 @@ abstract contract SuperfluidToken is ISuperfluidToken
             // LIKELY BRANCH: target account pays penalty to rewarded account
             assert(rewardAmount.toInt256() == -targetAccountBalanceDelta);
 
-            _balances[rewardAmountReceiver] += rewardAmount.toInt256();
-            _balances[targetAccount] += targetAccountBalanceDelta;
+            _sharedSettledBalances[rewardAmountReceiver] += rewardAmount.toInt256();
+            _sharedSettledBalances[targetAccount] += targetAccountBalanceDelta;
             EventsEmitter.emitTransfer(targetAccount, rewardAmountReceiver, rewardAmount);
         } else {
             // LESS LIKELY BRANCH: target account is bailed out
             // NOTE: useDefaultRewardAccount being true is undefined behavior
             // because the default reward account isn't receiving the rewardAmount by default
             assert(!useDefaultRewardAccount);
-            _balances[rewardAccount] -= (rewardAmount.toInt256() + targetAccountBalanceDelta);
-            _balances[liquidatorAccount] += rewardAmount.toInt256();
-            _balances[targetAccount] += targetAccountBalanceDelta;
+            _sharedSettledBalances[rewardAccount] -= (rewardAmount.toInt256() + targetAccountBalanceDelta);
+            _sharedSettledBalances[liquidatorAccount] += rewardAmount.toInt256();
+            _sharedSettledBalances[targetAccount] += targetAccountBalanceDelta;
             EventsEmitter.emitTransfer(rewardAccount, liquidatorAccount, rewardAmount);
             EventsEmitter.emitTransfer(rewardAccount, targetAccount, uint256(targetAccountBalanceDelta));
         }
@@ -372,7 +372,7 @@ abstract contract SuperfluidToken is ISuperfluidToken
     modifier onlyAgreement() {
         require(
             _host.isAgreementClassListed(ISuperAgreement(msg.sender)),
-            "SuperfluidToken: only listed agreeement");
+            "SuperfluidToken: only listed agreement");
         _;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@superfluid-finance/ethereum-contracts",
-    "version": "1.3.2-dev.bf84335.0",
+    "version": "1.3.2-dev.de7575d.0",
     "description": " Ethereum contracts implementation for the Superfluid Protocol",
     "homepage": "https://github.com/superfluid-finance/protocol-monorepo/tree/dev/packages/ethereum-contracts#readme",
     "repository": {
@@ -57,7 +57,7 @@
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
         "@openzeppelin/contracts": "4.7.0",
-        "@superfluid-finance/js-sdk": "^0.6.3-dev.bf84335.0",
+        "@superfluid-finance/js-sdk": "^0.6.4-dev.de7575d.0",
         "@truffle/contract": "4.5.15",
         "ethereumjs-tx": "2.1.2",
         "ethereumjs-util": "7.1.5",

package/scripts/deploy-mfa.ts

@@ -0,0 +1,27 @@
+import {ethers} from "hardhat";
+
+const deployMFA = async () => {
+    const provider = new ethers.providers.JsonRpcProvider(
+        "http://127.0.0.1:8545/"
+    );
+    const signer = provider.getSigner(
+        "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+    );
+    const MFAContractFactory = await ethers.getContractFactory(
+        "MultiFlowTesterApp"
+    );
+    const mfa = await MFAContractFactory.connect(signer).deploy(
+        "0x9bd03768a7DCc129555dE410FF8E85528A4F88b5",
+        "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853"
+    );
+    console.log("MFA deployed at:", mfa.address);
+};
+
+deployMFA()
+    .then(() => {
+        process.exit(0);
+    })
+    .catch((err) => {
+        console.error(err);
+        process.exit(1);
+    });

package/scripts/libs/getConfig.js

@@ -140,6 +140,13 @@ module.exports = function getConfig(chainId) {
                 getLogsRange: 50000,
             },
         },
+        420: {
+            // optimism testnet (goerli)
+            data: {
+                initialBlockNumber: 340000,
+                getLogsRange: 50000,
+            },
+        },
 
         //
         // Arbitrum: https://developer.offchainlabs.com
@@ -165,6 +172,13 @@ module.exports = function getConfig(chainId) {
                 getLogsRange: 50000,
             },
         },
+        421613: {
+            // arbitrum testnet (goerli)
+            data: {
+                initialBlockNumber: 93000,
+                getLogsRange: 50000,
+            },
+        },
 
         //
         // ARTIS

package/utils/README.md

@@ -25,3 +25,21 @@ Alternatively, you can also find it on IPFS: [QmRJmHatYiGgGsXYCsYZdqPMx4dd2qbMsk
 
 In order to set the parameter in the URL, use this format:
 stream-closer.html?chainId=<chainId>&token=<tokenAddress>&sender=<senderAddress>&receiver=<receiverAddress>
+
+## MFA Tester
+
+This is a single-file dApp for testing the MultiFlowTesterApp contract.
+
+There are a few steps to complete to get everything up and running:
+1. Open a terminal window and start a hardhat node instance: `npx hardhat node` in `packages/ethereum-contracts`
+2. Open another terminal window and deploy contracts and token: `yarn deploy-contracts-local` in `packages/subgraph`
+3. Deploy MFA contract: `npx hardhat run scripts/deploy-mfa.ts` in `packages/ethereum-contracts`
+4. Build SDK-Core: `yarn build` in `packages/sdk-core` and copy `packages/sdk-core/dist/index.umd.js` into `packages/ethereum-contracts/utils/dist`.
+
+> NOTE: There are hardcoded addresses for the resolver and MFA in mfa-tester.html, make sure that these addresses are in sync with what is deployed otherwise it won't work.
+
+If you have python installed, you can start a webserver with the document root set to the current directory with
+```python
+python -m SimpleHTTPServer 1337
+```
+Then navigate to http://localhost:1337/mfa-tester.html