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

[cli] Solution for build error contractkit on Linux 19.04 distro #960

Merged
merged 15 commits into from
Sep 28, 2019
Merged
Show file tree
Hide file tree
Changes from 13 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
32 changes: 32 additions & 0 deletions packages/cli/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions packages/protocol/.solcover.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/protocol/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Then, to deploy contracts to a network run:
yarn run init-network -n NETWORK
```

This will deploy the contracts to the network specified in `truffle.js` and save the artifacts to `build/NETWORK`.
This will deploy the contracts to the network specified in `truffle-config.js` and save the artifacts to `build/NETWORK`.
If your network was deployed with `helm`, you will probably set `NETWORK` the same as your `NAME` (which sets `NAMESPACE_NAME` and `RELEASE_NAME`). For more clarity on these names, also see the [testnet helm chart README](../helm-charts/testnet/README.md)

### Migrations
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/migrations/07_reserve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '@celo/protocol/lib/web3-utils'
import { config } from '@celo/protocol/migrationsConfig'
import { RegistryInstance, ReserveInstance } from 'types'
const truffle = require('@celo/protocol/truffle.js')
const truffle = require('@celo/protocol/truffle-config.js')

const initializeArgs = async (): Promise<[string, number]> => {
const registry: RegistryInstance = await getDeployedProxiedContract<RegistryInstance>(
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/migrations/08_stabletoken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
StableTokenInstance,
} from 'types'

const truffle = require('@celo/protocol/truffle.js')
const truffle = require('@celo/protocol/truffle-config.js')
const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'

const initializeArgs = async (): Promise<any[]> => {
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/migrations/15_governance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { config } from '@celo/protocol/migrationsConfig'
import { toFixed } from '@celo/utils/lib/fixidity'

const initializeArgs = async (networkName: string): Promise<any[]> => {
const approver = require('@celo/protocol/truffle.js').networks[networkName].from
const approver = require('@celo/protocol/truffle-config.js').networks[networkName].from

return [
config.registry.predeployedProxyAddress,
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/runTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const glob = require('glob-fs')({
})
const { exec } = require('./lib/test-utils')
const minimist = require('minimist')
const network = require('./truffle.js').networks.development
const network = require('./truffle-config.js').networks.development

const sleep = (seconds) => new Promise((resolve) => setTimeout(resolve, 1000 * seconds))

Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/bash/set_exchange_rate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -euo pipefail
#
# Flags:
# -f: Filepath to csv of (timestamp, stableValue, goldValue) tuples
# -n: name of the network defined in truffle.js to set the exchange rate on
# -n: name of the network defined in truffle-config.js to set the exchange rate on
# -s: StableToken component of exchange rate
# -g: GoldToken component of exchange rate
# -c: Override for truffle config
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/get_balances.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { GoldTokenInstance, StableTokenInstance } from 'types'
* A simple script to check token balances on a testnet.
*
* Expects the following flags:
* network: name of the network defined in truffle.js to deploy to
* network: name of the network defined in truffle-config.js to deploy to
* account: address of the account to transfer tokens to
*
* Run using truffle exec, e.g.:
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/invite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const twilioConfig = require('@celo/protocol/twilio-config')
* A simple script to send a payment and invite a user.
*
* Expects the following flags:
* network: name of the network defined in truffle.js to deploy to
* network: name of the network defined in truffle-config.js to deploy to
* stableValue: amount of stable token to transfer
* goldValue: amount of gold transfer
* phone: phone number of user to invite
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/network_check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const contractMapping: any = {}
* A simple script to check contract state invariants.
*
* Expects the following flags:
* network: name of the network defined in truffle.js to test
* network: name of the network defined in truffle-config.js to test
* build_directory: location of the appropriate build artifacts
*
* Run using truffle exec, e.g.:
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/revoke.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { AttestationsInstance } from 'types'
*
* Expects the following flags:
* phone: the phone number to revoke in E164 format
* network: name of the network defined in truffle.js
* network: name of the network defined in truffle-config.js
*
* Run using truffle exec, e.g.:
* truffle exec identity/scripts/revoke.js --network testnet --phone +18005882300
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/set_exchange_rate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const getLesserAndGreater = (
*
* Expects the following flags:
* csv: Filepath to csv of (timestamp, stableValue, goldValue) tuples
* network: name of the network defined in truffle.js to set the exchange rate on
* network: name of the network defined in truffle-config.js to set the exchange rate on
* stableValue: StableToken component of exchange rate
* goldValue: GoldToken component of exchange rate
*
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol/scripts/truffle/transfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { GoldTokenInstance, StableTokenInstance } from 'types'
* A simple script to transfer token balances on a testnet.
*
* Expects the following flags:
* network: name of the network defined in truffle.js to deploy to
* network: name of the network defined in truffle-config.js to deploy to
* to: address of the account to transfer tokens to
* stableValue: amount of stable token to transfer
* goldValue: amount of gold transfer
Expand Down
File renamed without changes.