refactor: fix dev ticker

rsksmart · Oct 25, 2023 · 415e5f6 · 415e5f6
1 parent 5cc05ac
commit 415e5f6
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/ci-iov.yml b/.github/workflows/ci-iov.yml
@@ -45,7 +45,7 @@ jobs:
           ci_run zk init
 
       - name: restart dev-ticker
-        run: docker-compose -f docker-compose-runner.yml restart dev-ticker
+        run: docker-compose -f docker-compose-runner.yml up dev-ticker
 
       - name: Toolchain info
         run: |

diff --git a/core/bin/zksync_api/src/bin/providers/proxy_price_provider.rs b/core/bin/zksync_api/src/bin/providers/proxy_price_provider.rs
@@ -22,17 +22,11 @@ async fn fetch_coins_list() -> HttpResponse {
     // TODO: we always return the platforms, instead of checking for the query param `include_platform` to be true
     let rif_token = CoinsListItem {
         id: "rif-token".to_string(),
-        platforms: Some(rootstock_platform.clone()),
+        platforms: Some(rootstock_platform),
         name: "RIF Token".to_string(),
         symbol: "TRIF".to_string(),
     };
-    let rbtc = CoinsListItem {
-        id: "rootstock".to_string(),
-        symbol: "TRBTC".to_string(),
-        name: "Rootstock RSK".to_string(),
-        platforms: Some(rootstock_platform),
-    };
-    let coin_list: &[CoinsListItem] = &[rif_token, rbtc];
+    let coin_list: &[CoinsListItem] = &[rif_token];
 
     HttpResponse::Ok().json(coin_list)
 }

diff --git a/docker-compose-runner.yml b/docker-compose-runner.yml
@@ -17,7 +17,7 @@ services:
       - ./docker/rskj/node.conf:/etc/rsk/node.conf
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.2-beta"
     env_file:
       - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/docker.env
@@ -31,7 +31,6 @@ services:
     depends_on:
       - postgres
       - rskj
-      - dev-ticker
     command: tail -f /dev/null
     volumes:
       - .:/usr/src/zksync

diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml
@@ -51,7 +51,7 @@ services:
       - ./etc/env/${ENV_OVERRIDE-deploy}.env
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.2-beta"
     env_file:
       - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/${ENV_OVERRIDE-deploy}.env

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       start_period: 15s
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.2-beta"
     env_file:
       - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/${ENV_OVERRIDE-deploy}.env

diff --git a/etc/env/qa/forced_exit_requests.toml b/etc/env/qa/forced_exit_requests.toml
@@ -24,7 +24,7 @@ wait_confirmations=1
 
 # The account of the ForcedExit sender
 # The private key is defined in sender_eth_private_key <env_address>
-sender_account_address="0xa4dea4d5c954f5fd9e87f0e9752911e83a3d18b3"
+sender_account_address="0x47DD9BB622fFF25CF562aC264e6075807B754EC8"
 
 # The time after which an invalid request is deleted in milliseconds
 expiration_period=3000

diff --git a/etc/env/qa/private.toml b/etc/env/qa/private.toml
@@ -38,4 +38,4 @@ fee_account_private_key="0xea09e1fe584019bef786ba95da92bd0c256f599457aa6bf1520c0
 # L2 private key of the account that sends ForcedExits <env_priv_key>
 sender_private_key="0x0092788f3890ed50dcab7f72fb574a0a9d30b1bc778ba076c609c311a8555352" 
 # L1 private key of the account that sends ForcedExits <env_priv_key>
-sender_eth_private_key="0xd77b8a342be95c5c31fa85c20450b424663c4fb4a499cfc80c202c592c85c219"
+sender_eth_private_key="0xd783469124d7db80f6531ca19156cb777a1922d9edbbb1a9a35b75b5b981b2d8"
diff --git a/etc/env/testnet/forced_exit_requests.toml b/etc/env/testnet/forced_exit_requests.toml
@@ -24,7 +24,7 @@ wait_confirmations=1
 
 # The account of the ForcedExit sender
 # The private key is defined in sender_eth_private_key <env_address>
-sender_account_address="0xa4dea4d5c954f5fd9e87f0e9752911e83a3d18b3"
+sender_account_address="0xe10C0796fF6f6Ff4185109bE8Cf133a66e5f024D"
 
 # The time after which an invalid request is deleted in milliseconds
 expiration_period=3000