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

@0x/contracts-staking: Rebase with 3.0

Browse Source
This commit is contained in:
Lawrence Forman
2019-08-29 13:13:14 -04:00
committed by Lawrence Forman
parent ed8a6bb97b
commit af10f52acf
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ pragma solidity ^0.5.9;
import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
import "@0x/contracts-utils/contracts/src/LibSafeMath.sol"; import "@0x/contracts-utils/contracts/src/LibSafeMath.sol";
import "../libs/LibFeeMath.sol";
import "../libs/LibStakingRichErrors.sol"; import "../libs/LibStakingRichErrors.sol";
import "../libs/LibFixedMath.sol"; import "../libs/LibFixedMath.sol";
import "../immutable/MixinStorage.sol"; import "../immutable/MixinStorage.sol";

2
contracts/staking/package.json
View File

@@ -36,7 +36,7 @@
"compile:truffle": "truffle compile" "compile:truffle": "truffle compile"
}, },
"config": { "config": {
"abis": "./generated-artifacts/@(IStaking|IStakingEvents|IStakingPoolRewardVault|IStakingProxy|IStructs|IVaultCore|IWallet|IZrxVault|LibEIP712Hash|LibFixedMath|LibFixedMathRichErrors|LibRewardMath|LibSafeMath|LibSafeMath64|LibSafeMath96|LibSignatureValidator|LibStakingRichErrors|MixinConstants|MixinDelegatedStake|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinOwnable|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakingPool|MixinStakingPoolRewardVault|MixinStakingPoolRewards|MixinStorage|MixinTimeLockedStake|MixinVaultCore|MixinZrxVault|Staking|StakingPoolRewardVault|StakingProxy|TestCobbDouglas|TestLibFixedMath|ZrxVault).json", "abis": "./generated-artifacts/@(IStaking|IStakingEvents|IStakingPoolRewardVault|IStakingProxy|IStructs|IVaultCore|IWallet|IZrxVault|LibEIP712Hash|LibFixedMath|LibFixedMathRichErrors|LibRewardMath|LibSafeDowncast|LibSignatureValidator|LibStakingRichErrors|MixinConstants|MixinDelegatedStake|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakingPool|MixinStakingPoolRewardVault|MixinStakingPoolRewards|MixinStorage|MixinTimeLockedStake|MixinVaultCore|MixinZrxVault|Staking|StakingPoolRewardVault|StakingProxy|TestCobbDouglas|TestLibFixedMath|TestStorageLayout|ZrxVault).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

5
contracts/staking/src/artifacts.ts
View File

@@ -38,6 +38,8 @@ import * as MixinZrxVault from '../generated-artifacts/MixinZrxVault.json';
import * as Staking from '../generated-artifacts/Staking.json'; import * as Staking from '../generated-artifacts/Staking.json';
import * as StakingPoolRewardVault from '../generated-artifacts/StakingPoolRewardVault.json'; import * as StakingPoolRewardVault from '../generated-artifacts/StakingPoolRewardVault.json';
import * as StakingProxy from '../generated-artifacts/StakingProxy.json'; import * as StakingProxy from '../generated-artifacts/StakingProxy.json';
import * as TestCobbDouglas from '../generated-artifacts/TestCobbDouglas.json';
import * as TestLibFixedMath from '../generated-artifacts/TestLibFixedMath.json';
import * as TestStorageLayout from '../generated-artifacts/TestStorageLayout.json'; import * as TestStorageLayout from '../generated-artifacts/TestStorageLayout.json';
import * as ZrxVault from '../generated-artifacts/ZrxVault.json'; import * as ZrxVault from '../generated-artifacts/ZrxVault.json';
export const artifacts = { export const artifacts = {
@@ -75,6 +77,7 @@ export const artifacts = {
MixinVaultCore: MixinVaultCore as ContractArtifact, MixinVaultCore: MixinVaultCore as ContractArtifact,
StakingPoolRewardVault: StakingPoolRewardVault as ContractArtifact, StakingPoolRewardVault: StakingPoolRewardVault as ContractArtifact,
ZrxVault: ZrxVault as ContractArtifact, ZrxVault: ZrxVault as ContractArtifact,
LibFeeMathTest: LibFeeMathTest as ContractArtifact, TestCobbDouglas: TestCobbDouglas as ContractArtifact,
TestLibFixedMath: TestLibFixedMath as ContractArtifact,
TestStorageLayout: TestStorageLayout as ContractArtifact, TestStorageLayout: TestStorageLayout as ContractArtifact,
}; };

2
contracts/staking/src/wrappers.ts
View File

@@ -36,5 +36,7 @@ export * from '../generated-wrappers/mixin_zrx_vault';
export * from '../generated-wrappers/staking'; export * from '../generated-wrappers/staking';
export * from '../generated-wrappers/staking_pool_reward_vault'; export * from '../generated-wrappers/staking_pool_reward_vault';
export * from '../generated-wrappers/staking_proxy'; export * from '../generated-wrappers/staking_proxy';
export * from '../generated-wrappers/test_cobb_douglas';
export * from '../generated-wrappers/test_lib_fixed_math';
export * from '../generated-wrappers/test_storage_layout'; export * from '../generated-wrappers/test_storage_layout';
export * from '../generated-wrappers/zrx_vault'; export * from '../generated-wrappers/zrx_vault';

2
contracts/staking/tsconfig.json
View File

@@ -36,6 +36,8 @@
"generated-artifacts/Staking.json", "generated-artifacts/Staking.json",
"generated-artifacts/StakingPoolRewardVault.json", "generated-artifacts/StakingPoolRewardVault.json",
"generated-artifacts/StakingProxy.json", "generated-artifacts/StakingProxy.json",
"generated-artifacts/TestCobbDouglas.json",
"generated-artifacts/TestLibFixedMath.json",
"generated-artifacts/TestStorageLayout.json", "generated-artifacts/TestStorageLayout.json",
"generated-artifacts/ZrxVault.json" "generated-artifacts/ZrxVault.json"
], ],