Skip to content

/ kosu-monorepo

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

Refactor/dependencies #198

Merged
merged 22 commits into from Jul 31, 2019
+3,477 −2,863
Merged

Refactor/dependencies #198

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c6aebdd
Congregating some dependencies to the monorepo root to be shared.
Freydal Jul 29, 2019
aea71b4
Fast exiting to waste less time.
Freydal Jul 29, 2019
08fe274
Further updating packages.
Freydal Jul 29, 2019
724591d
Removing custom chagnes that have been merged in. Using the 0x assets.
Freydal Jul 29, 2019
393b302
Fixing issues from updated changes.
Freydal Jul 29, 2019
c9d0d08
Running prettier
Freydal Jul 30, 2019
f103b58
Merge branch 'master' into refactor/dependencies
hrharder Jul 30, 2019
49984ec
Fixing additional build issues
Freydal Jul 30, 2019
b6107a7
Merge branch 'refactor/dependencies' of github.com:ParadigmFoundation…
Freydal Jul 30, 2019
eff625a
Running prettier
Freydal Jul 30, 2019
2a215f1
Using web3 v1 release!
Freydal Jul 30, 2019
e2494c7
Removeing new v2 web3 traces
Freydal Jul 30, 2019
3110c05
Fixing a missing require depenency
Freydal Jul 30, 2019
f4461dd
Fixing linter issue
Freydal Jul 30, 2019
72c0f98
Fixing issue with abi rolled into generated assets
Freydal Jul 30, 2019
700be83
Fixing loose typing issues.
Freydal Jul 30, 2019
a906800
Running pretiter
Freydal Jul 30, 2019
b3a3318
Reintroducing our customization.
Freydal Jul 30, 2019
e861979
Removing unused import.
Freydal Jul 30, 2019
4db27ea
Testing a clean build for less failed ci builds
Freydal Jul 30, 2019
0cc9fc5
Updating lock
Freydal Jul 30, 2019
a1bf1c9
Merge branch 'master' into refactor/dependencies
Freydal Jul 31, 2019
File filter...
Filter file types
Clear filters
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Prev Next

Running prettier

  • Loading branch information
