Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typechain integration #331

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/node_modules
/dist
/app/web3/contracts/*.ts
.env
.nyc_output
coverage
Expand Down
4 changes: 2 additions & 2 deletions app/components/commitfunds/CommitUnknownUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { selectMyEtherWallerUrl } from "../../reducers/formSelectors";
import { IAppState } from "../../reducers/index";
import { selectEthNetwork } from "../../reducers/web3State";
import { etherscanUrl } from "../../utils/etherscan";
import { publicCommitment } from "../../web3/contracts/ContractsRepository";
import { publicCommitment } from "../../web3/ContractsRepository";
import { LegalAgreementsDownload } from "../LegalAgreementsDownload";
import * as style from "./CommitUnknownUser.scss";
import { CommitUnknownUserDesc } from "./CommitUnknownUserDesc";
Expand Down Expand Up @@ -103,7 +103,7 @@ export const CommitUnknownUser = connect(
minTicketWei: selectMinTicketWei(state.commitmentState),
estimatedReward: selectEstimatedReward(state.commitmentState),
loadingEstimatedReward: selectEstimatedRewardLoadingState(state.commitmentState),
transactionPayload: publicCommitment.rawWeb3Contract.commit.getData(),
transactionPayload: publicCommitment.commitTx().getData(),
gasPrice: config.contractsDeployed.gasPrice,
gasLimit: config.contractsDeployed.gasLimit,
myEtherWalletUrl: selectMyEtherWallerUrl(state),
Expand Down
2 changes: 1 addition & 1 deletion app/reducers/formSelectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { formValueSelector } from "redux-form";
import config from "../config";
import { myEtherWalletUrl } from "../utils/myetherwallet";
import { parseStrToNumStrict } from "../utils/utils";
import { publicCommitment } from "../web3/contracts/ContractsRepository";
import { publicCommitment } from "../web3/ContractsRepository";
import { IAppState } from "./index";

export const selectMyEtherWallerUrl = (state: IAppState): string => {
Expand Down
2 changes: 1 addition & 1 deletion app/startup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import reduxThunk from "redux-thunk";
import { setFatalErrorActionCreator } from "./actions/fatalErrorActions";
import reducers, { IAppState } from "./reducers";
import { checkIfSupportedBrowser } from "./utils/utils";
import { initRepository } from "./web3/contracts/ContractsRepository";
import { initRepository } from "./web3/ContractsRepository";
import { Web3Service } from "./web3/web3Service";

const persistStorePromised = promisify(persistStore) as any;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import promiseAll = require("promise-all");

import { AppState } from "../../actions/constants";
import config from "../../config";
import { Web3Service } from "../web3Service";
import EthToken from "./EthToken";
import EuroToken from "./EuroToken";
import LockedAccount from "./LockedAccount";
import Neumark from "./Neumark";
import PublicCommitment from "./PublicCommitment";
import { AppState } from "../actions/constants";
import config from "../config";
import { EthToken } from "./contracts/EthToken";
import { EuroToken } from "./contracts/EuroToken";
import { PublicCommitment } from "./contracts/extensions/PublicCommitment";
import { LockedAccount } from "./contracts/LockedAccount";
import { Neumark } from "./contracts/Neumark";
import { Web3Service } from "./web3Service";

export let publicCommitment: PublicCommitment = null;
export let neumark: Neumark = null;
Expand Down
39 changes: 0 additions & 39 deletions app/web3/contracts/EthToken.ts

This file was deleted.

39 changes: 0 additions & 39 deletions app/web3/contracts/EuroToken.ts

This file was deleted.

57 changes: 0 additions & 57 deletions app/web3/contracts/LockedAccount.ts

This file was deleted.

47 changes: 0 additions & 47 deletions app/web3/contracts/Neumark.ts

This file was deleted.

115 changes: 0 additions & 115 deletions app/web3/contracts/PublicCommitment.ts

This file was deleted.

Loading