yam-finance / proposals Goto Github PK

View Code? Open in Web Editor NEW

3.0 3.0 5.0 120 KB

Yam On Chain Proposals

License: Other

Solidity 98.81% Shell 0.28% JavaScript 0.81% Makefile 0.11%

proposals's People

Contributors

Stargazers

Watchers

Forkers

rocremer delegatedev rossgalloway stcetjo iyamfeddas

proposals's Issues

what is this?

proposals/contracts/2022/02/Proposal23.sol

Line 150 in 169d1fa

USDC.transfer(RESERVES, 100000 * (10**6));

What is this?

Add VDM to contributors paid

proposals/contracts/2022/02/Proposal23.sol

Line 152 in 169d1fa

// Stablecoin transfers

VDM submitted a compensation request and should be included in this proposal
https://forum.yam.finance/t/2022-03-01-vdm-contribution-compensation-request/1627

change to "nushi"

proposals/contracts/2022/02/Proposal23.sol

Line 178 in 169d1fa

// Will

change name to "nushi"

FYI, this is commented out, but needs to be in the deployed version.

proposals/contracts/2022/10/RedeemTemporary (risk for the dao)/TreasuryRedeemTemporary.sol

Line 102 in d6c5545

// function returnToReserves() external nonReentrant {

TreasuryRedeem contract hardcodes and additional 7 days into the contract.

proposals/contracts/2022/10/Proposal33.t.sol

Line 114 in d6c5545

97 days

When deploying the temporary redemption contract, redemption time only needs to be 90 days because the 7 days is hard coded into the redemption contract.

Proposal33.sol execute will revert because of assert totalLoss <= maxLoss * (value + totalLoss) / MAX_BPS

proposals/contracts/2022/10/Proposal33.sol

Line 128 in e2fbd0f

IYVault(address(yUSDC)).withdraw(type(uint256).max);

There is an issue with the call:
IYVault(address(yUSDC)).withdraw(type(uint256).max);

When testing if there is a balance of tokens, use the > instead of the < operator.

proposals/contracts/2022/10/Proposal33.t.sol

Line 191 in d6c5545

assertTrue(IERC20(WETH).balanceOf(address(this)) < 7000000000000000000);

    // User should have tokens after redemption
    assertTrue(IERC20(WETH).balanceOf(address(this)) < 7000000000000000000);
    
    If using the < operator, 0 aka no balance is included in the < 7000000000000000000

Getting a ("ZERO_BALANCE") error during testing of Proposal33.sol

proposals/contracts/2022/10/Proposal33.t.sol

Line 188 in d6c5545

redeemer.redeem(address(this), 100000 * (10 ** 18));

  ├╴call 0x185a4dc360CE69bDCceE33b3784B0282f7961aea::redeem(Proposaltest@0xb4c79daB8f259C7Aee6E5b2Aa729821864227e84, 100000000000000000000000) (contracts/2022/10/Proposal33.t.sol:188)
  │  ├╴call 0x0AaCfbeC6a24756c20D41914F2caba817C0d8521::transferFrom(Proposaltest@0xb4c79daB8f259C7Aee6E5b2Aa729821864227e84, @0x185a4dc360CE69bDCceE33b3784B0282f7961aea, 100000000000000000000000) <no source map>
  │  │  ├╴delegatecall 0x27C5736b49B89d4765d03734a0a51c461F09672d::transferFrom(Proposaltest@0xb4c79daB8f259C7Aee6E5b2Aa729821864227e84, @0x185a4dc360CE69bDCceE33b3784B0282f7961aea, 100000000000000000000000) <no source map>
  │  │  │  ├╴Transfer(100000000000000000000000) <no source map>
  │  │  │  └╴← (true)
  │  │  └╴← (true)
  │  ├╴call 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2::balanceOf(@0x185a4dc360CE69bDCceE33b3784B0282f7961aea) <no source map>
  │  │  └╴← (0)
  │  └╴error Revert ("ZERO_BALANCE") <no source map>
  └╴error Revert ("ZERO_BALANCE") (contracts/2022/10/Proposal33.t.sol:188)

Description

All the contracts in the utils folder are using the version v0.8.10, with the recent edits taking place to adapt what we had from the older version, we need to add testing to the contracts used in this folder.

Requirements

Adding tests for all the contracts inside utils
Documenting each test case (adding comments above the code lines)

