@gooddollar/goodprotocol 1.0.19-beta.3 → 1.0.20

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
-}

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.json

@@ -1,59 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IRouter",
-  "sourceName": "contracts/utils/GoodDollarMintBurnWrapper.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "burn",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "mint",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
-}

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.json

@@ -1,69 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "PausableControl",
-  "sourceName": "contracts/utils/GoodDollarMintBurnWrapper.sol",
-  "abi": [
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Paused",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        }
-      ],
-      "name": "Unpaused",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "PAUSE_ALL_ROLE",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "bytes32",
-          "name": "role",
-          "type": "bytes32"
-        }
-      ],
-      "name": "paused",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
-}

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.json

@@ -1,10 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "TokenOperation",
-  "sourceName": "contracts/utils/GoodDollarMintBurnWrapper.sol",
-  "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a332b73371a63f2f25f3d6b5406d03e25bcedb5fec46ac37352e3a622dbee87864736f6c63430008080033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220a332b73371a63f2f25f3d6b5406d03e25bcedb5fec46ac37352e3a622dbee87864736f6c63430008080033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/contracts/governance/GoodDollarStaking.sol

@@ -1,260 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.8.0;
-
-import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
-import "../utils/DAOUpgradeableContract.sol";
-import "../utils/NameService.sol";
-import "../Interfaces.sol";
-import "../DAOStackInterfaces.sol";
-import "./MultiBaseGovernanceShareField.sol";
-import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
-import "../staking/utils/StakingRewardsFixedAPY.sol";
-
-interface RewardsMinter {
-	function sendOrMint(address to, uint256 amount) external returns (uint256);
-}
-
-/**
- * @title Staking contract that allows citizens to stake G$ to get GOOD + G$ rewards
- * it implements
- */
-contract GoodDollarStaking is
-	ERC20Upgradeable,
-	MultiBaseGovernanceShareField,
-	DAOUpgradeableContract,
-	ReentrancyGuardUpgradeable,
-	StakingRewardsFixedAPY
-{
-	// Token address
-	ERC20 token;
-
-	uint128 public numberOfBlocksPerYear;
-
-	/**
-	 * @dev Emitted when `staker` earns an `amount` of GOOD tokens
-	 */
-	event ReputationEarned(address indexed staker, uint256 amount);
-
-	/**
-	 * @dev Emitted when `staker` stakes an `amount` of GoodDollars
-	 */
-	event Staked(address indexed staker, uint256 amount);
-
-	/**
-	 * @dev Emitted when `staker` withdraws an `amount` of staked GoodDollars
-	 */
-	event StakeWithdraw(address indexed staker, uint256 amount);
-
-	/**
-	 * @dev Constructor
-	 * @param _ns The address of the INameService contract
-	 */
-	constructor(
-		INameService _ns,
-		uint128 _interestRatePerBlock,
-		uint128 _numberOfBlocksPerYear
-	) StakingRewardsFixedAPY(_interestRatePerBlock) {
-		setDAO(_ns);
-		require(
-			nameService.getAddress("MintBurnWrapper") != address(0),
-			"rewards minter not set"
-		);
-		numberOfBlocksPerYear = _numberOfBlocksPerYear;
-		token = ERC20(nameService.getAddress("GOODDOLLAR"));
-		__ERC20_init("G$ Savings", "svG$");
-		rewardsPerBlock[address(this)] = (2 ether * 1e6) / getChainBlocksPerMonth(); // (2M monthly GDAO as specified in specs, divided by blocks in month )
-	}
-
-	function getChainBlocksPerMonth() public view override returns (uint256) {
-		return numberOfBlocksPerYear / 12;
-	}
-
-	/**
-	 * @dev Allows a staker to deposit Tokens. Notice that `approve` is
-	 * needed to be executed before the execution of this method.
-	 * Can be executed only when the contract is not paused.
-	 * @param _amount The amount of GD to stake
-	 */
-	function stake(uint256 _amount) external {
-		require(_amount > 0, "You need to stake a positive token amount");
-		require(
-			token.transferFrom(_msgSender(), address(this), _amount),
-			"transferFrom failed, make sure you approved token transfer"
-		);
-		/* GOOD rewards Updates */
-		_increaseProductivity(
-			address(this),
-			_msgSender(),
-			_amount,
-			0,
-			block.number
-		);
-		_mint(_msgSender(), _amount); // mint Staking token for staker
-		_mintRewards(_msgSender());
-		/* end GOOD rewards Updates */
-
-		/* G$ rewards updates */
-		_stake(_msgSender(), _amount);
-
-		emit Staked(_msgSender(), _amount);
-	}
-
-	/**
-	 * @dev Withdraws the sender staked Token.
-	 */
-	function withdrawStake(uint256 _amount) external nonReentrant {
-		(uint256 userProductivity, ) = getProductivity(address(this), _msgSender());
-		if (_amount == 0) _amount = userProductivity;
-		require(_amount > 0, "Should withdraw positive amount");
-		require(userProductivity >= _amount, "Not enough token staked");
-		uint256 tokenWithdraw = _amount;
-
-		_burn(_msgSender(), _amount); // burn their staking tokens
-
-		/* Good rewards update */
-		_decreaseProductivity(
-			address(this),
-			_msgSender(),
-			_amount,
-			0,
-			block.number
-		);
-		_mintRewards(_msgSender());
-		/* end Good rewards update */
-
-		/* G$ rewards update */
-		_withdraw(_msgSender(), tokenWithdraw);
-		if (stakersInfo[_msgSender()].balance == 0) {
-			_mintGDRewards(_msgSender()); //we mint GD rewards only when balance is 0 or upon request
-		}
-
-		/* end G$ rewards update */
-
-		require(
-			token.transfer(_msgSender(), tokenWithdraw),
-			"withdraw transfer failed"
-		);
-		emit StakeWithdraw(_msgSender(), _amount);
-	}
-
-	function _mintGDRewards(address _to) internal returns (uint256 actualSent) {
-		uint256 rewards = _getReward(_to);
-
-		//make sure RewardsMinter failure doesnt prevent withdrawl of stake
-		try
-			RewardsMinter(nameService.getAddress("MintBurnWrapper")).sendOrMint(
-				_to,
-				rewards
-			)
-		returns (uint256 _res) {
-			actualSent = _res;
-		} catch {
-			actualSent = 0;
-		}
-		//it could be that rewards minter doesnt have enough or passed cap
-		//so we keep track of debt to user
-		if (actualSent < rewards) {
-			_undoReward(_to, rewards - actualSent);
-		}
-	}
-
-	/**
-	 * @dev Staker can withdraw their rewards without withdraw their stake
-	 */
-	function withdrawRewards()
-		public
-		nonReentrant
-		returns (uint256 goodRewards, uint256 gdRewards)
-	{
-		goodRewards = _mintRewards(_msgSender());
-		gdRewards = _mintGDRewards(_msgSender());
-	}
-
-	/**
-	 * @dev Mint rewards of the staker
-	 * @param user Receipent address of the rewards
-	 * @return Returns amount of the minted rewards
-	 * emits 'ReputationEarned' event for staker earned GOOD amount
-	 */
-	function _mintRewards(address user) internal returns (uint256) {
-		uint256 amount = _issueEarnedRewards(address(this), user, 0, block.number);
-		if (amount > 0) {
-			ERC20(nameService.getAddress("REPUTATION")).mint(user, amount);
-			emit ReputationEarned(_msgSender(), amount);
-		}
-		return amount;
-	}
-
-	/**
-	 * @dev Returns the number of decimals used to get its user representation.
-	 */
-	function decimals() public view virtual override returns (uint8) {
-		return 2;
-	}
-
-	/**
-	 * @dev override _transfer to handle rewards calculations when transfer the stake
-	 */
-	function _transfer(
-		address from,
-		address to,
-		uint256 value
-	) internal override {
-		_decreaseProductivity(address(this), from, value, 0, block.number);
-		_withdraw(from, value); //update G$ rewards
-		_increaseProductivity(address(this), to, value, 0, block.number);
-		_stake(to, value); //update G$ rewards
-
-		//mint GOOD rewards
-		_mintRewards(from);
-		_mintRewards(to);
-
-		if (stakersInfo[from].balance == 0) {
-			_mintGDRewards(from); //we mint GD rewards only when balance is 0 or upon request
-		}
-		super._transfer(from, to, value);
-	}
-
-	/**
-	 * @dev Calculate rewards per block from monthly amount of rewards and set it
-	 * @param _monthlyAmount total rewards which will distribute monthly
-	 */
-	function setMonthlyGOODRewards(uint256 _monthlyAmount) public {
-		_onlyAvatar();
-		_setMonthlyRewards(address(this), _monthlyAmount);
-	}
-
-	/**
-	 * @dev Calculate rewards per block from monthly amount of rewards and set it
-	 * @param _interestRatePerBlock bps yearly apy
-	 */
-	function setGdApy(uint128 _interestRatePerBlock) public {
-		_onlyAvatar();
-		_setAPY(_interestRatePerBlock);
-	}
-
-	/// @dev helper function for multibase
-	function getRewardsPerBlock() public view returns (uint256) {
-		return rewardsPerBlock[address(this)];
-	}
-
-	/// @dev helper function for multibase
-	function getStaked(address _user) public view returns (uint256, uint256) {
-		return getProductivity(address(this), _user);
-	}
-
-	/// @dev helper function for multibase
-	function getUserPendingReward(address _user) public view returns (uint256) {
-		return getUserPendingReward(address(this), 0, block.number, _user);
-	}
-
-	/// @dev helper function for multibase
-	function goodStakerInfo(address _user) public view returns (UserInfo memory) {
-		return contractToUsers[address(this)][_user];
-	}
-
-	function totalRewardsPerShare() public view returns (uint256) {
-		return totalRewardsPerShare(address(this));
-	}
-}

