Update all contracts-*is package.json, tsconfig.json, compiler.json, artifacts/ts and wrappers.js

This commit is contained in:
fabioberger
2019-11-10 23:41:56 +00:00
parent b6094fdb34
commit f011be9347
59 changed files with 1014 additions and 154 deletions

View File

@@ -1,5 +1,5 @@
{
"artifactsDir": "./generated-artifacts",
"artifactsDir": "./test/generated-artifacts",
"contractsDir": "./contracts",
"useDockerisedSolc": false,
"isOfflineMode": true,

View File

@@ -13,7 +13,7 @@
"build2": "tsc -b",
"build": "yarn pre_build && tsc -b",
"build:ci": "yarn build",
"pre_build": "run-s compile contracts:gen generate_contract_wrappers",
"pre_build": "run-s compile contracts:gen generate_contract_wrappers contracts:copy",
"test": "yarn run_mocha",
"rebuild_and_test": "run-s build test",
"test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
@@ -22,22 +22,23 @@
"run_mocha": "mocha --require source-map-support/register --require make-promises-safe 'lib/test/**/*.js' --timeout 100000 --bail --exit",
"compile": "sol-compiler",
"watch": "sol-compiler -w",
"clean": "shx rm -rf lib generated-artifacts generated-wrappers",
"generate_contract_wrappers": "abi-gen --debug --abis ${npm_package_config_abis} --output generated-wrappers --backend ethers",
"lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"clean": "shx rm -rf lib test/generated-artifacts test/generated-wrappers generated-artifacts generated-wrappers",
"generate_contract_wrappers": "abi-gen --debug --abis ${npm_package_config_abis} --output test/generated-wrappers --backend ethers",
"lint": "tslint --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"fix": "tslint --fix --format stylish --project . --exclude ./generated-wrappers/**/* --exclude ./test/generated-wrappers/**/* --exclude ./generated-artifacts/**/* --exclude ./test/generated-artifacts/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
"coverage:report:lcov": "istanbul report lcov",
"test:circleci": "yarn test",
"contracts:gen": "contracts-gen",
"contracts:gen": "contracts-gen generate",
"contracts:copy": "contracts-gen copy",
"lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol",
"compile:truffle": "truffle compile"
},
"config": {
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
"abis": "./generated-artifacts/@(IStaking|IStakingEvents|IStakingProxy|IStorage|IStorageInit|IStructs|IZrxVault|LibCobbDouglas|LibFixedMath|LibFixedMathRichErrors|LibSafeDowncast|LibStakingRichErrors|MixinAbstract|MixinConstants|MixinCumulativeRewards|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinFinalizer|MixinParams|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakeStorage|MixinStakingPool|MixinStakingPoolRewards|MixinStorage|Staking|StakingProxy|TestAssertStorageParams|TestCobbDouglas|TestCumulativeRewardTracking|TestDelegatorRewards|TestExchangeManager|TestFinalizer|TestInitTarget|TestLibFixedMath|TestLibSafeDowncast|TestMixinCumulativeRewards|TestMixinParams|TestMixinScheduler|TestMixinStake|TestMixinStakeBalances|TestMixinStakeStorage|TestMixinStakingPool|TestMixinStakingPoolRewards|TestProtocolFees|TestProxyDestination|TestStaking|TestStakingNoWETH|TestStakingProxy|TestStakingProxyUnit|TestStorageLayoutAndConstants|ZrxVault).json"
"abis": "./test/generated-artifacts/@(IStaking|IStakingEvents|IStakingProxy|IStorage|IStorageInit|IStructs|IZrxVault|LibCobbDouglas|LibFixedMath|LibFixedMathRichErrors|LibSafeDowncast|LibStakingRichErrors|MixinAbstract|MixinConstants|MixinCumulativeRewards|MixinDeploymentConstants|MixinExchangeFees|MixinExchangeManager|MixinFinalizer|MixinParams|MixinScheduler|MixinStake|MixinStakeBalances|MixinStakeStorage|MixinStakingPool|MixinStakingPoolRewards|MixinStorage|Staking|StakingProxy|TestAssertStorageParams|TestCobbDouglas|TestCumulativeRewardTracking|TestDelegatorRewards|TestExchangeManager|TestFinalizer|TestInitTarget|TestLibFixedMath|TestLibSafeDowncast|TestMixinCumulativeRewards|TestMixinParams|TestMixinScheduler|TestMixinStake|TestMixinStakeBalances|TestMixinStakeStorage|TestMixinStakingPool|TestMixinStakingPoolRewards|TestProtocolFees|TestProxyDestination|TestStaking|TestStakingNoWETH|TestStakingProxy|TestStakingProxyUnit|TestStorageLayoutAndConstants|ZrxVault).json"
},
"repository": {
"type": "git",

View File

@@ -0,0 +1,117 @@
/*
* -----------------------------------------------------------------------------
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
import { ContractArtifact } from 'ethereum-types';
import * as IStaking from '../test/generated-artifacts/IStaking.json';
import * as IStakingEvents from '../test/generated-artifacts/IStakingEvents.json';
import * as IStakingProxy from '../test/generated-artifacts/IStakingProxy.json';
import * as IStorage from '../test/generated-artifacts/IStorage.json';
import * as IStorageInit from '../test/generated-artifacts/IStorageInit.json';
import * as IStructs from '../test/generated-artifacts/IStructs.json';
import * as IZrxVault from '../test/generated-artifacts/IZrxVault.json';
import * as LibCobbDouglas from '../test/generated-artifacts/LibCobbDouglas.json';
import * as LibFixedMath from '../test/generated-artifacts/LibFixedMath.json';
import * as LibFixedMathRichErrors from '../test/generated-artifacts/LibFixedMathRichErrors.json';
import * as LibSafeDowncast from '../test/generated-artifacts/LibSafeDowncast.json';
import * as LibStakingRichErrors from '../test/generated-artifacts/LibStakingRichErrors.json';
import * as MixinAbstract from '../test/generated-artifacts/MixinAbstract.json';
import * as MixinConstants from '../test/generated-artifacts/MixinConstants.json';
import * as MixinCumulativeRewards from '../test/generated-artifacts/MixinCumulativeRewards.json';
import * as MixinDeploymentConstants from '../test/generated-artifacts/MixinDeploymentConstants.json';
import * as MixinExchangeFees from '../test/generated-artifacts/MixinExchangeFees.json';
import * as MixinExchangeManager from '../test/generated-artifacts/MixinExchangeManager.json';
import * as MixinFinalizer from '../test/generated-artifacts/MixinFinalizer.json';
import * as MixinParams from '../test/generated-artifacts/MixinParams.json';
import * as MixinScheduler from '../test/generated-artifacts/MixinScheduler.json';
import * as MixinStake from '../test/generated-artifacts/MixinStake.json';
import * as MixinStakeBalances from '../test/generated-artifacts/MixinStakeBalances.json';
import * as MixinStakeStorage from '../test/generated-artifacts/MixinStakeStorage.json';
import * as MixinStakingPool from '../test/generated-artifacts/MixinStakingPool.json';
import * as MixinStakingPoolRewards from '../test/generated-artifacts/MixinStakingPoolRewards.json';
import * as MixinStorage from '../test/generated-artifacts/MixinStorage.json';
import * as Staking from '../test/generated-artifacts/Staking.json';
import * as StakingProxy from '../test/generated-artifacts/StakingProxy.json';
import * as TestAssertStorageParams from '../test/generated-artifacts/TestAssertStorageParams.json';
import * as TestCobbDouglas from '../test/generated-artifacts/TestCobbDouglas.json';
import * as TestCumulativeRewardTracking from '../test/generated-artifacts/TestCumulativeRewardTracking.json';
import * as TestDelegatorRewards from '../test/generated-artifacts/TestDelegatorRewards.json';
import * as TestExchangeManager from '../test/generated-artifacts/TestExchangeManager.json';
import * as TestFinalizer from '../test/generated-artifacts/TestFinalizer.json';
import * as TestInitTarget from '../test/generated-artifacts/TestInitTarget.json';
import * as TestLibFixedMath from '../test/generated-artifacts/TestLibFixedMath.json';
import * as TestLibSafeDowncast from '../test/generated-artifacts/TestLibSafeDowncast.json';
import * as TestMixinCumulativeRewards from '../test/generated-artifacts/TestMixinCumulativeRewards.json';
import * as TestMixinParams from '../test/generated-artifacts/TestMixinParams.json';
import * as TestMixinScheduler from '../test/generated-artifacts/TestMixinScheduler.json';
import * as TestMixinStake from '../test/generated-artifacts/TestMixinStake.json';
import * as TestMixinStakeBalances from '../test/generated-artifacts/TestMixinStakeBalances.json';
import * as TestMixinStakeStorage from '../test/generated-artifacts/TestMixinStakeStorage.json';
import * as TestMixinStakingPool from '../test/generated-artifacts/TestMixinStakingPool.json';
import * as TestMixinStakingPoolRewards from '../test/generated-artifacts/TestMixinStakingPoolRewards.json';
import * as TestProtocolFees from '../test/generated-artifacts/TestProtocolFees.json';
import * as TestProxyDestination from '../test/generated-artifacts/TestProxyDestination.json';
import * as TestStaking from '../test/generated-artifacts/TestStaking.json';
import * as TestStakingNoWETH from '../test/generated-artifacts/TestStakingNoWETH.json';
import * as TestStakingProxy from '../test/generated-artifacts/TestStakingProxy.json';
import * as TestStakingProxyUnit from '../test/generated-artifacts/TestStakingProxyUnit.json';
import * as TestStorageLayoutAndConstants from '../test/generated-artifacts/TestStorageLayoutAndConstants.json';
import * as ZrxVault from '../test/generated-artifacts/ZrxVault.json';
export const artifacts = {
Staking: Staking as ContractArtifact,
StakingProxy: StakingProxy as ContractArtifact,
ZrxVault: ZrxVault as ContractArtifact,
MixinExchangeFees: MixinExchangeFees as ContractArtifact,
MixinExchangeManager: MixinExchangeManager as ContractArtifact,
MixinConstants: MixinConstants as ContractArtifact,
MixinDeploymentConstants: MixinDeploymentConstants as ContractArtifact,
MixinStorage: MixinStorage as ContractArtifact,
IStaking: IStaking as ContractArtifact,
IStakingEvents: IStakingEvents as ContractArtifact,
IStakingProxy: IStakingProxy as ContractArtifact,
IStorage: IStorage as ContractArtifact,
IStorageInit: IStorageInit as ContractArtifact,
IStructs: IStructs as ContractArtifact,
IZrxVault: IZrxVault as ContractArtifact,
LibCobbDouglas: LibCobbDouglas as ContractArtifact,
LibFixedMath: LibFixedMath as ContractArtifact,
LibFixedMathRichErrors: LibFixedMathRichErrors as ContractArtifact,
LibSafeDowncast: LibSafeDowncast as ContractArtifact,
LibStakingRichErrors: LibStakingRichErrors as ContractArtifact,
MixinStake: MixinStake as ContractArtifact,
MixinStakeBalances: MixinStakeBalances as ContractArtifact,
MixinStakeStorage: MixinStakeStorage as ContractArtifact,
MixinCumulativeRewards: MixinCumulativeRewards as ContractArtifact,
MixinStakingPool: MixinStakingPool as ContractArtifact,
MixinStakingPoolRewards: MixinStakingPoolRewards as ContractArtifact,
MixinAbstract: MixinAbstract as ContractArtifact,
MixinFinalizer: MixinFinalizer as ContractArtifact,
MixinParams: MixinParams as ContractArtifact,
MixinScheduler: MixinScheduler as ContractArtifact,
TestAssertStorageParams: TestAssertStorageParams as ContractArtifact,
TestCobbDouglas: TestCobbDouglas as ContractArtifact,
TestCumulativeRewardTracking: TestCumulativeRewardTracking as ContractArtifact,
TestDelegatorRewards: TestDelegatorRewards as ContractArtifact,
TestExchangeManager: TestExchangeManager as ContractArtifact,
TestFinalizer: TestFinalizer as ContractArtifact,
TestInitTarget: TestInitTarget as ContractArtifact,
TestLibFixedMath: TestLibFixedMath as ContractArtifact,
TestLibSafeDowncast: TestLibSafeDowncast as ContractArtifact,
TestMixinCumulativeRewards: TestMixinCumulativeRewards as ContractArtifact,
TestMixinParams: TestMixinParams as ContractArtifact,
TestMixinScheduler: TestMixinScheduler as ContractArtifact,
TestMixinStake: TestMixinStake as ContractArtifact,
TestMixinStakeBalances: TestMixinStakeBalances as ContractArtifact,
TestMixinStakeStorage: TestMixinStakeStorage as ContractArtifact,
TestMixinStakingPool: TestMixinStakingPool as ContractArtifact,
TestMixinStakingPoolRewards: TestMixinStakingPoolRewards as ContractArtifact,
TestProtocolFees: TestProtocolFees as ContractArtifact,
TestProxyDestination: TestProxyDestination as ContractArtifact,
TestStaking: TestStaking as ContractArtifact,
TestStakingNoWETH: TestStakingNoWETH as ContractArtifact,
TestStakingProxy: TestStakingProxy as ContractArtifact,
TestStakingProxyUnit: TestStakingProxyUnit as ContractArtifact,
TestStorageLayoutAndConstants: TestStorageLayoutAndConstants as ContractArtifact,
};

View File

@@ -0,0 +1,59 @@
/*
* -----------------------------------------------------------------------------
* Warning: This file is auto-generated by contracts-gen. Don't edit manually.
* -----------------------------------------------------------------------------
*/
export * from '../test/generated-wrappers/i_staking';
export * from '../test/generated-wrappers/i_staking_events';
export * from '../test/generated-wrappers/i_staking_proxy';
export * from '../test/generated-wrappers/i_storage';
export * from '../test/generated-wrappers/i_storage_init';
export * from '../test/generated-wrappers/i_structs';
export * from '../test/generated-wrappers/i_zrx_vault';
export * from '../test/generated-wrappers/lib_cobb_douglas';
export * from '../test/generated-wrappers/lib_fixed_math';
export * from '../test/generated-wrappers/lib_fixed_math_rich_errors';
export * from '../test/generated-wrappers/lib_safe_downcast';
export * from '../test/generated-wrappers/lib_staking_rich_errors';
export * from '../test/generated-wrappers/mixin_abstract';
export * from '../test/generated-wrappers/mixin_constants';
export * from '../test/generated-wrappers/mixin_cumulative_rewards';
export * from '../test/generated-wrappers/mixin_deployment_constants';
export * from '../test/generated-wrappers/mixin_exchange_fees';
export * from '../test/generated-wrappers/mixin_exchange_manager';
export * from '../test/generated-wrappers/mixin_finalizer';
export * from '../test/generated-wrappers/mixin_params';
export * from '../test/generated-wrappers/mixin_scheduler';
export * from '../test/generated-wrappers/mixin_stake';
export * from '../test/generated-wrappers/mixin_stake_balances';
export * from '../test/generated-wrappers/mixin_stake_storage';
export * from '../test/generated-wrappers/mixin_staking_pool';
export * from '../test/generated-wrappers/mixin_staking_pool_rewards';
export * from '../test/generated-wrappers/mixin_storage';
export * from '../test/generated-wrappers/staking';
export * from '../test/generated-wrappers/staking_proxy';
export * from '../test/generated-wrappers/test_assert_storage_params';
export * from '../test/generated-wrappers/test_cobb_douglas';
export * from '../test/generated-wrappers/test_cumulative_reward_tracking';
export * from '../test/generated-wrappers/test_delegator_rewards';
export * from '../test/generated-wrappers/test_exchange_manager';
export * from '../test/generated-wrappers/test_finalizer';
export * from '../test/generated-wrappers/test_init_target';
export * from '../test/generated-wrappers/test_lib_fixed_math';
export * from '../test/generated-wrappers/test_lib_safe_downcast';
export * from '../test/generated-wrappers/test_mixin_cumulative_rewards';
export * from '../test/generated-wrappers/test_mixin_params';
export * from '../test/generated-wrappers/test_mixin_scheduler';
export * from '../test/generated-wrappers/test_mixin_stake';
export * from '../test/generated-wrappers/test_mixin_stake_balances';
export * from '../test/generated-wrappers/test_mixin_stake_storage';
export * from '../test/generated-wrappers/test_mixin_staking_pool';
export * from '../test/generated-wrappers/test_mixin_staking_pool_rewards';
export * from '../test/generated-wrappers/test_protocol_fees';
export * from '../test/generated-wrappers/test_proxy_destination';
export * from '../test/generated-wrappers/test_staking';
export * from '../test/generated-wrappers/test_staking_no_w_e_t_h';
export * from '../test/generated-wrappers/test_staking_proxy';
export * from '../test/generated-wrappers/test_staking_proxy_unit';
export * from '../test/generated-wrappers/test_storage_layout_and_constants';
export * from '../test/generated-wrappers/zrx_vault';

View File

@@ -56,7 +56,61 @@
"generated-artifacts/TestStakingProxy.json",
"generated-artifacts/TestStakingProxyUnit.json",
"generated-artifacts/TestStorageLayoutAndConstants.json",
"generated-artifacts/ZrxVault.json"
"generated-artifacts/ZrxVault.json",
"test/generated-artifacts/IStaking.json",
"test/generated-artifacts/IStakingEvents.json",
"test/generated-artifacts/IStakingProxy.json",
"test/generated-artifacts/IStorage.json",
"test/generated-artifacts/IStorageInit.json",
"test/generated-artifacts/IStructs.json",
"test/generated-artifacts/IZrxVault.json",
"test/generated-artifacts/LibCobbDouglas.json",
"test/generated-artifacts/LibFixedMath.json",
"test/generated-artifacts/LibFixedMathRichErrors.json",
"test/generated-artifacts/LibSafeDowncast.json",
"test/generated-artifacts/LibStakingRichErrors.json",
"test/generated-artifacts/MixinAbstract.json",
"test/generated-artifacts/MixinConstants.json",
"test/generated-artifacts/MixinCumulativeRewards.json",
"test/generated-artifacts/MixinDeploymentConstants.json",
"test/generated-artifacts/MixinExchangeFees.json",
"test/generated-artifacts/MixinExchangeManager.json",
"test/generated-artifacts/MixinFinalizer.json",
"test/generated-artifacts/MixinParams.json",
"test/generated-artifacts/MixinScheduler.json",
"test/generated-artifacts/MixinStake.json",
"test/generated-artifacts/MixinStakeBalances.json",
"test/generated-artifacts/MixinStakeStorage.json",
"test/generated-artifacts/MixinStakingPool.json",
"test/generated-artifacts/MixinStakingPoolRewards.json",
"test/generated-artifacts/MixinStorage.json",
"test/generated-artifacts/Staking.json",
"test/generated-artifacts/StakingProxy.json",
"test/generated-artifacts/TestAssertStorageParams.json",
"test/generated-artifacts/TestCobbDouglas.json",
"test/generated-artifacts/TestCumulativeRewardTracking.json",
"test/generated-artifacts/TestDelegatorRewards.json",
"test/generated-artifacts/TestExchangeManager.json",
"test/generated-artifacts/TestFinalizer.json",
"test/generated-artifacts/TestInitTarget.json",
"test/generated-artifacts/TestLibFixedMath.json",
"test/generated-artifacts/TestLibSafeDowncast.json",
"test/generated-artifacts/TestMixinCumulativeRewards.json",
"test/generated-artifacts/TestMixinParams.json",
"test/generated-artifacts/TestMixinScheduler.json",
"test/generated-artifacts/TestMixinStake.json",
"test/generated-artifacts/TestMixinStakeBalances.json",
"test/generated-artifacts/TestMixinStakeStorage.json",
"test/generated-artifacts/TestMixinStakingPool.json",
"test/generated-artifacts/TestMixinStakingPoolRewards.json",
"test/generated-artifacts/TestProtocolFees.json",
"test/generated-artifacts/TestProxyDestination.json",
"test/generated-artifacts/TestStaking.json",
"test/generated-artifacts/TestStakingNoWETH.json",
"test/generated-artifacts/TestStakingProxy.json",
"test/generated-artifacts/TestStakingProxyUnit.json",
"test/generated-artifacts/TestStorageLayoutAndConstants.json",
"test/generated-artifacts/ZrxVault.json"
],
"exclude": ["./deploy/solc/solc_bin"]
}