Add tests for utils contracts

Proposal 20 - Mistake in VDM's Previous Pay

proposals/contracts/2021/Proposal20.sol

Line 102 in 4f7eec8

yearlyUSDToMonthlyUSD(42000 * (10**6), 1)

As I reviewed the last proposal, I discovered that we underpaid VDM for the month of September. The snapshot proposal that was approved here: https://snapshot.org/#/yam.eth/proposal/QmTH6QZnNxrRGhMxyEbwiE7VFPCTz1TYGnDHRJghnvgMR9 was for future months. In that proposal, VDM was approved for move to half time with half pay for the month of October. In the last on chain proposal that Nate wrote, we paid VDM 42000/12 or $3500, when he should have been paid $7000 (84000/2) because that proposal was to pay for work done in the previous month.

proposals/contracts/proposals/proposal_19/Proposal19.sol

Line 99 in 4d22666

yearlyUSDToMonthlyUSD(42000 * (10**6))

In order to fix this now, we should pay VDM the 3500 USDC that we owe him for september, and then also the 3500 USDC we owe him for his part time work in October. We are then not paying him stables for November on, but keeping his stream open until we ratify his new compensation plan.

Update version to v0.8.10

Description

The onchain proposals are using an old solidity version, v0.5.15. Moving forward we need to upgrade it and use v0.8.10 instead.

Requirements

Upgrading the upcoming proposals contracts to use v0.8.10
Adding tests to make sure everything is working properly

Close out stream 93

proposals/contracts/2022/01/Proposal22.sol

Lines 202 to 209 in 82720e4

 // Close Jono stream 

 pool.closeStream(72); 

 // Close Joe stream 

 pool.closeStream(75); 

 // Close Krug stream 

 pool.closeStream(86);

