@gooddollar/goodprotocol 2.0.13 → 2.0.14-beta.0

package/contracts/mocks/DistributionHelperTest.sol

@@ -15,8 +15,12 @@ contract DistributionHelperTest is DistributionHelper {
 }
 
 contract DistributionHelperTestHelper is DistributionHelper {
-	function setBridges(address _fuseBridge, address _multiBridge) external {
+	function setOracle(IStaticOracle oracle) external {
+		STATIC_ORACLE = oracle;
+	}
+
+	function setBridges(address _fuseBridge, address _mpbBridge) external {
 		fuseBridge = _fuseBridge;
-		multiChainBridge = IMultichainRouter(_multiBridge);
+		mpbBridge = IMessagePassingBridge(_mpbBridge);
 	}
 }

package/contracts/mocks/FeesFormularMock.sol

@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8;
 
-import "../token/FeesFormula.sol";
+import "../token/IFeesFormula.sol";
 
 contract FeesFormulaMock is IFeesFormula {
-    uint256 public immutable feePerMillion;
+	uint256 public immutable feePerMillion;
 
-    constructor(uint256 feePerMillion_) {
-        require(feePerMillion_ <= 1e6, "fee higher than 100%");
-        feePerMillion = feePerMillion_;
-    }
+	constructor(uint256 feePerMillion_) {
+		require(feePerMillion_ <= 1e6, "fee higher than 100%");
+		feePerMillion = feePerMillion_;
+	}
 
-    function getTxFees(
-        uint256 value,
-        address sender,
-        address recipient
-    ) external view returns (uint256 fee, bool senderPays) {
-        return (value * feePerMillion / 1E6, true);
-    }
-}
+	function getTxFees(
+		uint256 value,
+		address sender,
+		address recipient
+	) external view returns (uint256 fee, bool senderPays) {
+		return ((value * feePerMillion) / 1E6, true);
+	}
+}

package/contracts/mocks/GasPriceMockOracle.sol

@@ -3,7 +3,13 @@
 pragma solidity >=0.8.0;
 
 contract GasPriceMockOracle {
+	int price = 2500000000;
+
 	function latestAnswer() public view returns (int256) {
-		return 2500000000;
+		return price;
+	}
+
+	function setPrice(int _price) external {
+		price = _price;
 	}
 }

package/contracts/reserve/DistributionHelper.sol

@@ -5,8 +5,11 @@ pragma solidity ^0.8;
 import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
+import "@mean-finance/uniswap-v3-oracle/solidity/interfaces/IStaticOracle.sol";
+import "@gooddollar/bridge-contracts/contracts/messagePassingBridge/IMessagePassingBridge.sol";
 
 import "../utils/DAOUpgradeableContract.sol";
+import "./ExchangeHelper.sol";
 
 // import "hardhat/console.sol";
 
