Use sovTokenAddress instead of protocolTokenAddress in trading rebates

DistributedCollective · Jul 2, 2021 · 3e77a95 · 3e77a95
1 parent 0687d4e
commit 3e77a95
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/contracts/mixins/FeesHelper.sol b/contracts/mixins/FeesHelper.sol
@@ -207,7 +207,7 @@ contract FeesHelper is State, FeesEvents {
 				abi.encodeWithSelector(
 					IPriceFeeds(_priceFeeds).queryReturn.selector,
 					feeToken,
-					protocolTokenAddress, /// Price rewards using BZRX price rather than vesting token price.
+					sovTokenAddress, /// Price rewards using BZRX price rather than vesting token price.
 					feeAmount.mul(_feeRebatePercent).div(10**20)
 				)
 			);
@@ -218,16 +218,16 @@ contract FeesHelper is State, FeesEvents {
 		}
 
 		if (rewardAmount != 0) {
-			IERC20(protocolTokenAddress).approve(lockedSOVAddress, rewardAmount);
+			IERC20(sovTokenAddress).approve(lockedSOVAddress, rewardAmount);
 
 			(bool success, ) = lockedSOVAddress.call(abi.encodeWithSignature("depositSOV(address,uint256)", user, rewardAmount));
 
 			if (success) {
 				protocolTokenPaid = protocolTokenPaid.add(rewardAmount);
 
-				emit EarnReward(user, protocolTokenAddress, loanId, _feeRebatePercent, rewardAmount);
+				emit EarnReward(user, sovTokenAddress, loanId, _feeRebatePercent, rewardAmount);
 			} else {
-				emit EarnRewardFail(user, protocolTokenAddress, loanId, _feeRebatePercent, rewardAmount);
+				emit EarnRewardFail(user, sovTokenAddress, loanId, _feeRebatePercent, rewardAmount);
 			}
 		}
 	}

diff --git a/tests-js/Utils/initializer.js b/tests-js/Utils/initializer.js
@@ -63,6 +63,7 @@ const getBZRX = async () => {
 const getSOV = async (sovryn, priceFeeds, SUSD, accounts) => {
 	const sov = await TestToken.new("SOV", "SOV", 18, totalSupply);
 	await sovryn.setProtocolTokenAddress(sov.address);
+	await sovryn.setSOVTokenAddress(sov.address);
 	await sovryn.setLockedSOVAddress((await LockedSOVMockup.new(sov.address, [accounts[0]])).address);
 
 	await priceFeeds.setRates(SUSD.address, sov.address, oneEth);

diff --git a/tests-js/loan-token/LendingTestToken.test.js b/tests-js/loan-token/LendingTestToken.test.js
@@ -79,6 +79,7 @@ contract("LoanTokenLending", (accounts) => {
 		await sovryn.setFeesController(lender);
 		const sov = await TestToken.new("SOV", "SOV", 18, TOTAL_SUPPLY);
 		await sovryn.setProtocolTokenAddress(sov.address);
+		await sovryn.setSOVTokenAddress(sov.address);
 		await sovryn.setLockedSOVAddress((await LockedSOVMockup.new(sov.address, [accounts[0]])).address);
 
 		loanTokenLogicStandard = await LoanTokenLogicStandard.new();

diff --git a/tests-js/loan-token/LendingwRBTCCollateral.test.js b/tests-js/loan-token/LendingwRBTCCollateral.test.js
@@ -79,6 +79,7 @@ contract("LoanTokenLending", (accounts) => {
 		tokenSOV = await SOV.new(TOTAL_SUPPLY);
 		await sovryn.setLockedSOVAddress((await LockedSOVMockup.new(tokenSOV.address, [lender])).address);
 		await sovryn.setProtocolTokenAddress(tokenSOV.address);
+		await sovryn.setSOVTokenAddress(tokenSOV.address);
 
 		loanTokenLogicStandard = await LoanTokenLogicStandard.new();
 		loanToken = await LoanToken.new(lender, loanTokenLogicStandard.address, sovryn.address, rBTC.address);

diff --git a/tests-js/loan-token/LendingwRBTCloan.test.js b/tests-js/loan-token/LendingwRBTCloan.test.js
@@ -89,6 +89,7 @@ contract("LoanTokenLending", (accounts) => {
 		tokenSOV = await SOV.new(TOTAL_SUPPLY);
 		await sovryn.setLockedSOVAddress((await LockedSOVMockup.new(tokenSOV.address, [lender])).address);
 		await sovryn.setProtocolTokenAddress(tokenSOV.address);
+		await sovryn.setSOVTokenAddress(tokenSOV.address);
 
 		loanTokenLogicWrbtc = await LoanTokenLogicWrbtc.new();
 		loanToken = await LoanToken.new(lender, loanTokenLogicWrbtc.address, sovryn.address, testWrbtc.address);

diff --git a/tests-js/margin_trading_boilerplate.test.js b/tests-js/margin_trading_boilerplate.test.js
@@ -57,6 +57,7 @@ contract("Margin Trading with Affiliates boilerplate", (accounts) => {
 
 		const sov = await TestToken.new("SOV", "SOV", 18, web3.utils.toWei("20000", "ether"));
 		await sovryn.setProtocolTokenAddress(sov.address);
+		await sovryn.setSOVTokenAddress(sov.address);
 		await sovryn.setLockedSOVAddress((await LockedSOVMockup.new(sov.address, [accounts[0]])).address);
 
 		loanToken = await LoanToken.new(owner, loanTokenLogic.address, sovryn.address, testWrbtc.address);