Please add closing of stream 93 (snake's stream) to this proposal.

Prepare proposal diamond contracts

How do we know this picks USDC?

proposals/contracts/2022/03/Proposal24.sol

Lines 22 to 28 in ef05f7b

 interface IYCRVVault { 

 function remove_liquidity_one_coin( 

 uint256 _token_amount, 

 int128 i, 

 uint256 min_uamount, 

 bool donate_dust 

 ) external;

proposals/contracts/2022/03/Proposal24.sol

Line 104 in ef05f7b

IYCRVVault(yCRVVault).remove_liquidity_one_coin(

I may just have missed it, but I don't see anything in this function and it's definition that says what token gets paid out. Maybe not an issue but I figured I would ask.

Is the variable name spelled right in line 26 (uamount)?

proposal 29 questions

proposals/contracts/2022/08/Proposal29.sol

Line 6 in add1bab

import {ISablier} from "../../../utils/Sablier.sol";

Sablier.sol does not exist in this location in the github repo.

proposals/contracts/2022/08/Proposal29.sol

Line 81 in add1bab

withdrawToken(address(DPI), MULTISIG, 2050 * (10**18));

How did you come up with this amount?

proposals/contracts/2022/08/Proposal29.sol

Line 180 in add1bab

if (amountYAM > 0) {}

How does this work? There is no action in this function.

Add comparison pr to check the changes made to the /utils contracts

Posted compensation request

proposals/contracts/2022/03/Proposal24.sol

Lines 137 to 141 in ef05f7b

 // // Ross 

 // USDC.transfer( 

 // 0x88c868B1024ECAefDc648eb152e91C57DeA984d0, 

 // yearlyToMonthlyUSD(84000, 1) 

 // );

https://forum.yam.finance/t/specific-architecture-ross-contributor-compensation-request/1641

Add Hardhat

Description

We need to add hardhat to support proposal contract development.

Requirements

Integrating Hardhat onto this repo
Adding hardhat contract test support for v0.8.10
Documenting the steps of how to use hardhat

Acceptance Criteria

Everything in the requirements section should be achieved, and working as expected.

Bounty

When applying for this bounty, provide an anticipated date for completion of the work in your work plan! And please be descriptive, add documentation where its most likely needed in the code, and add any additional comments to your PR!

Add Foundry

Description

We need to add foundry to support proposal contract development.

Requirements

Integrating Foundry onto this repo
Adding foundry contract test support for v0.8.10
Documenting the steps of how to use foundry

Incorrect Amount for Snake, Blokku, E

proposals/contracts/2021/12/Proposal21.sol

Line 83 in 7c0d663

yearlyToMonthlyUSD(72000, 1)

Payment is for WORK DONE not future work. Snake's pay rate for December was $28,800/year in stables. The number shown here is his new rate and goes into effect NEXT month.

Add deployment script example

Proposal33.sol needs to withdraw / unwrap / send to redemption contract yvUSDC.

proposals/contracts/2022/10/Proposal33.sol

Line 65 in d6c5545

IERC20 internal constant yUSDC =

Contract is missing withdraw / unwrap / send to redemption contract yvUSDC.

Proposal 20 - Nate's Pay

proposals/contracts/2021/Proposal20.sol

Line 96 in 4f7eec8

yearlyUSDToMonthlyUSD(26256 * (10**6), 1)

@ethedev have you had further conversations with Nate about this? Per the discussion where nate first announced that he would be stepping away he mentioned that we wanted to stop his stablecoin payments immediately. That was in early october, so would mean that if we follow that we wouldn't pay him in this proposal (covering october and november).

At the bottom of the proposal, (line 165) nates stream is closed. Are we fully parting ways or just stopping until things get re-negotiated?

Please confirm logic

Can you confirm the logic here:

This code moves all our USDC into this contract

proposals/contracts/2022/02/Proposal23.sol

Lines 135 to 138 in 169d1fa

 IERC20(address(USDC)).transferFrom( 

 RESERVES, 

 address(this), 

 IERC20(address(USDC)).balanceOf(RESERVES)

This code moves all our yUSDC2 (the old version) into this contract

proposals/contracts/2022/02/Proposal23.sol

Lines 140 to 144 in 169d1fa

 IERC20(address(yUSDCV2)).transferFrom( 

 RESERVES, 

 address(this), 

 IERC20(address(yUSDCV2)).balanceOf(RESERVES) 

 );

This code withdraws the yUSDC2 (old version) to USDC.

proposals/contracts/2022/02/Proposal23.sol

Line 145 in 169d1fa

yUSDCV2.withdraw(type(uint256).max);

This line then sends 100,000 USDC back to the treasury.

proposals/contracts/2022/02/Proposal23.sol

Line 150 in 169d1fa

USDC.transfer(RESERVES, 100000 * (10**6));

The contract then pays people

This code then deposits all the remaining USDC into yvUSDC (the new version) and sends it back to the treasury.

proposals/contracts/2022/02/Proposal23.sol

Lines 184 to 186 in 169d1fa

 uint256 usdcBalance = USDC.balanceOf(address(this)); 

 USDC.approve(address(yUSDC), usdcBalance); 

 yUSDC.deposit(usdcBalance, RESERVES);

This is how I understand the contract working. Please confirm if that is correct.

Either way, I have a few comments:

Why not also pull in the yUSD, unwrap to USDC and move that to the new yvUSDC vault? Or just unwrap it to USDC and use that as part of the buffer to pay contributors.
Variable naming for this is confusing. yUSDCv2 is the old version and yUSDC is the new version?
Would love to see more comments to explain what we are doing.

	// Close Jono stream
	pool.closeStream(72);

	// Close Joe stream
	pool.closeStream(75);

	// Close Krug stream
	pool.closeStream(86);

	interface IYCRVVault {
	function remove_liquidity_one_coin(
	uint256 _token_amount,
	int128 i,
	uint256 min_uamount,
	bool donate_dust
	) external;

	// // Ross
	// USDC.transfer(
	// 0x88c868B1024ECAefDc648eb152e91C57DeA984d0,
	// yearlyToMonthlyUSD(84000, 1)
	// );

	IERC20(address(USDC)).transferFrom(
	RESERVES,
	address(this),
	IERC20(address(USDC)).balanceOf(RESERVES)

	IERC20(address(yUSDCV2)).transferFrom(
	RESERVES,
	address(this),
	IERC20(address(yUSDCV2)).balanceOf(RESERVES)
	);

	uint256 usdcBalance = USDC.balanceOf(address(this));
	USDC.approve(address(yUSDC), usdcBalance);
	yUSDC.deposit(usdcBalance, RESERVES);

yam-finance / proposals Goto Github PK

proposals's People

Contributors

Stargazers

Watchers

Forkers

proposals's Issues

Description

Requirements

Description

Requirements

Description

Requirements

Acceptance Criteria

Bounty

Description

Requirements

Recommend Projects

Recommend Topics

Recommend Org