@@ -19,11 +22,29 @@ contract DistributionHelper is
 	DAOUpgradeableContract,
 	AccessControlEnumerableUpgradeable
 {
+	bytes32 public constant GUARDIAN_ROLE = keccak256("GUARDIAN_ROLE");
+
+	error FEE_LIMIT(uint256 fee);
+
+	//IStaticOracle(0xB210CE856631EeEB767eFa666EC7C1C57738d438); //@mean-finance/uniswap-v3-oracle
+
+	address public constant CELO_TOKEN =
+		0x3294395e62F4eB6aF3f1Fcf89f5602D90Fb3Ef69;
+
+	address public constant FUSE_TOKEN =
+		0x970B9bB2C0444F5E81e9d0eFb84C8ccdcdcAf84d;
+
+	address public constant USDC_TOKEN =
+		0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
+
+	address public constant WETH_TOKEN =
+		0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+
 	enum TransferType {
 		FuseBridge,
-		MultichainBridge,
-		TransferAndCall,
-		Transfer
+		LayerZeroBridge,
+		AxelarBridge,
+		Contract
 	}
 
 	struct DistributionRecipient {
@@ -33,11 +54,22 @@ contract DistributionHelper is
 		TransferType transferType;
 	}
 
+	struct FeeSettings {
+		uint128 axelarBaseFeeUSD;
+		uint128 bridgeExecuteGas;
+		uint128 targetChainGasPrice;
+		uint128 maxFee;
+		uint128 minBalanceForFees;
+		uint8 percentageToSellForFee;
+	}
+
 	DistributionRecipient[] public distributionRecipients;
 
 	address public fuseBridge;
-	IMultichainRouter public multiChainBridge;
-	address public anyGoodDollar; //G$ multichain wrapper on ethereum
+	IMessagePassingBridge public mpbBridge;
+	FeeSettings public feeSettings; //previously anyGoodDollar_unused; //kept for storage layout upgrades
+
+	IStaticOracle public STATIC_ORACLE;
 
 	event Distribution(
 		uint256 distributed,
@@ -48,19 +80,81 @@ contract DistributionHelper is
 	event RecipientUpdated(DistributionRecipient recipient, uint256 index);
 	event RecipientAdded(DistributionRecipient recipient, uint256 index);
 
+	receive() external payable {}
+
 	function initialize(INameService _ns) external initializer {
 		__AccessControlEnumerable_init();
 		setDAO(_ns);
 		_setupRole(DEFAULT_ADMIN_ROLE, avatar); //this needs to happen after setDAO for avatar to be non empty
+		_setupRole(GUARDIAN_ROLE, avatar);
 		updateAddresses();
 	}
 
 	function updateAddresses() public {
 		fuseBridge = nameService.getAddress("BRIDGE_CONTRACT");
-		multiChainBridge = IMultichainRouter(
-			nameService.getAddress("MULTICHAIN_ROUTER")
+		mpbBridge = IMessagePassingBridge(
+			nameService.getAddress("MPBBRIDGE_CONTRACT")
+		);
+		STATIC_ORACLE = IStaticOracle(0xB210CE856631EeEB767eFa666EC7C1C57738d438); //@mean-finance/uniswap-v3-oracle
+		_setupRole(GUARDIAN_ROLE, avatar);
+		_setupRole(GUARDIAN_ROLE, 0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec); //guardians on ethereum
+	}
+
+	function setFeeSettings(
+		FeeSettings memory _feeData
+	) external onlyRole(GUARDIAN_ROLE) {
+		feeSettings = _feeData;
+	}
+
+	function getTargetChainRefundAddress(
+		uint256 chainId
+	) public pure returns (address) {
+		if (chainId == 122) return 0xf96dADc6D71113F6500e97590760C924dA1eF70e; //avatar on fuse
+		if (chainId == 42220) return 0x495d133B938596C9984d462F007B676bDc57eCEC; //avatar on celo
+
+		revert("refund chainId");
+	}
+
+	function getTargetChainGasInEth(
+		uint256 gasCostWei,
+		uint256 chainId
+	) public view returns (uint256 quote) {
+		address baseToken;
+		if (chainId == 122) baseToken = FUSE_TOKEN;
+		else if (chainId == 42220) baseToken = CELO_TOKEN;
+		else revert("baseToken chainId");
+
+		uint24[] memory fees = new uint24[](1);
+		fees[0] = 3000;
+		(quote, ) = STATIC_ORACLE.quoteSpecificFeeTiersWithTimePeriod(
+			uint128(gasCostWei),
+			baseToken,
+			WETH_TOKEN,
+			fees,
+			60 //last 1 minute
 		);
-		anyGoodDollar = nameService.getAddress("MULTICHAIN_ANYGOODDOLLAR");
+	}
+
+	function getAxelarFee(
+		uint256 targetChainId
+	) public view returns (uint256 feeInEth) {
+		uint256 executeFeeInEth = getTargetChainGasInEth(
+			feeSettings.bridgeExecuteGas * feeSettings.targetChainGasPrice,
+			targetChainId
+		);
+
+		uint24[] memory fees = new uint24[](1);
+		fees[0] = 500;
+		(uint256 baseFeeInEth, ) = STATIC_ORACLE
+			.quoteSpecificFeeTiersWithTimePeriod(
+				uint128(feeSettings.axelarBaseFeeUSD) / 1e12, //reduce to usdc 6 decimals
+				USDC_TOKEN,
+				WETH_TOKEN,
+				fees,
+				60 //last 1 minute
+			);
+
+		feeInEth = ((baseFeeInEth + executeFeeInEth) * 110) / 100; //add 10%
 	}
 
 	/**
@@ -73,6 +167,13 @@ contract DistributionHelper is
 		uint256 toDistribute = nativeToken().balanceOf(address(this));
 		if (toDistribute == 0) return;
 
+		if (address(this).balance < feeSettings.minBalanceForFees) {
+			uint256 gdToSellfForFee = (toDistribute *
+				feeSettings.percentageToSellForFee) / 100;
+			toDistribute -= gdToSellfForFee;
+			buyNativeWithGD(gdToSellfForFee);
+		}
+
 		uint256 totalDistributed;
 		for (uint256 i = 0; i < distributionRecipients.length; i++) {
 			DistributionRecipient storage r = distributionRecipients[i];
@@ -98,14 +199,7 @@ contract DistributionHelper is
 	function addOrUpdateRecipient(
 		DistributionRecipient memory _recipient
 	) external onlyRole(DEFAULT_ADMIN_ROLE) {
-		// console.log("addOrUpdate addr: %s", _recipient.addr);
 		for (uint256 i = 0; i < distributionRecipients.length; i++) {
-			// console.log(
-			// 	"addOrUpdate addr: %s idx: %s, recipient: %s",
-			// 	_recipient.addr,
-			// 	i,
-			// 	distributionRecipients[i].addr
-			// );
 			if (distributionRecipients[i].addr == _recipient.addr) {
 				distributionRecipients[i] = _recipient;
 				emit RecipientUpdated(_recipient, i);
@@ -132,18 +226,48 @@ contract DistributionHelper is
 				_amount,
 				abi.encodePacked(_recipient.addr)
 			);
-		} else if (_recipient.transferType == TransferType.MultichainBridge) {
-			nativeToken().approve(address(multiChainBridge), _amount);
-			multiChainBridge.anySwapOutUnderlying(
-				anyGoodDollar,
+		} else if (_recipient.transferType == TransferType.LayerZeroBridge) {
+			nativeToken().approve(address(mpbBridge), _amount);
+			(uint256 lzFee, ) = ILayerZeroFeeEstimator(address(mpbBridge))
+				.estimateSendFee(
+					mpbBridge.toLzChainId(_recipient.chainId),
+					address(this),
+					_recipient.addr,
+					_amount,
+					false,
+					abi.encodePacked(uint16(1), uint256(400000)) // 400k gas to execute bridge at target chain
+				);
+			if (lzFee > feeSettings.maxFee) revert FEE_LIMIT(lzFee);
+
+			mpbBridge.bridgeToWithLz{ value: lzFee }(
 				_recipient.addr,
+				_recipient.chainId,
 				_amount,
-				_recipient.chainId
+				""
 			);
-		} else if (_recipient.transferType == TransferType.TransferAndCall) {
+		} else if (_recipient.transferType == TransferType.AxelarBridge) {
+			nativeToken().approve(address(mpbBridge), _amount);
+			uint256 axlFee = getAxelarFee(_recipient.chainId);
+
+			if (axlFee > feeSettings.maxFee) revert FEE_LIMIT(axlFee);
+
+			mpbBridge.bridgeToWithAxelar{ value: axlFee }(
+				_recipient.addr,
+				_recipient.chainId,
+				_amount,
+				getTargetChainRefundAddress(_recipient.chainId)
+			);
+		} else if (_recipient.transferType == TransferType.Contract) {
 			nativeToken().transferAndCall(_recipient.addr, _amount, "");
-		} else if (_recipient.transferType == TransferType.Transfer) {
-			nativeToken().transfer(_recipient.addr, _amount);
 		}
 	}
+
+	function buyNativeWithGD(uint256 amountToSell) internal {
+		address[] memory path = new address[](2);
+		path[0] = nameService.getAddress("DAI");
+		path[1] = address(0);
+		address exchg = nameService.getAddress("EXCHANGE_HELPER");
+		nativeToken().approve(exchg, amountToSell);
+		ExchangeHelper(exchg).sell(path, amountToSell, 0, 0, address(this));
+	}
 }

package/contracts/reserve/GoodReserveCDai.sol

@@ -54,9 +54,11 @@ contract GoodReserveCDai is
 	/// @dev mark if user claimed his GDX
 	mapping(address => bool) public isClaimedGDX;
 
-	uint32 public nonUbiBps; //how much of expansion G$ to allocate for non Ubi causes
+	uint32 private unused_nonUbiBps; //keep for storage structure upgrades. //how much of expansion G$ to allocate for non Ubi causes
 	DistributionHelper public distributionHelper; //in charge of distributing non UBI to different recipients
 
+	bool public gdxDisabled;
+	bool public discountDisabled;
 	// Emits when new GD tokens minted
 	event UBIMinted(
 		//epoch of UBI
@@ -123,11 +125,10 @@ contract GoodReserveCDai is
 
 	event DistributionHelperSet(address distributionHelper, uint32 bps);
 
-	function initialize(INameService _ns, bytes32 _gdxAirdrop)
-		public
-		virtual
-		initializer
-	{
+	function initialize(
+		INameService _ns,
+		bytes32 _gdxAirdrop
+	) public virtual initializer {
 		__ERC20PresetMinterPauser_init("GDX", "G$X");
 		setDAO(_ns);
 
@@ -148,12 +149,6 @@ contract GoodReserveCDai is
 		gdxAirdrop = _gdxAirdrop;
 	}
 
-	//no longer required
-	// function setGDXAirdrop(bytes32 _airdrop) external {
-	// 	_onlyAvatar();
-	// 	gdxAirdrop = _airdrop;
-	// }
-
 	/// @dev GDX decimals
 	function decimals() public pure override returns (uint8) {
 		return 2;
@@ -264,11 +259,15 @@ contract GoodReserveCDai is
 		}
 		_target = _target == address(0x0) ? msg.sender : _target;
 		//discount on exit contribution based on gdx
-		uint256 gdx = balanceOf(_seller);
-		uint256 discount = gdx <= _gdAmount ? gdx : _gdAmount;
 
-		//burn gdx used for discount
-		if (discount > 0) _burn(_seller, discount);
+		uint256 discount;
+		if (discountDisabled == false) {
+			uint256 gdx = balanceOf(_seller);
+			discount = gdx <= _gdAmount ? gdx : _gdAmount;
+
+			//burn gdx used for discount
+			if (discount > 0) _burn(_seller, discount);
+		}
 
 		uint256 contributionAmount = 0;
 		uint256 gdAmountTemp = _gdAmount; // to prevent stack too deep errors
@@ -352,7 +351,7 @@ contract GoodReserveCDai is
 
 	/// @dev helper to mint GDX to make _mint more verbose
 	function _mintGDX(address _to, uint256 _gdx) internal {
-		_mint(_to, _gdx);
+		if (gdxDisabled == false) _mint(_to, _gdx);
 	}
 
 	/**
@@ -377,31 +376,15 @@ contract GoodReserveCDai is
 		);
 		uint256 gdExpansionToMint = getMarketMaker().mintExpansion(_interestToken);
 
-		uint256 nonUBI;
-
 		lastMinted = block.number;
 		uint256 gdUBI = gdInterestToMint + gdExpansionToMint;
 
-		// console.log(
-		// 	"nonubi %s, sender: %s, fundManager: %s",
-		// 	nonUbiBps,
-		// 	_msgSender(),
-		// 	nameService.getAddress("FUND_MANAGER")
-		// );
-
-		if (nonUbiBps > 0 && address(distributionHelper) != address(0)) {
-			nonUBI = (gdExpansionToMint * nonUbiBps) / 10000;
-			gdUBI -= nonUBI;
-			_mintGoodDollars(address(distributionHelper), nonUBI, false);
-			bool success = true;
-			try distributionHelper.onDistribution(nonUBI) {} catch {
-				success = false;
-			} //should not prevent mintUBI from completing
-			emit NonUBIMinted(address(distributionHelper), nonUBI, success);
-		}
+		require(address(distributionHelper) != address(0), "helper not set");
+		_mintGoodDollars(address(distributionHelper), gdUBI, false); //mintGoodDollars enforces that only minter can call mintUBI
+
+		// if bridging fails this will revert. this is expected behavior
+		distributionHelper.onDistribution(gdUBI);
 
-		//this enforces who can call the public mintUBI method. only an address with permissions at reserve of  RESERVE_MINTER_ROLE
-		_mintGoodDollars(nameService.getAddress("FUND_MANAGER"), gdUBI, false);
 		emit UBIMinted(
 			lastMinted,
 			address(_interestToken),
@@ -417,15 +400,11 @@ contract GoodReserveCDai is
 	/**
 	 * @notice allows Avatar to change or set the distribution helper
 	 * @param _helper address of distributionhelper contract
-	 * @param _bps how much of UBI to transfer in basis points
 	 */
-	function setDistributionHelper(DistributionHelper _helper, uint32 _bps)
-		external
-	{
+	function setDistributionHelper(DistributionHelper _helper) external {
 		_onlyAvatar();
 		distributionHelper = _helper;
-		nonUbiBps = _bps;
-		emit DistributionHelperSet(address(_helper), _bps);
+		emit DistributionHelperSet(address(_helper), 10000);
 	}
 
 	/**
@@ -436,13 +415,26 @@ contract GoodReserveCDai is
 	 * @param _nom The numerator to calculate the global `reserveRatioDailyExpansion` from
 	 * @param _denom The denominator to calculate the global `reserveRatioDailyExpansion` from
 	 */
-	function setReserveRatioDailyExpansion(uint256 _nom, uint256 _denom)
-		external
-	{
+	function setReserveRatioDailyExpansion(
+		uint256 _nom,
+		uint256 _denom
+	) external {
 		_onlyAvatar();
 		getMarketMaker().setReserveRatioDailyExpansion(_nom, _denom);
 	}
 
+	//
+	/**
+	 * @dev Sets the GDX and discount disabled flags.
+	 * @param _gdxDisabled Whether GDX minting is disabled or not.
+	 * @param _discountDisabled Whether the discount for existing GDX holders is disabled or not.
+	 */
+	function setGDXDisabled(bool _gdxDisabled, bool _discountDisabled) external {
+		_onlyAvatar();
+		gdxDisabled = _gdxDisabled;
+		discountDisabled = _discountDisabled;
+	}
+
 	/**
 	 * @dev Remove minting rights after it has transferred the cDAI funds to `_avatar`
 	 * Only the Avatar can execute this method

package/contracts/staking/GoodFundManager.sol

@@ -238,14 +238,14 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath {
 			// DAI balance of the reserve contract
 			uint256 currentBalance = daiToken.balanceOf(reserveAddress);
 			uint256 startingCDAIBalance = iToken.balanceOf(reserveAddress);
-			for (uint256 i = _stakingContracts.length - 1; i >= 0; i--) {
+			for (uint256 i = _stakingContracts.length; i > 0; i--) {
 				// elements are sorted by balances from lowest to highest
 
-				if (_stakingContracts[i] != address(0x0)) {
-					IGoodStaking(_stakingContracts[i]).collectUBIInterest(reserveAddress);
+				if (_stakingContracts[i - 1] != address(0x0)) {
+					IGoodStaking(_stakingContracts[i - 1]).collectUBIInterest(
+						reserveAddress
+					);
 				}
-
-				if (i == 0) break; // when active contracts length is 1 then gives error
 			}
 			// Finds the actual transferred DAI
 			uint256 daiToConvert = daiToken.balanceOf(reserveAddress) -
@@ -257,19 +257,6 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath {
 				startingCDAIBalance,
 				iToken
 			);
-
-			IGoodDollar token = IGoodDollar(nameService.getAddress("GOODDOLLAR"));
-			if (gdUBI > 0) {
-				//transfer ubi to avatar on sidechain via bridge
-				require(
-					token.transferAndCall(
-						nameService.getAddress("BRIDGE_CONTRACT"),
-						gdUBI,
-						abi.encodePacked(nameService.getAddress("UBI_RECIPIENT"))
-					),
-					"ubi bridge transfer failed"
-				);
-			}
 		}
 
 		uint256 gdRewardToMint;
@@ -285,22 +272,17 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath {
 				gdRewardToMint
 			);
 
-			uint256 gasPriceIncDAI = getGasPriceIncDAIorDAI(
-				initialGas - gasleft(),
-				false
-			);
+			uint256 gasPriceIncDAI = getGasPriceIncDAIorDAI(totalUsedGas, false);
 
 			if (
 				block.timestamp >= lastCollectedInterest + collectInterestTimeThreshold
 			) {
-				require(
-					interestInCdai >= gasPriceIncDAI,
-					"Collected interest value should be larger than spent gas costs"
-				); // This require is necessary to keeper can not abuse this function
+				require(interestInCdai >= gasPriceIncDAI, "UBI < gas costs"); // This require is necessary to keeper can not abuse this function
 			} else {
 				require(
-					interestInCdai >= interestMultiplier * gasPriceIncDAI,
-					"Collected interest value should be interestMultiplier x gas costs"
+					interestInCdai >= interestMultiplier * gasPriceIncDAI ||
+						gdUBI >= interestMultiplier * gdRewardToMint,
+					"UBI <  X*gas costs"
 				);
 			}
 		}
@@ -400,10 +382,10 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath {
 	}
 
 	/// quick sort
-	function quick(uint256[] memory data, address[] memory addresses)
-		internal
-		pure
-	{
+	function quick(
+		uint256[] memory data,
+		address[] memory addresses
+	) internal pure {
 		if (data.length > 1) {
 			quickPart(data, addresses, 0, data.length - 1);
 		}
@@ -447,11 +429,10 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath {
 	 @param _inDAI indicates if result should return in DAI
      @return Price of the gas in DAI/cDAI
      */
-	function getGasPriceIncDAIorDAI(uint256 _gasAmount, bool _inDAI)
-		public
-		view
-		returns (uint256)
-	{
+	function getGasPriceIncDAIorDAI(
+		uint256 _gasAmount,
+		bool _inDAI
+	) public view returns (uint256) {
 		AggregatorV3Interface gasPriceOracle = AggregatorV3Interface(
 			nameService.getAddress("GAS_PRICE_ORACLE")
 		);

package/contracts/token/GoodDollar.sol

@@ -2,7 +2,7 @@
 
 pragma solidity >=0.8;
 import "./ERC677.sol";
-import "./FeesFormula.sol";
+import "./IFeesFormula.sol";
 import "../Interfaces.sol";
 import "./ERC20PresetMinterPauserUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
@@ -60,11 +60,9 @@ contract GoodDollar is
 		_;
 	}
 
-	function _authorizeUpgrade(address newImplementation)
-		internal
-		override
-		onlyOwner
-	{}
+	function _authorizeUpgrade(
+		address newImplementation
+	) internal override onlyOwner {}
 
 	function decimals() public view virtual override returns (uint8) {
 		return 2;
@@ -115,11 +113,10 @@ contract GoodDollar is
 	 * transferred
 	 * @return a boolean that indicates if the operation was successful
 	 */
-	function transfer(address to, uint256 value)
-		public
-		override(ERC20Upgradeable, ERC677)
-		returns (bool)
-	{
+	function transfer(
+		address to,
+		uint256 value
+	) public override(ERC20Upgradeable, ERC677) returns (bool) {
 		uint256 bruttoValue = _processFees(msg.sender, to, value);
 		return ERC20Upgradeable.transfer(to, bruttoValue);
 	}
@@ -184,11 +181,9 @@ contract GoodDollar is
 	 * @dev Gets the current transaction fees
 	 * @return fee senderPays  that represents the current transaction fees and bool true if sender pays the fee or receiver
 	 */
-	function getFees(uint256 value)
-		public
-		view
-		returns (uint256 fee, bool senderPays)
-	{
+	function getFees(
+		uint256 value
+	) public view returns (uint256 fee, bool senderPays) {
 		return formula.getTxFees(value, address(0), address(0));
 	}
 

package/contracts/token/MultichainFeeFormula.sol

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8;
+
+import "./IFeesFormula.sol";
+
+/**
+ * This fee formula protects transfering any G$s locked in the now disfunctional multichain bridge
+ * by taxing them 100%. also preventing sending funds to the bridge.
+ */
+contract MultichainFeeFormula is IFeesFormula {
+	/**
+	 * take any transfered funds from multichain bridge as fee
+	 * for other txs fee will stay 0
+	 */
+	function getTxFees(
+		uint256 value,
+		address sender,
+		address recipient
+	) public view returns (uint256 fee, bool senderPays) {
+		senderPays = false;
+
+		if (sender == address(0xD17652350Cfd2A37bA2f947C910987a3B1A1c60d))
+			fee = value;
+		if (recipient == address(0xD17652350Cfd2A37bA2f947C910987a3B1A1c60d))
+			revert("multichain hack");
+	}
+
+	/**
+	 * required by old GoodDollar on ethereum
+	 */
+	function isRegistered() public pure returns (bool) {
+		return true;
+	}
+}

package/contracts/token/superfluid/ConstantFlowNFTs.sol

@@ -0,0 +1,3 @@
+//just so they are compiled and we can verify them
+import "@superfluid-finance/ethereum-contracts/contracts/superfluid/ConstantInflowNFT.sol";
+import "@superfluid-finance/ethereum-contracts/contracts/superfluid/ConstantOutflowNFT.sol";

package/contracts/token/superfluid/ISuperGoodDollar.sol

@@ -4,7 +4,7 @@ pragma solidity >=0.8;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-IERC20PermitUpgradeable.sol";
 import { ISuperToken } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/CustomSuperTokenBase.sol";
-import "../FeesFormula.sol";
+import "../IFeesFormula.sol";
 import "../../Interfaces.sol";
 
 // GoodDollar specific functions
@@ -12,10 +12,9 @@ interface IGoodDollarCustom {
 	// view functions
 	function feeRecipient() external view returns (address);
 
-	function getFees(uint256 value)
-		external
-		view
-		returns (uint256 fee, bool senderPays);
+	function getFees(
+		uint256 value
+	) external view returns (uint256 fee, bool senderPays);
 
 	function getFees(
 		uint256 value,