From cf4c3b1eb9dca14670a36281338b9a37077ac5a3 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 23 Jul 2019 11:53:36 -0700 Subject: [PATCH 1/6] remove changeset plugin from all steps --- .drone.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/.drone.yml b/.drone.yml index fff9e28f..8718b4e7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,20 +26,6 @@ steps: - yarn migrate:ci depends_on: - clone - when: - changeset: - includes: - [ - .drone.yml, - package.json, - tsconfig.json, - packages/go-kosu/**/*.*, - packages/kosu-sdk-contracts/**/*.*, - packages/kosu-system-contracts/**/*.*, - packages/kosu.js/**/*.*, - packages/tslint-config/**/*.*, - packages/tsc-config/**/*.*, - ] - name: npm-tests image: gcr.io/kosu-io/node-lts:latest @@ -50,17 +36,6 @@ steps: - yarn test:ci depends_on: - build-project - when: - changeset: - includes: - [ - .drone.yml, - packages/kosu-sdk-contracts/**/*.*, - packages/kosu-system-contracts/**/*.*, - packages/kosu.js/**/*.*, - packages/tslint-config/**/*.*, - packages/tsc-config/**/*.*, - ] - name: solidity-tests image: gcr.io/kosu-io/node-lts:latest @@ -71,17 +46,6 @@ steps: - yarn contracts:test:ci depends_on: - build-project - when: - changeset: - includes: - [ - .drone.yml, - packages/kosu-sdk-contracts/**/*.*, - packages/kosu-system-contracts/**/*.*, - packages/tslint-config/**/*.*, - packages/tsc-config/**/*.*, - tsconfig.json, - ] - name: go-kosu image: gcr.io/kosu-io/go-kosu-ci:latest @@ -93,15 +57,6 @@ steps: - make ci depends_on: - build-project - when: - changeset: - includes: - [ - .drone.yml, - packages/go-kosu/**/*.*, - packages/kosu-sdk-contracts/**/*.*, - packages/kosu-system-contracts/**/*.*, - ] services: - name: kosu-geth From bb072ad92eb46821a97a7b7966963cd159781808 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 23 Jul 2019 12:20:17 -0700 Subject: [PATCH 2/6] go tests can be run outside of main build --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8718b4e7..b0e9985c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,8 +55,6 @@ steps: commands: - cd packages/go-kosu - make ci - depends_on: - - build-project services: - name: kosu-geth From 67f06e85d0efd668b3635062816fb11a569430a2 Mon Sep 17 00:00:00 2001 From: Henry Harder Date: Tue, 23 Jul 2019 12:29:31 -0700 Subject: [PATCH 3/6] does depend on build due to ABI generation --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index b0e9985c..8718b4e7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,6 +55,8 @@ steps: commands: - cd packages/go-kosu - make ci + depends_on: + - build-project services: - name: kosu-geth From b3931ded6cb176ac4cb031976005d843c48a6c93 Mon Sep 17 00:00:00 2001 From: Nick Freyaldenhoven Date: Tue, 23 Jul 2019 16:10:44 -0500 Subject: [PATCH 4/6] Reverting the default period change. --- packages/kosu-geth/genesis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kosu-geth/genesis.json b/packages/kosu-geth/genesis.json index 460b5bc5..c439f023 100644 --- a/packages/kosu-geth/genesis.json +++ b/packages/kosu-geth/genesis.json @@ -9,7 +9,7 @@ "byzantiumBlock": 4, "constantinopleBlock": 5, "clique": { - "period": 1, + "period": 0, "epoch": 30000 } }, From 659424be29ecf10a017e13fd4d125dcd1b451d7b Mon Sep 17 00:00:00 2001 From: Nick Freyaldenhoven Date: Tue, 23 Jul 2019 17:33:08 -0500 Subject: [PATCH 5/6] Fixing 0x migration issue. --- packages/kosu-system-contracts/src/bin/deliver_tokens.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kosu-system-contracts/src/bin/deliver_tokens.ts b/packages/kosu-system-contracts/src/bin/deliver_tokens.ts index e80d4caf..3873417c 100644 --- a/packages/kosu-system-contracts/src/bin/deliver_tokens.ts +++ b/packages/kosu-system-contracts/src/bin/deliver_tokens.ts @@ -37,6 +37,7 @@ if (args["test-mnemonic"] || !mnemonic) { const addresses = await web3.eth.getAccounts(); for (const account of addresses) { + if (account.toLowerCase() === "0x5409ed021d9299bf6814279a6a1411a7e866a631" ) { return; } const expectedAmount = await kosuToken.estimateEtherToToken.callAsync(new BigNumber(web3.utils.toWei("60"))); /* tslint:disable */ await kosuToken.bondTokens From d36f23da979663a9027de508c0f0cb8eb4d77858 Mon Sep 17 00:00:00 2001 From: Nick Freyaldenhoven Date: Tue, 23 Jul 2019 17:43:18 -0500 Subject: [PATCH 6/6] running prettier. --- packages/kosu-system-contracts/src/bin/deliver_tokens.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/kosu-system-contracts/src/bin/deliver_tokens.ts b/packages/kosu-system-contracts/src/bin/deliver_tokens.ts index 3873417c..05bc9885 100644 --- a/packages/kosu-system-contracts/src/bin/deliver_tokens.ts +++ b/packages/kosu-system-contracts/src/bin/deliver_tokens.ts @@ -37,7 +37,9 @@ if (args["test-mnemonic"] || !mnemonic) { const addresses = await web3.eth.getAccounts(); for (const account of addresses) { - if (account.toLowerCase() === "0x5409ed021d9299bf6814279a6a1411a7e866a631" ) { return; } + if (account.toLowerCase() === "0x5409ed021d9299bf6814279a6a1411a7e866a631") { + return; + } const expectedAmount = await kosuToken.estimateEtherToToken.callAsync(new BigNumber(web3.utils.toWei("60"))); /* tslint:disable */ await kosuToken.bondTokens