Patched address bug

omgnetwork · Jul 11, 2018 · cb6bc09 · cb6bc09
1 parent 595b7e8
commit cb6bc09
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ root-chain:
 
 .PHONY: child-chain
 child-chain:
-	python plasma/child_chain/server.py
+	PYTHONPATH=. python plasma/child_chain/server.py
 
 .PHONY: clean
 clean: clean-build clean-pyc

diff --git a/plasma/child_chain/server.py b/plasma/child_chain/server.py
@@ -2,11 +2,11 @@
 from werkzeug.serving import run_simple
 from jsonrpc import JSONRPCResponseManager, dispatcher
 from plasma.child_chain.child_chain import ChildChain
-from plasma.config import plasma_config
 from plasma.root_chain.deployer import Deployer
+from plasma_core.constants import CONTRACT_ADDRESS, AUTHORITY
 
-root_chain = Deployer().get_contract_at_address("RootChain", plasma_config['ROOT_CHAIN_CONTRACT_ADDRESS'], concise=False)
-child_chain = ChildChain(plasma_config['AUTHORITY'], root_chain)
+root_chain = Deployer().get_contract_at_address("RootChain", CONTRACT_ADDRESS, concise=False)
+child_chain = ChildChain(bytes.fromhex(AUTHORITY['address'][2:]), root_chain)
 
 
 @Request.application

diff --git a/plasma/config.py b/plasma/config.py
diff --git a/plasma_core/constants.py b/plasma_core/constants.py
@@ -1,5 +1,7 @@
 from ethereum import utils as u
 
+CONTRACT_ADDRESS = '0xA3B2a1804203b75b494028966C0f62e677447A39'
+
 AUTHORITY = {
     'address': '0xfd02EcEE62797e75D86BCff1642EB0844afB28c7',
     'key': u.normalize_key(b'3bb369fecdc16b93b99514d8ed9c2e87c5824cf4a6a98d2e8e91b7dd0c063304')