From dba2367157fc4ad7947ee1632dbe76d6a110f49f Mon Sep 17 00:00:00 2001 From: zsfelfoldi Date: Tue, 14 Apr 2015 15:20:52 +0200 Subject: NatSpec contracts are now not in the genesis block but added by the test --- core/contracts.go | 44 -------------------------------------------- core/genesis.go | 1 - 2 files changed, 45 deletions(-) delete mode 100644 core/contracts.go (limited to 'core') diff --git a/core/contracts.go b/core/contracts.go deleted file mode 100644 index 9d63e4043..000000000 --- a/core/contracts.go +++ /dev/null @@ -1,44 +0,0 @@ -package core - -const ( // built-in contracts address and code - ContractAddrURLhint = "0000000000000000000000000000000000000008" - //ContractCodeURLhint = "0x60b180600c6000396000f30060003560e060020a90048063d66d6c1014601557005b60216004356024356027565b60006000f35b6000600083815260200190815260200160002054600160a060020a0316600014806075575033600160a060020a03166000600084815260200190815260200160002054600160a060020a0316145b607c5760ad565b3360006000848152602001908152602001600020819055508060016000848152602001908152602001600020819055505b505056" - ContractCodeURLhint = "0x60003560e060020a90048063d66d6c1014601557005b60216004356024356027565b60006000f35b6000600083815260200190815260200160002054600160a060020a0316600014806075575033600160a060020a03166000600084815260200190815260200160002054600160a060020a0316145b607c5760ad565b3360006000848152602001908152602001600020819055508060016000848152602001908152602001600020819055505b505056" - /* - contract URLhint { - function register(uint256 _hash, uint256 _url) { - if (owner[_hash] == 0 || owner[_hash] == msg.sender) { - owner[_hash] = msg.sender; - url[_hash] = _url; - } - } - mapping (uint256 => address) owner; - mapping (uint256 => uint256) url; - } - */ - - ContractAddrHashReg = "0000000000000000000000000000000000000009" - ContractCodeHashReg = "0x60003560e060020a9004806331e12c2014601f578063d66d6c1014602b57005b6025603d565b60006000f35b6037600435602435605d565b60006000f35b600054600160a060020a0316600014605357605b565b336000819055505b565b600054600160a060020a031633600160a060020a031614607b576094565b8060016000848152602001908152602001600020819055505b505056" - //ContractCodeHashReg = "0x609880600c6000396000f30060003560e060020a9004806331e12c2014601f578063d66d6c1014602b57005b6025603d565b60006000f35b6037600435602435605d565b60006000f35b600054600160a060020a0316600014605357605b565b336000819055505b565b600054600160a060020a031633600160a060020a031614607b576094565b8060016000848152602001908152602001600020819055505b505056" - /* - contract HashReg { - function setowner() { - if (owner == 0) { - owner = msg.sender; - } - } - function register(uint256 _key, uint256 _content) { - if (msg.sender == owner) { - content[_key] = _content; - } - } - address owner; - mapping (uint256 => uint256) content; - } - */ - - BuiltInContracts = ` - "` + ContractAddrURLhint + `": {"balance": "0", "code": "` + ContractCodeURLhint + `" }, - "` + ContractAddrHashReg + `": {"balance": "0", "code": "` + ContractCodeHashReg + `" }, - ` -) diff --git a/core/genesis.go b/core/genesis.go index c475ca637..1159a5cec 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -63,7 +63,6 @@ const ( var genesisData = []byte(`{ "` + TestAccount + `": {"balance": "` + TestBalance + `"}, - ` + BuiltInContracts + ` "0000000000000000000000000000000000000001": {"balance": "1"}, "0000000000000000000000000000000000000002": {"balance": "1"}, "0000000000000000000000000000000000000003": {"balance": "1"}, -- cgit v1.2.3