Skip to content

Commit

Permalink
updated solc module
Browse files Browse the repository at this point in the history
  • Loading branch information
ToJen committed Dec 12, 2018
1 parent 304e36b commit 44a057b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5,373 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@titan-suite/cli",
"description": "The complete smart contract development tool",
"version": "0.2.0",
"version": "0.2.4",
"bin": {
"titan": "./bin/run"
},
Expand All @@ -26,7 +26,7 @@
"node-notifier": "^5.2.1",
"path": "^0.12.7",
"repl": "^0.1.3",
"solc": "github:tojen/solc-js#aion_emscripten",
"aion-solc": "github:tojen/solc-js#aion_emscripten",
"solhint": "^1.2.1",
"tslib": "^1"
},
Expand Down
1 change: 1 addition & 0 deletions src/typings/aion-solc/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module 'aion-solc'
1 change: 0 additions & 1 deletion src/typings/solc/index.d.ts

This file was deleted.

5 changes: 3 additions & 2 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {Aion} from '@titan-suite/core'
import cli from 'cli-ux'

import * as aionSolc from 'aion-solc'
import * as download from 'download-git-repo'
import * as fs from 'fs'
import * as mkdirp from 'mkdirp'
import * as path from 'path'
import * as solc from 'solc'

import {getTemplateContract, getTemplateTest} from './templates'

Expand Down Expand Up @@ -79,7 +80,7 @@ export const readContract = (contract: any) => readUtf8(contractPath(contract))
export const compile = async function (sol: string, locally: boolean) {
if (locally) {
return new Promise((resolve, reject) => {
const {contracts, errors} = solc.compile(sol, 1)
const {contracts, errors} = aionSolc.compile(sol, 1)
if (errors) reject(errors)
resolve(contracts)
})
Expand Down

0 comments on commit 44a057b

Please sign in to comment.