Skip to content

fix --allow-paths, and removed pragma hardcode #33

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.

Sign up for GitHub

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

Open
denys-popov wants to merge 1 commit into
base: development
Choose a base branch
from
+8 −7
Open

fix --allow-paths, and removed pragma hardcode #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions flattener/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import sys
import subprocess

def flatten_contract(solc_AST, output_dest):
def flatten_contract(solc_AST, output_dest, target_solidity_file):
contract_regex = re.compile(r'(ContractDefinition \"(.+)\"(?:\n\s+Gas costs: \d+)?\n(?: +.+\n)+)')
contract_source_regex = re.compile(r'ContractDefinition \".+\"(?:\n\s+Gas costs: \d+)?\n +Source: "(.+)"')
inheritance_regex = re.compile(r'InheritanceSpecifier(?:\n\s+Gas costs: \d+)?\n\s+Source: "(.+)"')
Expand Down Expand Up @@ -55,7 +55,8 @@ def flatten_contract(solc_AST, output_dest):
return

processed_contracts = set()
output_solidity_code = "pragma solidity ^0.4.13;\n\n"
pragma=open(target_solidity_file).readline()
output_solidity_code = "{0}\n".format(pragma)
while processed_contracts != contracts_with_sources:
# print(processed_contracts, "vs", contracts_with_sources)
for cname, cdepends in dependency_graph.items():
Expand Down Expand Up @@ -89,13 +90,13 @@ def main():
help="Specifies the path replacements to pass onto solidity. See solc --help for more information.")
args = parser.parse_args()

solc_args = ["solc", "--allow-paths", "."]
if args.solc_paths:
solc_args = ["solc", args.solc_paths, "--ast", args.target_solidity_file]
else:
solc_args = ["solc", "--ast", args.target_solidity_file]
solc_args.append(args.solc_paths)
solc_args.extend(["--ast", args.target_solidity_file])
solc_proc = subprocess.run(solc_args, stdout=subprocess.PIPE, universal_newlines=True)
solc_proc.check_returncode()
flatten_contract(solc_proc.stdout, args.output)
flatten_contract(solc_proc.stdout, args.output, args.target_solidity_file)

if __name__ == '__main__':
main()
main()