ROLLUP-471/fix-deployment

contracts/scripts/governance-add-erc20.ts

@@ -10,7 +10,7 @@ const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, {
 const deployer = new Deployer({ deployWallet: ethers.Wallet.createRandom() });
 const provider = web3Provider();
 const governorWallet = process.env.MNEMONIC
-    ? Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/137'/0'/0/1").connect(provider)
+    ? Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/37310'/0'/0/0").connect(provider)
     : new Wallet(Buffer.from(ethTestConfig.account_with_rbtc_cow1_privK, 'hex'), provider);
 
 async function governanceAddToken(address: string) {

core/bin/zksync_api/src/bin/dev_ticker_server.rs

@@ -11,7 +11,7 @@ use std::{
 };
 use structopt::StructOpt;
 use tokio::sync::Mutex;
-use zksync_config::ZkSyncConfig;
+use zksync_config::ChainConfig;
 use zksync_types::{network::Network, TokenInfo};
 use zksync_utils::parse_env;
 
@@ -37,7 +37,7 @@ fn load_tokens(path: impl AsRef<Path>) -> Result<Vec<TokenInfo>, serde_json::Err
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
     let _vlog_guard = vlog::init();
-    let network = ZkSyncConfig::from_env().chain.eth.network;
+    let network = ChainConfig::from_env().eth.network;
 
     let opts = FeeTickerOpts::from_args();
     if opts.sloppy {

core/bin/zksync_api/src/fee_ticker/ticker_api/coingecko.rs

@@ -75,7 +75,7 @@ impl TokenPriceAPI for CoinGeckoAPI {
             .query(&[
                 ("vs_currency", "usd"),
                 ("days", "1"),
-                // Removed ("interval", "hourly"), parameter as hourly charts are only available to coingecko enterprice plan customers
+                // Removed ("interval", "hourly"), parameter as hourly charts are only available to coingecko enterprise plan customers
                 // The default interval is daily
             ])
             .send()

core/bin/zksync_api/src/fee_ticker/ticker_info.rs

@@ -200,7 +200,7 @@ impl FeeTickerInfo for TickerInfo {
         };
 
         // TODO: remove hardcode for tokens
-        if ["RDOC", "USDRIF"].contains(&token.symbol.as_str()) {
+        if ["RDOC", "USDRIF"].contains(&token.symbol.to_uppercase().as_str()) {
             metrics::histogram!(TICKET_INFO_GET_LAST_TOKEN_PRICE, start.elapsed(), "type" => token.symbol);
             return Ok(price_1_usd);
         }

core/bin/zksync_api/src/fee_ticker/validator/mod.rs

@@ -14,6 +14,7 @@ use std::{
 use bigdecimal::BigDecimal;
 use chrono::Utc;
 
+use itertools::Itertools;
 // Workspace uses
 use zksync_types::{
     tokens::{Token, TokenLike, TokenMarketVolume},
@@ -73,10 +74,24 @@ impl<W: TokenWatcher> MarketUpdater<W> {
     pub async fn keep_updated(mut self, duration_secs: u64) {
         let mut error_counter = 0;
 
+        // Market volume is not available for these tokens and
+        // we don't need it because they're added among the unconditionally_valid_tokens
+        let unavailable_market_volume_tokens = ["RDOC", "RBTC", "USDRIF"];
         loop {
             let tokens = self.tokens_cache.get_all_tokens().await;
             let result = match tokens {
-                Ok(tokens) => self.update_all_tokens(tokens).await,
+                Ok(tokens) => {
+                    self.update_all_tokens(
+                        tokens
+                            .into_iter()
+                            .filter(|token| {
+                                !unavailable_market_volume_tokens
+                                    .contains(&token.symbol.to_uppercase().as_str())
+                            })
+                            .collect_vec(),
+                    )
+                    .await
+                }
                 Err(e) => Err(e),
             };
 

docker-compose-runner.yml

@@ -17,9 +17,12 @@ services:
       - ./docker/rskj/node.conf:/etc/rsk/node.conf
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.0.0-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
     env_file:
+      - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/docker.env
+    environment:
+      - ZKSYNC_HOME=/
     volumes:
       - ./etc/tokens/:/etc/tokens
 

docker-compose.deploy.yml

@@ -2,7 +2,7 @@ version: '3.2'
 services:
 
   server:
-    image: "rsksmart/rollup-server:1.0.1-beta"
+    image: "rsksmart/rollup-server:1.1.1-beta"
     ports: #Ports that where configured using the environment variables
       - 3001:3001 # RestApi
       - 3002:3002 # Web3
@@ -51,9 +51,12 @@ services:
       - ./etc/env/${ENV_OVERRIDE-deploy}.env
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.0.0-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
     env_file:
+      - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/${ENV_OVERRIDE-deploy}.env
+    environment:
+      - ZKSYNC_HOME=/
     ports:
       - "9876:9876"
     volumes:

docker-compose.yml

@@ -35,7 +35,7 @@ services:
       start_period: 15s
 
   dev-ticker:
-    image: "rsksmart/rollup-dev-ticker:1.1.0-beta"
+    image: "rsksmart/rollup-dev-ticker:1.1.1-beta"
     env_file:
       - ./etc/env/${ZKSYNC_ENV-dev}.env
       - ./etc/env/${ENV_OVERRIDE-deploy}.env

docker/dev-ticker/Dockerfile

@@ -10,8 +10,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
     cargo build --bin dev_ticker_server --release
 
 FROM debian:bullseye
-RUN apt update
-RUN apt install openssl -y
+RUN apt-get update && apt-get install -y openssl ca-certificates && rm -rf /var/lib/apt/lists/*
 EXPOSE 9876
 ENV RUST_BACKTRACE "full"
 ENV RUST_LOG info