Merge pull request #40 from ethernity-cloud/balancecheck

Balance check
ethernity-cloud · Nov 30, 2022 · ed1cf83 · ed1cf83
2 parents 24c185d + 2962522
commit ed1cf83
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/roles/validate_config_file/tasks/main.yml b/roles/validate_config_file/tasks/main.yml
@@ -16,20 +16,24 @@
 
 - name: Defining node address request
   uri:
-    url: https://blockexplorer.bloxberg.org/api?module=account&action=balance&address={{ config_file_map.ADDRESS }}
-    method: GET
+    url: https://bloxberg.ethernity.cloud
+    method: POST
     headers:
       Content-Type: "application/json"
+    body_format: json
+    body: '{"method":"eth_getBalance","params":["{{ config_file_map.ADDRESS }}","latest"],"id":1,"jsonrpc":"2.0"}'
   register: addressbergs
   retries: 64
   delay: 3
 
 - name: Defining result address request
   uri:
-    url: https://blockexplorer.bloxberg.org/api?module=account&action=balance&address={{ config_file_map.RESULT_ADDRESS }}
-    method: GET
+    url: https://bloxberg.ethernity.cloud
+    method: POST
     headers:
       Content-Type: "application/json"
+    body_format: json
+    body: '{"method":"eth_getBalance","params":["{{ config_file_map.RESULT_ADDRESS }}","latest"],"id":1,"jsonrpc":"2.0"}'
   register: resultbergs
   retries: 64
   delay: 3
@@ -46,38 +50,36 @@
 
 - name: Evaluate ADDRESS message
   debug:
-    msg: "{{ addressbergs.json.message }}"
-  failed_when: addressbergs.json.message != "OK"
-  when: addressbergs.json.message is defined
+    msg: "{{ addressbergs.json }}"
+  failed_when: addressbergs.json == ""
 
 - name: Evaluate RESULT ADDRESS message
-  debug: 
-    msg: "{{ resultbergs.json.message }}" 
-  failed_when: resultbergs.json.message != "OK"
-  when: resultbergs.json.message is defined 
+  debug:
+    msg: "{{ resultbergs.json }}"
+  failed_when: resultbergs.json == ""
 
 
 - name: Get Node ADDRESS balance
   debug:
-    msg: 
-      - "Node ADDRESS balance: '{{ addressbergs.json.result|int / 1000000000000000000 }}' bergs."
+    msg:
+      - "Node ADDRESS balance: '{{ addressbergs.json.result|int}}' bergs."
       - "Please get bergs on {{ config_file_map.ADDRESS }} from https://faucet.bloxberg.org/ and try again."
   failed_when:
     - addressbergs.json.result|int == 0
-  when: 
+  when:
     - addressbergs.json.result is defined
-    - addressbergs.json.result == '0'
+    - addressbergs.json.result == '0x0'
 
 - name: Get RESULT ADDRESS balance
   debug:
-    msg: 
-      - "Node RESULT ADDRESS balance: '{{ resultbergs.json.result|int / 1000000000000000000 }}' bergs."
+    msg:
+      - "Node RESULT ADDRESS balance: '{{ resultbergs.json.result|int}}' bergs."
       - "Please get bergs on {{ config_file_map.RESULT_ADDRESS }} from https://faucet.bloxberg.org/ and try again."
   failed_when:
     - resultbergs.json.result|int == 0
   when:
     - resultbergs.json.result is defined
-    - resultbergs.json.result == '0'
+    - resultbergs.json.result == '0x0'
 
 - meta: end_play
   when: (resultbergs.json.result is defined and resultbergs.json.result == '0') or (addressbergs.json.result is defined and addressbergs.json.result == '0') or (config_file_map.PRIVATE_KEY == config_file_map.RESULT_PRIVATE_KEY) or (config_file_map.ADDRESS == config_file_map.RESULT_ADDRESS)