feat: update to match the newest version of rippled/witness server (#120)

## High Level Overview of Change

Title says it all.

### Context of Change

Title says it all.

### Type of Change

- [x] New feature (non-breaking change which adds functionality)
- [x] Breaking change (fix or feature that would cause existing
functionality to not work as expected)

## Test Plan

Tests pass locally. CI will fail because the Docker container hasn't
been updated.

Author: mvadari

CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [[Unreleased]]
+
+### Changed
+
+- Updated to match the latest versions of rippled and the witness server
+
+## [0.1.0] - 2023-02-22
+
+### Added
+
+- Initial release! Please open up an issue in our repo if you have any
+  feedback or issues to report.

xbridge_cli/bridge/register.py

@@ -49,7 +49,7 @@ def _signers_equal(signers1: Dict[str, Any], signers2: Dict[str, Any]) -> bool:
 
 def _get_bootstrap_chain_and_door(chain_json: Dict[str, Any]) -> Tuple[str, str]:
     endpoint = chain_json["Endpoint"]
-    chain = f"http://{endpoint['IP']}:{endpoint['JsonRPCPort']}"
+    chain = f"http://{endpoint['Host']}:{endpoint['JsonRPCPort']}"
     door = chain_json["DoorAccount"]["Address"]
     return chain, door
 

xbridge_cli/bridge/setup.py

@@ -42,7 +42,7 @@
 
 
 class _UnsignedAttestation(TypedDict):
-    xchain_bridge: XChainBridge
+    xchain_bridge: Dict[str, Any]
     other_chain_source: str
     amount: Amount
     attestation_reward_account: str
@@ -57,34 +57,14 @@ class _SignedAttestation(_UnsignedAttestation):
     signature: str
 
 
-_ATTESTATION_ENCODE_ORDER = [
-    ("other_chain_source", 6),
-    ("amount", 2),
-    ("signature_reward", 4),
-    ("attestation_reward_account", 6),
-    ("was_locking_chain_send", 0),
-    ("xchain_account_create_count", 4),
-    ("destination", 4),
-]
-
-
 def _sign_attestation(
     attestation: _UnsignedAttestation,
-    bridge: XChainBridge,
     wallet: Wallet,
 ) -> _SignedAttestation:
-    # TODO: use this instead once it's been implemented
-    # attestation_xrpl = transaction_json_to_binary_codec_form(attestation)
-    # encoded_obj = encode(attestation_xrpl)
-    bridge_dict: Dict[str, Any] = {"xchain_bridge": bridge.to_dict()}
-    encoded_obj = encode(transaction_json_to_binary_codec_form(bridge_dict))[4:]
-    for key, prefix in _ATTESTATION_ENCODE_ORDER:
-        value = attestation[key]  # type: ignore  # Hard to type
-        if key == "was_locking_chain_send":
-            encoded_obj += "0" + str(value)
-        else:
-            xrpl_attestation = transaction_json_to_binary_codec_form({key: value})
-            encoded_obj += encode(xrpl_attestation)[prefix:]
+    attestation_xrpl = transaction_json_to_binary_codec_form(
+        cast(Dict[str, Any], attestation)
+    )
+    encoded_obj = encode(attestation_xrpl)
     signature = sign(bytes.fromhex(encoded_obj), wallet.private_key)
     signed_attestation: _SignedAttestation = cast(
         _SignedAttestation,
@@ -223,11 +203,11 @@ def setup_bridge(
                 )
 
     locking_endpoint = bootstrap_locking["Endpoint"]
-    locking_url = f"http://{locking_endpoint['IP']}:{locking_endpoint['JsonRPCPort']}"
+    locking_url = f"http://{locking_endpoint['Host']}:{locking_endpoint['JsonRPCPort']}"
     locking_client = JsonRpcClient(locking_url)
 
     issuing_endpoint = bootstrap_issuing["Endpoint"]
-    issuing_url = f"http://{issuing_endpoint['IP']}:{issuing_endpoint['JsonRPCPort']}"
+    issuing_url = f"http://{issuing_endpoint['Host']}:{issuing_endpoint['JsonRPCPort']}"
     issuing_client = JsonRpcClient(issuing_url)
 
     accounts_locking_check = set(
@@ -402,7 +382,7 @@ def _submit_attestation(
         # set up the attestations for the commit
         for account in accounts_issuing_check:
             init_attestation = _UnsignedAttestation(
-                xchain_bridge=bridge_obj,
+                xchain_bridge=bridge_obj.to_dict(),
                 other_chain_source=funding_wallet.classic_address,
                 amount=amount,
                 attestation_reward_account=issuing_door,
@@ -412,7 +392,7 @@ def _submit_attestation(
                 xchain_account_create_count=str(count),
             )
             signed_attestation = _sign_attestation(
-                init_attestation, bridge_obj, issuing_door_wallet
+                init_attestation, issuing_door_wallet
             )
             _submit_attestation(signed_attestation)
             count += 1

xbridge_cli/server/config/templates/bootstrap.jinja

@@ -1,7 +1,7 @@
 {
   "LockingChain": {
     "Endpoint": {
-      "IP": "0.0.0.0",
+      "Host": "0.0.0.0",
       "JsonRPCPort": {{ locking_node_port }}
     },
     "DoorAccount": {
@@ -20,9 +20,9 @@
   "IssuingChain": {
     "Endpoint": {
       {% if is_linux %}
-      "IP": "0.0.0.0",
+      "Host": "0.0.0.0",
       {% else %}
-      "IP": "0.0.0.0",
+      "Host": "0.0.0.0",
       {% endif %}
       "JsonRPCPort": {{ issuing_node_port }}
     },

xbridge_cli/server/config/templates/witness.jinja

@@ -2,9 +2,9 @@
   "LockingChain": {
     "Endpoint": {
       {% if is_docker %}
-      "IP": "192.168.176.2",
+      "Host": "192.168.176.2",
       {% else %}
-      "IP": "127.0.0.1",
+      "Host": "127.0.0.1",
       {% endif %}
       "Port": {{ locking_chain_port }}
     },
@@ -19,11 +19,11 @@
   "IssuingChain": {
     "Endpoint": {
       {% if is_docker %}
-      "IP": "192.168.176.3",
+      "Host": "192.168.176.3",
       {% elif is_linux %}
-      "IP": "127.0.0.2",
+      "Host": "127.0.0.2",
       {% else %}
-      "IP": "127.0.0.1",
+      "Host": "127.0.0.1",
       {% endif %}
       "Port": {{ issuing_chain_port }}
     },
@@ -37,11 +37,11 @@
   },
   "RPCEndpoint": {
     {% if is_docker %}
-    "IP": "0.0.0.0",
+    "Host": "0.0.0.0",
     {% elif is_linux %}
-    "IP": "127.0.0.3",
+    "Host": "127.0.0.3",
     {% else %}
-    "IP": "127.0.0.1",
+    "Host": "127.0.0.1",
     {% endif %}
     "Port": {{ witness_port }}
   },

xbridge_cli/server/start.py

@@ -191,7 +191,7 @@ def start_server(
         _wait_for_process(
             process,
             name,
-            config_json["RPCEndpoint"]["IP"],
+            config_json["RPCEndpoint"]["Host"],
             config_json["RPCEndpoint"]["Port"],
             output_file,
             exe == "docker",
@@ -202,7 +202,7 @@ def start_server(
             "exe": exe,
             "config": config,
             "pid": process.pid,
-            "http_ip": config_json["RPCEndpoint"]["IP"],
+            "http_ip": config_json["RPCEndpoint"]["Host"],
             "http_port": config_json["RPCEndpoint"]["Port"],
         }
         # add witness to config file
@@ -357,7 +357,7 @@ def start_all_servers(
                 _wait_for_process(
                     process,
                     name,
-                    config_json["RPCEndpoint"]["IP"],
+                    config_json["RPCEndpoint"]["Host"],
                     config_json["RPCEndpoint"]["Port"],
                     output_file,
                     witnessd_exe == "docker",
@@ -369,7 +369,7 @@ def start_all_servers(
                     "exe": "docker",
                     "config": config,
                     "pid": process.pid,
-                    "http_ip": config_json["RPCEndpoint"]["IP"],
+                    "http_ip": config_json["RPCEndpoint"]["Host"],
                     "http_port": config_json["RPCEndpoint"]["Port"],
                 }
                 # add witness to config file