https://github.com/neo-project/neo/pull/2240

CityOfZion · Feb 15, 2021 · 023b986 · 023b986
1 parent 4693228
commit 023b986
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/neo3/contracts/native/management.py b/neo3/contracts/native/management.py
@@ -170,24 +170,20 @@ def contract_create_with_data(self,
         )
 
         nef = contracts.NEF.deserialize_from_bytes(nef_file)
+        parsed_manifest = contracts.ContractManifest.from_json(json.loads(manifest.decode()))
         sb = vm.ScriptBuilder()
         sb.emit(vm.OpCode.ABORT)
         sb.emit_push(engine.script_container.sender.to_array())
-        sb.emit_push(nef.script)
+        sb.emit_push(nef.checksum)
+        sb.emit_push(parsed_manifest.name)
         hash_ = to_script_hash(sb.to_array())
 
         key = self.create_key(self._PREFIX_CONTRACT + hash_.to_array())
         contract = engine.snapshot.storages.try_get(key)
         if contract is not None:
             raise ValueError("Contract already exists")
 
-        contract = storage.ContractState(
-            self.get_next_available_id(engine.snapshot),
-            nef,
-            contracts.ContractManifest.from_json(json.loads(manifest.decode())),
-            0,
-            hash_
-        )
+        contract = storage.ContractState(self.get_next_available_id(engine.snapshot), nef, parsed_manifest, 0, hash_)
 
         if not contract.manifest.is_valid(hash_):
             raise ValueError("Error: invalid manifest")

diff --git a/neo3/contracts/native/nativecontract.py b/neo3/contracts/native/nativecontract.py
@@ -61,7 +61,8 @@ def init(self):
         sb = vm.ScriptBuilder()
         sb.emit(vm.OpCode.ABORT)
         sb.emit_push(sender.to_array())
-        sb.emit_push(self._script)
+        sb.emit_push(self.nef.checksum)
+        sb.emit_push(self.service_name())
         self._hash: types.UInt160 = to_script_hash(sb.to_array())
         self._manifest: contracts.ContractManifest = contracts.ContractManifest()
         self._manifest.name = self.service_name()