crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo across files

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-16 19:40:24 -07:00
parent 6641af2a58
commit de567da846
11 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/staking/contracts/src/fees/MixinExchangeFees.sol
View File

@@ -252,7 +252,7 @@ contract MixinExchangeFees is
totalWeightedStake != 0 ? activePools[i].weightedStake : 1, // only rewards are accounted for if no one has staked
totalWeightedStake != 0 ? totalWeightedStake : 1, // this is to avoid divide-by-zero in cobb douglas
cobbDouglasAlphaNumerator,
cobbDouglasAlphaDenomintor
cobbDouglasAlphaDenominator
);
// record reward in vault

2
contracts/staking/contracts/src/immutable/MixinStorage.sol
View File

@@ -129,5 +129,5 @@ contract MixinStorage is
uint32 public cobbDouglasAlphaNumerator;
// Denominator for cobb douglas alpha factor.
uint32 public cobbDouglasAlphaDenomintor;
uint32 public cobbDouglasAlphaDenominator;
}

4
contracts/staking/contracts/src/interfaces/IStakingEvents.sol
View File

@@ -59,7 +59,7 @@ interface IStakingEvents {
/// @param minimumPoolStake Minimum amount of stake required in a pool to collect rewards.
/// @param maximumMakersInPool Maximum number of maker addresses allowed to be registered to a pool.
/// @param cobbDouglasAlphaNumerator Numerator for cobb douglas alpha factor.
/// @param cobbDouglasAlphaDenomintor Denominator for cobb douglas alpha factor.
/// @param cobbDouglasAlphaDenominator Denominator for cobb douglas alpha factor.
/// @param wethProxyAddress The address that can transfer WETH for fees.
/// @param ethVaultAddress Address of the EthVault contract.
/// @param rewardVaultAddress Address of the StakingPoolRewardVault contract.
@@ -70,7 +70,7 @@ interface IStakingEvents {
uint256 minimumPoolStake,
uint256 maximumMakersInPool,
uint256 cobbDouglasAlphaNumerator,
uint256 cobbDouglasAlphaDenomintor,
uint256 cobbDouglasAlphaDenominator,
address wethProxyAddress,
address ethVaultAddress,
address rewardVaultAddress,

2
contracts/staking/contracts/src/interfaces/IStorage.sol
View File

@@ -128,7 +128,7 @@ interface IStorage {
view
returns (uint32);
function cobbDouglasAlphaDenomintor()
function cobbDouglasAlphaDenominator()
external
view
returns (uint32);

8
contracts/staking/contracts/src/sys/MixinParams.sol
View File

@@ -104,7 +104,7 @@ contract MixinParams is
_minimumPoolStake = minimumPoolStake;
_maximumMakersInPool = maximumMakersInPool;
_cobbDouglasAlphaNumerator = cobbDouglasAlphaNumerator;
_cobbDouglasAlphaDenominator = cobbDouglasAlphaDenomintor;
_cobbDouglasAlphaDenominator = cobbDouglasAlphaDenominator;
_wethProxyAddress = address(wethAssetProxy);
_ethVaultAddress = address(ethVault);
_rewardVaultAddress = address(rewardVault);
@@ -135,7 +135,7 @@ contract MixinParams is
100 * MIN_TOKEN_VALUE, // minimumPoolStake
10, // maximumMakersInPool
1, // cobbDouglasAlphaNumerator
2, // cobbDouglasAlphaDenomintor
2, // cobbDouglasAlphaDenominator
_wethProxyAddress,
_ethVaultAddress,
_rewardVaultAddress,
@@ -187,7 +187,7 @@ contract MixinParams is
minimumPoolStake = _minimumPoolStake;
maximumMakersInPool = _maximumMakersInPool;
cobbDouglasAlphaNumerator = _cobbDouglasAlphaNumerator;
cobbDouglasAlphaDenomintor = _cobbDouglasAlphaDenominator;
cobbDouglasAlphaDenominator = _cobbDouglasAlphaDenominator;
wethAssetProxy = IAssetProxy(_wethProxyAddress);
ethVault = IEthVault(_ethVaultAddress);
rewardVault = IStakingPoolRewardVault(_rewardVaultAddress);
@@ -216,7 +216,7 @@ contract MixinParams is
minimumPoolStake != 0 &&
maximumMakersInPool != 0 &&
cobbDouglasAlphaNumerator != 0 &&
cobbDouglasAlphaDenomintor != 0 &&
cobbDouglasAlphaDenominator != 0 &&
address(wethAssetProxy) != NIL_ADDRESS &&
address(ethVault) != NIL_ADDRESS &&
address(rewardVault) != NIL_ADDRESS &&

2
contracts/staking/contracts/test/TestStorageLayout.sol
View File

@@ -127,7 +127,7 @@ contract TestStorageLayout is
if sub(cobbDouglasAlphaNumerator_slot, slot) { revertIncorrectStorageSlot() }
slot := add(slot, 1)
if sub(cobbDouglasAlphaDenomintor_slot, slot) { revertIncorrectStorageSlot() }
if sub(cobbDouglasAlphaDenominator_slot, slot) { revertIncorrectStorageSlot() }
slot := add(slot, 1)
}
}

16
contracts/staking/test/params.ts
View File

@@ -34,7 +34,7 @@ blockchainTests('Configurable Parameters', env => {
new BigNumber(_params.minimumPoolStake),
new BigNumber(_params.maximumMakersInPool),
new BigNumber(_params.cobbDouglasAlphaNumerator),
new BigNumber(_params.cobbDouglasAlphaDenomintor),
new BigNumber(_params.cobbDouglasAlphaDenominator),
_params.wethProxyAddress,
_params.ethVaultAddress,
_params.rewardVaultAddress,
@@ -49,7 +49,7 @@ blockchainTests('Configurable Parameters', env => {
expect(event.minimumPoolStake).to.bignumber.eq(_params.minimumPoolStake);
expect(event.maximumMakersInPool).to.bignumber.eq(_params.maximumMakersInPool);
expect(event.cobbDouglasAlphaNumerator).to.bignumber.eq(_params.cobbDouglasAlphaNumerator);
expect(event.cobbDouglasAlphaDenomintor).to.bignumber.eq(_params.cobbDouglasAlphaDenomintor);
expect(event.cobbDouglasAlphaDenominator).to.bignumber.eq(_params.cobbDouglasAlphaDenominator);
expect(event.wethProxyAddress).to.eq(_params.wethProxyAddress);
expect(event.ethVaultAddress).to.eq(_params.ethVaultAddress);
expect(event.rewardVaultAddress).to.eq(_params.rewardVaultAddress);
@@ -61,7 +61,7 @@ blockchainTests('Configurable Parameters', env => {
expect(actual[2]).to.bignumber.eq(_params.minimumPoolStake);
expect(actual[3]).to.bignumber.eq(_params.maximumMakersInPool);
expect(actual[4]).to.bignumber.eq(_params.cobbDouglasAlphaNumerator);
expect(actual[5]).to.bignumber.eq(_params.cobbDouglasAlphaDenomintor);
expect(actual[5]).to.bignumber.eq(_params.cobbDouglasAlphaDenominator);
expect(actual[6]).to.eq(_params.wethProxyAddress);
expect(actual[7]).to.eq(_params.ethVaultAddress);
expect(actual[8]).to.eq(_params.rewardVaultAddress);
@@ -108,7 +108,7 @@ blockchainTests('Configurable Parameters', env => {
it('throws with denominator == 0', async () => {
const params = {
cobbDouglasAlphaNumerator: 0,
cobbDouglasAlphaDenomintor: 0,
cobbDouglasAlphaDenominator: 0,
};
const tx = setParamsAndAssertAsync(params);
const expectedError = new StakingRevertErrors.InvalidParamValueError(
@@ -120,7 +120,7 @@ blockchainTests('Configurable Parameters', env => {
it('throws with numerator > denominator', async () => {
const params = {
cobbDouglasAlphaNumerator: 2,
cobbDouglasAlphaDenomintor: 1,
cobbDouglasAlphaDenominator: 1,
};
const tx = setParamsAndAssertAsync(params);
const expectedError = new StakingRevertErrors.InvalidParamValueError(
@@ -132,7 +132,7 @@ blockchainTests('Configurable Parameters', env => {
it('accepts numerator == denominator', async () => {
const params = {
cobbDouglasAlphaNumerator: 1,
cobbDouglasAlphaDenomintor: 1,
cobbDouglasAlphaDenominator: 1,
};
return setParamsAndAssertAsync(params);
});
@@ -140,7 +140,7 @@ blockchainTests('Configurable Parameters', env => {
it('accepts numerator < denominator', async () => {
const params = {
cobbDouglasAlphaNumerator: 1,
cobbDouglasAlphaDenomintor: 2,
cobbDouglasAlphaDenominator: 2,
};
return setParamsAndAssertAsync(params);
});
@@ -148,7 +148,7 @@ blockchainTests('Configurable Parameters', env => {
it('accepts numerator == 0', async () => {
const params = {
cobbDouglasAlphaNumerator: 0,
cobbDouglasAlphaDenomintor: 1,
cobbDouglasAlphaDenominator: 1,
};
return setParamsAndAssertAsync(params);
});

5
contracts/staking/test/rewards_test.ts
View File

@@ -45,7 +45,10 @@ blockchainTests.resets('Testing Rewards', env => {
await stakingApiWrapper.utils.setParamsAsync({
minimumPoolStake: new BigNumber(0),
cobbDouglasAlphaNumerator: new BigNumber(1),
cobbDouglasAlphaDenomintor: new BigNumber(6),
cobbDouglasAlphaDenominator: new BigNumber(6),
rewardVaultAddress: stakingApiWrapper.rewardVaultContract.address,
ethVaultAddress: stakingApiWrapper.ethVaultContract.address,
zrxVaultAddress: stakingApiWrapper.zrxVaultContract.address,
});
// setup stakers
stakers = [new StakerActor(actors[0], stakingApiWrapper), new StakerActor(actors[1], stakingApiWrapper)];

11
contracts/staking/test/utils/api_wrapper.ts
View File

@@ -78,7 +78,7 @@ export class StakingApiWrapper {
_params.minimumPoolStake,
_params.maximumMakersInPool,
_params.cobbDouglasAlphaNumerator,
_params.cobbDouglasAlphaDenomintor,
_params.cobbDouglasAlphaDenominator,
_params.wethProxyAddress,
_params.ethVaultAddress,
_params.rewardVaultAddress,
@@ -94,7 +94,11 @@ export class StakingApiWrapper {
'minimumPoolStake',
'maximumMakersInPool',
'cobbDouglasAlphaNumerator',
'cobbDouglasAlphaDenomintor',
'cobbDouglasAlphaDenominator',
'wethProxyAddress',
'ethVaultAddress',
'rewardVaultAddress',
'zrxVaultAddress',
],
await this.stakingContract.getParams.callAsync(),
) as any) as StakingParams;
@@ -211,7 +215,8 @@ export async function deployAndConfigureContractsAsync(
await zrxVaultContract.setStakingProxy.awaitTransactionSuccessAsync(stakingProxyContract.address);
// set staking proxy contract in reward vault
await rewardVaultContract.setStakingProxy.awaitTransactionSuccessAsync(stakingProxyContract.address);
// set the eth vault in the reward vault
await rewardVaultContract.setEthVault.awaitTransactionSuccessAsync(ethVaultContract.address);
return new StakingApiWrapper(
env,
ownerAddress,

2
contracts/staking/test/utils/constants.ts
View File

@@ -16,7 +16,7 @@ export const constants = {
minimumPoolStake: testConstants.DUMMY_TOKEN_DECIMALS.times(100),
maximumMakersInPool: new BigNumber(10),
cobbDouglasAlphaNumerator: new BigNumber(1),
cobbDouglasAlphaDenomintor: new BigNumber(2),
cobbDouglasAlphaDenominator: new BigNumber(2),
wethProxyAddress: randomAddress(),
ethVaultAddress: randomAddress(),
rewardVaultAddress: randomAddress(),

2
contracts/staking/test/utils/types.ts
View File

@@ -8,7 +8,7 @@ export interface StakingParams {
minimumPoolStake: BigNumber;
maximumMakersInPool: BigNumber;
cobbDouglasAlphaNumerator: number | BigNumber;
cobbDouglasAlphaDenomintor: number | BigNumber;
cobbDouglasAlphaDenominator: number | BigNumber;
wethProxyAddress: string;
ethVaultAddress: string;
rewardVaultAddress: string;