@Freydal
Freydal committed Jul 30, 2019
commit c9d0d08dd0ef1da5e948466e27dde6d1a58d25c4
5 packages/kosu-system-contracts/src/bin/deliver_tokens.ts
View file
Open in desktop
@@ -29,10 +29,7 @@ if (args["test-mnemonic"] || !mnemonic) {

const networkId = await web3.eth.net.getId();

const kosuToken = new KosuTokenContract(
DeployedAddresses[networkId].KosuToken,
provider,
);
const kosuToken = new KosuTokenContract(DeployedAddresses[networkId].KosuToken, provider);
const addresses = await web3.eth.getAccounts();

for (const account of addresses) {
4 packages/kosu-system-contracts/src/bin/migrate.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { BlockchainLifecycle } from "@0x/dev-utils";
import { MnemonicWalletSubprovider, RPCSubprovider } from "@0x/subproviders";
import { providerUtils } from "@0x/utils";
import {provider} from 'web3-providers';
import { provider } from "web3-providers";
import { Web3Wrapper } from "@0x/web3-wrapper";
import fs from "fs";
import safeRequire from "safe-node-require";
@@ -35,7 +35,7 @@ if (args["test-mnemonic"] || !mnemonic) {
providerEngine.addProvider(rpcSubprovider);
providerUtils.startProviderEngine(providerEngine);

const web3 = new Web3(providerEngine as unknown as provider);
const web3 = new Web3((providerEngine as unknown) as provider);

const normalizedFromAddress = await web3.eth.getCoinbase().then((x: string) => x.toLowerCase());

2 packages/kosu-system-contracts/src/eventDecoder.ts
View file
Open in desktop
@@ -1,4 +1,4 @@
const Decoder: any = require('web3-eth-abi');
const Decoder: any = require("web3-eth-abi");
import { hexToNumberString, soliditySha3 } from "web3-utils";

import * as EventEmitter from "../generated-artifacts/EventEmitter.json";
4 packages/kosu-system-contracts/test/init_test.ts
View file
Open in desktop
@@ -94,7 +94,9 @@ before(async () => {
txDefaults,
JSON.stringify(argumentsJson),
);
contracts.kosuToken.bondTokens.awaitTransactionSuccessAsync(TestValues.zero, { value: TestValues.oneEther.times(85) });
contracts.kosuToken.bondTokens.awaitTransactionSuccessAsync(TestValues.zero, {
value: TestValues.oneEther.times(85),
});
if (!useGeth) {
web3.eth.personal.importRawKey(
"0xf2f48ee19680706196e2e339e5da3491186e0c4c5030670656b0e0164837257d",
7 packages/kosu-system-contracts/test/poster_registry.ts
View file
Open in desktop
@@ -47,8 +47,8 @@ describe("PosterRegistry", () => {
.callAsync(from)
.then(x => x.toString())
.should.eventually.eq("0");
await posterRegistry.registerTokens.awaitTransactionSuccessAsync(TestValues.oneHundredEther, { from }).should.eventually.be
.rejected;
await posterRegistry.registerTokens.awaitTransactionSuccessAsync(TestValues.oneHundredEther, { from })
.should.eventually.be.rejected;
});

it("should require an approval greater or equal to the amount registered", async () => {
@@ -65,7 +65,8 @@ describe("PosterRegistry", () => {
.callAsync(from, treasury.address)
.then(x => x.toString())
.should.eventually.eq("0");
await posterRegistry.registerTokens.awaitTransactionSuccessAsync(TestValues.oneHundredEther).should.eventually.be.rejected;
await posterRegistry.registerTokens.awaitTransactionSuccessAsync(TestValues.oneHundredEther).should
.eventually.be.rejected;
});

it("should increase tokensContributed and tokensRegisteredFor by the amount", async () => {
97 packages/kosu-system-contracts/test/validator_registry.ts
View file
Open in desktop
@@ -832,8 +832,12 @@ describe("ValidatorRegistry", async () => {
.toString(),
);

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[1]);
await testHelpers.clearTreasury(accounts[2]);
@@ -891,8 +895,12 @@ describe("ValidatorRegistry", async () => {
.toString()
.should.eq(await testHelpers.toStakeholderCut(minimumBalance));

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[1]);
await testHelpers.clearTreasury(accounts[2]);
@@ -953,8 +961,12 @@ describe("ValidatorRegistry", async () => {
.toString(),
);

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[1]);
@@ -1013,8 +1025,12 @@ describe("ValidatorRegistry", async () => {
.toString()
.should.eq(await testHelpers.toStakeholderCut(minimumBalance));

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[1]);
await testHelpers.clearTreasury(accounts[2]);
@@ -1061,8 +1077,9 @@ describe("ValidatorRegistry", async () => {

await validatorRegistry.resolveChallenge.awaitTransactionSuccessAsync(tendermintPublicKey).should.eventually
.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[5] })
.should.eventually.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[5],
}).should.eventually.be.fulfilled;

const finalVoterSystemBalance = await treasury.systemBalance.callAsync(accounts[5]);
const finalVoterCurrentBalance = await treasury.currentBalance.callAsync(accounts[5]);
@@ -1076,8 +1093,12 @@ describe("ValidatorRegistry", async () => {
.toString()
.should.eq("0");

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[1]);
@@ -1122,8 +1143,9 @@ describe("ValidatorRegistry", async () => {

await validatorRegistry.resolveChallenge.awaitTransactionSuccessAsync(tendermintPublicKey).should.eventually
.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[5] })
.should.eventually.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[5],
}).should.eventually.be.fulfilled;

const finalVoterSystemBalance = await treasury.systemBalance.callAsync(accounts[5]);
const finalVoterCurrentBalance = await treasury.currentBalance.callAsync(accounts[5]);
@@ -1137,8 +1159,12 @@ describe("ValidatorRegistry", async () => {
.toString()
.should.eq("0");

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[1]);
@@ -1183,8 +1209,9 @@ describe("ValidatorRegistry", async () => {

await validatorRegistry.resolveChallenge.awaitTransactionSuccessAsync(tendermintPublicKey).should.eventually
.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[5] })
.should.eventually.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[5],
}).should.eventually.be.fulfilled;

const finalVoterSystemBalance = await treasury.systemBalance.callAsync(accounts[5]);
const finalVoterCurrentBalance = await treasury.currentBalance.callAsync(accounts[5]);
@@ -1198,8 +1225,12 @@ describe("ValidatorRegistry", async () => {
.toString()
.should.eq(minimumBalance.minus(await testHelpers.toStakeholderCut(minimumBalance)).toString());

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[5]);
@@ -1242,8 +1273,9 @@ describe("ValidatorRegistry", async () => {
const initialListingHolderSystemBalance = await treasury.systemBalance.callAsync(accounts[0]);
const initialListingHolderCurrentBalance = await treasury.currentBalance.callAsync(accounts[0]);

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[5] })
.should.eventually.be.fulfilled;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[5],
}).should.eventually.be.fulfilled;

const finalChallengerSystemBalance = await treasury.systemBalance.callAsync(accounts[1]);
const finalListingHolderSystemBalance = await treasury.systemBalance.callAsync(accounts[0]);
@@ -1266,8 +1298,12 @@ describe("ValidatorRegistry", async () => {
.toString(),
);

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[1]);
@@ -1306,12 +1342,17 @@ describe("ValidatorRegistry", async () => {
from: accounts[5],
});

await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[5] })
.should.eventually.be.rejected;
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[5],
}).should.eventually.be.rejected;

await testHelpers.skipChallengePeriod(blockNumber);
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[1] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), { from: accounts[2] });
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[1],
});
await validatorRegistry.claimWinnings.awaitTransactionSuccessAsync(new BigNumber(challengeId), {
from: accounts[2],
});

await testHelpers.clearTreasury(accounts[0]);
await testHelpers.clearTreasury(accounts[1]);
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.