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

Fix templates

Browse Source
This commit is contained in:
Leonid Logvinov 2018-05-10 16:57:51 +02:00
parent f854f3ee2b
commit 2e1c2d9dfe
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contract_templates/partials/callAsync.handlebars
View File

@ -16,7 +16,7 @@ async callAsync(
{ {
data: encodedData, data: encodedData,
}, },
this._web3Wrapper.getContractDefaults(), self._web3Wrapper.getContractDefaults(),
) )
const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock); const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
let resultArray = ethersFunction.parse(rawCallResult); let resultArray = ethersFunction.parse(rawCallResult);

4
packages/contract_templates/partials/tx.handlebars
View File

@ -19,7 +19,7 @@ public {{this.tsName}} = {
...txData, ...txData,
data: encodedData, data: encodedData,
}, },
this._web3Wrapper.getContractDefaults(), self._web3Wrapper.getContractDefaults(),
self.{{this.tsName}}.estimateGasAsync.bind( self.{{this.tsName}}.estimateGasAsync.bind(
self, self,
{{> params inputs=inputs}} {{> params inputs=inputs}}
@ -43,7 +43,7 @@ public {{this.tsName}} = {
...txData, ...txData,
data: encodedData, data: encodedData,
}, },
this._web3Wrapper.getContractDefaults(), self._web3Wrapper.getContractDefaults(),
); );
const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults); const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
return gas; return gas;

2
packages/metacoin/test/utils/config.ts
View File

@ -6,7 +6,7 @@ export const config = {
artifactsDir: path.resolve(__dirname, '../../artifacts'), artifactsDir: path.resolve(__dirname, '../../artifacts'),
contractsDir: path.resolve(__dirname, '../../contracts'), contractsDir: path.resolve(__dirname, '../../contracts'),
ganacheLogFile: 'ganache.log', ganacheLogFile: 'ganache.log',
defaults: { txDefaults: {
from: devConstants.TESTRPC_FIRST_ADDRESS, from: devConstants.TESTRPC_FIRST_ADDRESS,
}, },
mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic', mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic',

2
packages/migrations/src/migrate.ts
View File

@ -7,7 +7,7 @@ import * as path from 'path';
import { runMigrationsAsync } from './migration'; import { runMigrationsAsync } from './migration';
(async () => { (async () => {
const defaults = { const txDefaults = {
from: devConstants.TESTRPC_FIRST_ADDRESS, from: devConstants.TESTRPC_FIRST_ADDRESS,
}; };
const providerConfigs = { shouldUseInProcessGanache: false }; const providerConfigs = { shouldUseInProcessGanache: false };

3
packages/migrations/src/migration.ts
View File

@ -3,7 +3,8 @@ import { BigNumber, NULL_BYTES } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper'; import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { artifacts, ArtifactWriter } from './artifacts'; import { ArtifactWriter } from './artifact_writer';
import { artifacts } from './artifacts';
import { DummyTokenContract } from './contract_wrappers/dummy_token'; import { DummyTokenContract } from './contract_wrappers/dummy_token';
import { ExchangeContract } from './contract_wrappers/exchange'; import { ExchangeContract } from './contract_wrappers/exchange';
import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address'; import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address';

0
packages/sol-compiler/solc_bin/.gitkeep Normal file
View File

2
packages/website/ts/components/top_bar/top_bar.tsx
View File

@ -390,7 +390,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
(!this._isViewing0xjsDocs() && (!this._isViewing0xjsDocs() &&
!this._isViewingSmartContractsDocs() && !this._isViewingSmartContractsDocs() &&
!this._isViewingWeb3WrapperDocs() && !this._isViewingWeb3WrapperDocs() &&
!this._isViewingDeployerDocs() && !this._isViewingSolCompilerDocs() &&
!this._isViewingJsonSchemasDocs() && !this._isViewingJsonSchemasDocs() &&
!this._isViewingSolCovDocs() && !this._isViewingSolCovDocs() &&
!this._isViewingSubprovidersDocs() && !this._isViewingSubprovidersDocs() &&