package/contracts/reserve/DistributionHelper.sol

@@ -1,118 +0,0 @@
-// SPDX-License-Identifier: MIT
-/**
- Wrap the G$ token to provide mint permissions to multichain.org router/bridge
- based on https://github.com/anyswap/multichain-smart-contracts/blob/1459fe6281867319af8ffb1849e5c16d242d6530/contracts/wrapper/MintBurnWrapper.sol
-
- Added onTokenTransfer
-
- Fixed:
- https://github.com/anyswap/multichain-smart-contracts/issues/4
- https://github.com/anyswap/multichain-smart-contracts/issues/3
- */
-
-pragma solidity ^0.8;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/utils/math/Math.sol";
-
-import "../utils/DAOUpgradeableContract.sol";
-
-contract DistributionHelper is
-	DAOUpgradeableContract,
-	AccessControlEnumerableUpgradeable
-{
-	enum TransferType {
-		FuseBridge,
-		MultichainBridge,
-		Contract
-	}
-
-	struct DistributionRecipient {
-		uint32 bps;
-		uint32 chainId;
-		address addr;
-		TransferType transferType;
-	}
-
-	DistributionRecipient[] public distributionRecipients;
-	address public fuseBridge;
-	IMultichainRouter public multiChainBridge;
-
-	event Distribution(
-		uint256 distributed,
-		uint256 startingBalance,
-		uint256 incomingAmount
-	);
-
-	function initialize(INameService _ns) external initializer {
-		__AccessControlEnumerable_init();
-		setDAO(_ns);
-		_setupRole(DEFAULT_ADMIN_ROLE, avatar);
-		fuseBridge = nameService.getAddress("BRIDGE_CONTRACT");
-		multiChainBridge = IMultichainRouter(
-			0xf27Ee99622C3C9b264583dACB2cCE056e194494f
-		);
-	}
-
-	function onDistribution(uint256 _amount) external {
-		//we consider the actuall balance and not _amount
-		uint256 toDistribute = nativeToken().balanceOf(address(this));
-		if (toDistribute == 0) return;
-
-		uint256 totalDistributed;
-		for (uint256 i = 0; i < distributionRecipients.length; i++) {
-			DistributionRecipient storage r = distributionRecipients[i];
-			if (r.bps > 0) {
-				uint256 toTransfer = (toDistribute * r.bps) / 10000;
-				totalDistributed += toTransfer;
-				distribute(r, toTransfer);
-			}
-		}
-
-		emit Distribution(totalDistributed, toDistribute, _amount);
-	}
-
-	function addRecipient(DistributionRecipient memory _recipient)
-		external
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{
-		distributionRecipients.push(_recipient);
-	}
-
-	function updateRecipient(DistributionRecipient memory _recipient)
-		external
-		onlyRole(DEFAULT_ADMIN_ROLE)
-	{
-		for (uint256 i = 0; i < distributionRecipients.length; i++) {
-			if (distributionRecipients[i].addr == _recipient.addr) {
-				distributionRecipients[i] = _recipient;
-				return;
-			}
-		}
-	}
-
-	function distribute(DistributionRecipient storage _recipient, uint256 _amount)
-		internal
-	{
-		if (_recipient.transferType == TransferType.FuseBridge) {
-			nativeToken().transferAndCall(
-				fuseBridge,
-				_amount,
-				abi.encodePacked(_recipient.addr)
-			);
-		} else if (_recipient.transferType == TransferType.MultichainBridge) {
-			nativeToken().approve(address(multiChainBridge), _amount);
-			multiChainBridge.anySwapOut(
-				address(nativeToken()),
-				_recipient.addr,
-				_amount,
-				_recipient.chainId
-			);
-		} else if (_recipient.transferType == TransferType.Contract) {
-			nativeToken().transferAndCall(_recipient.addr, _amount, "");
-		}
-	}
-}