Skip to content

Commit

Permalink
Rename version.json to protocol_changes.json
Browse files Browse the repository at this point in the history
- Keep old `version.json` for now, for backwards‐compatibility

- Whitespace
  • Loading branch information
adamkrellenstein committed Dec 20, 2014
1 parent 39a6d63 commit 72eb793
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 41 deletions.
2 changes: 1 addition & 1 deletion lib/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def check_change(protocol_change):

def version (block_index):
try:
host = 'https://counterpartyxcp.github.io/counterpartyd/version.json'
host = 'https://counterpartyxcp.github.io/counterpartyd/protocol_changes.json'
response = requests.get(host, headers={'cache-control': 'no-cache'})
versions = json.loads(response.text)
except Exception as e:
Expand Down
6 changes: 3 additions & 3 deletions lib/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
BLOCK_LEDGER = []

CURR_DIR = os.path.dirname(os.path.realpath(__file__))
with open(CURR_DIR + '/../version.json') as f:
VERSIONS = json.load(f)
with open(CURR_DIR + '/../protocol_changes.json') as f:
PROTOCOL_CHANGES = json.load(f)

class RPCError (Exception): pass

Expand Down Expand Up @@ -913,7 +913,7 @@ def hexlify(x):

### Protocol Changes ###
def enabled (change_name, block_index):
enable_block_index = VERSIONS[change_name]['block_index']
enable_block_index = PROTOCOL_CHANGES[change_name]['block_index']

if config.TESTNET:
return True # Protocol changes are always retroactive on testnet.
Expand Down
38 changes: 38 additions & 0 deletions protocol_changes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"numeric_asset_names": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"multisig_addresses": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"send_destination_required": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"contracts_only_xcp_balances": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"better_single_source_destination": {
"minimum_version_major": 9,
"minimum_version_minor": 48,
"minimum_version_revision": 0,
"block_index": 335000
},
"hotfix_numeric_assets": {
"minimum_version_major": 9,
"minimum_version_minor": 49,
"minimum_version_revision": 0,
"block_index": 334000
}
}
42 changes: 5 additions & 37 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,7 @@
{
"numeric_asset_names": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"multisig_addresses": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"send_destination_required": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"contracts_only_xcp_balances": {
"minimum_version_major": 9,
"minimum_version_minor": 47,
"minimum_version_revision": 1,
"block_index": 333500
},
"better_single_source_destination": {
"minimum_version_major": 9,
"minimum_version_minor": 48,
"minimum_version_revision": 0,
"block_index": 335000
},

"hotfix_numeric_assets": {
"minimum_version_major": 9,
"minimum_version_minor": 49,
"minimum_version_revision": 0,
"block_index": 334000
}
"minimum_version_major": 9,
"minimum_version_minor": 49,
"minimum_version_revision": 0,
"reason": "hotfix: numeric asset names",
"block_index": 334000
}

0 comments on commit 72eb793

Please sign in to comment.