Skip to content
This repository has been archived by the owner on Jan 21, 2025. It is now read-only.

PP-175: fix matterlabs links on explorer #22

Merged

Conversation

kenny08gt
Copy link

What

Updates:

  • Remove zk sync configuration from env-config.js to avoid extra noise
  • Added regtest and rsk mainnet configurations to env-config.js
  • Update navbar links and logo (Added rif_logo.svg)
  • Update store.js to keep track of the new changes on env-config.js

Why

Remove the old links to zk sync from matterlabs, and continue with the deployment

Reference

https://rsklabs.atlassian.net/browse/PP-175

@kenny08gt kenny08gt requested a review from a team June 21, 2022 18:26
Copy link
Collaborator

@antomor antomor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kenny08gt thank you for these changes, I left some doubts because we probably need to use the L1 explorer. Furthermore:

  1. do we need to include both rif_logo.svg and rif_logo_alt.svg
  2. I noticed that the etherscan.io link is used also in infrastructure/explorer/src/Tokens.vue line 100. Could we fix this with the explorer link configured?

@kenny08gt kenny08gt requested a review from antomor June 24, 2022 22:23
@kenny08gt
Copy link
Author

@antomor Links updated and rif_logo_alt removed. Please check it again, thanks!

Copy link
Collaborator

@antomor antomor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I've just noticed a problem with the configuration!

@kenny08gt kenny08gt requested a review from antomor June 27, 2022 15:30
Copy link
Collaborator

@antomor antomor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@antomor antomor merged commit 59a41c7 into rsk_merge_master_Dec2021 Jun 28, 2022
@antomor antomor deleted the PP-175-fix-matterlabs-links-on-explorer branch June 28, 2022 11:56
@antomor antomor changed the title Pp 175 fix matterlabs links on explorer PP-175: fix matterlabs links on explorer Jun 28, 2022
antomor added a commit that referenced this pull request May 17, 2023
commit f14ab4b
Author: Antonio Morrone <[email protected]>
Date:   Tue May 9 10:31:17 2023 +0200

    ROLLUP-101/upgrade rskj version (#51)

    * fix: update docker-compose to use the pre-built image
    * fix: use the latest rskj version and disable tx rate limiter and rskip252
    * ci: comment out all the jobs

commit 3bb8128
Merge: 8b3e865 79af8df
Author: Sergio <[email protected]>
Date:   Thu May 4 15:45:07 2023 -0300

    Merge pull request #52 from rsksmart/feat/remove-explorer

    fix: removes explorer project. it was moved to an independent repo

commit 79af8df
Author: Sergio <[email protected]>
Date:   Wed May 3 14:22:20 2023 -0300

    fix: removes explorer project. it was moved to an independent repo

commit 8b3e865
Author: Antonio Morrone <[email protected]>
Date:   Tue May 2 12:56:07 2023 +0100

    Fix/binaryen update (#50)

    * fix: update binaryen submodule to version_102

commit c9e0584
Author: Alan Hurtarte <[email protected]>
Date:   Wed Aug 24 08:21:03 2022 -0600

    PP-316: rif aggregation fix ci cd (#32)

    * PP-316: Update loadyest.yml to use rsk_branches

    * PP-316: Update runs-on on CI.yml

    * PP-316: using same as ci-iov conf

    * PP-316: fix format missing

    * PP-316: remove circuit test from regular testing

    * PP-316: Added validation to loadtest

    * PP-316: remove automine from lint to avoid confusing

commit 1de5dfb
Author: Alan Hurtarte <[email protected]>
Date:   Fri Aug 19 04:32:51 2022 -0600

    PP 179 update and release zksync js (#28)

    * PP-179: update references to testnet and mainnet

    * PP-179: Update package and readme for rif-aggregation.js

    * PP-179: Fix zksync js reference on the zk init command

    * PP-181: Update explorer reference to zksync.js to rif-explorer package

    * PP-179: Update references to sdk package

    * PP-179: fix npm reference

    * PP-179: Update the rest of test with new sdk package

    * PP-179: remove changelog reference

commit f756520
Author: Alan Hurtarte <[email protected]>
Date:   Tue Aug 16 03:23:42 2022 -0600

    PP-176: Add support for rif token (#26)

    * PP-176: Added rif token support

    * PP-176: Added rif token support

    * PP-176: Remove unused reference to rif

    * PP-176: Remove unused reference to rif. After format

    * PP-176: Added commands to help add rif token to server. Cleanup unused files.

    * PP-176: Update core/lib/storage/migrations/2020-04-07-065600_init_storage/up.sql

    Co-authored-by: Antonio Morrone <[email protected]>

    * PP-176: use deconstruction on script action

    Co-authored-by: Antonio Morrone <[email protected]>

commit 1c8680c
Author: Alan Hurtarte <[email protected]>
Date:   Tue Jun 28 05:57:46 2022 -0600

    PP-172: Added doc section in Troubleshooting about m1 and rosetta fix (#19)

    * PP-172: Added doc section in Troubleshooting about m1 and rosetta fix

    * PP-172: Update docs/launch.md

    Co-authored-by: Antonio Morrone <[email protected]>

commit 59a41c7
Author: Alan Hurtarte <[email protected]>
Date:   Tue Jun 28 05:55:57 2022 -0600

    Pp 175 fix matterlabs links on explorer (#22)

    * PP-175: Update links to work with rif aggregation

    * PP-175: format code to commit

    * PP-175: remove console log

    * PP-175: Update explorer address for regtest and rsk mainnet config file

    * PP-175: update logo

    * PP-175: Fix wrong explorer address. Remove status from navbar

    * PP-175: Fix route in tokens.vue and remove rif_logo_alt

    * PP-175: Update etc/js/env-config.js, regtest to testne

    Co-authored-by: Antonio Morrone <[email protected]>

commit 383de6c
Merge: 267cb4b 5178754
Author: Antonio Morrone <[email protected]>
Date:   Wed May 25 11:50:14 2022 +0000

    Merge pull request #11 from mortelli/rsk_merge_master_Dec2021

    PP-141: fix installation

commit 267cb4b
Merge: 8a5f80c c25e999
Author: Antonio Morrone <[email protected]>
Date:   Fri Apr 8 14:14:11 2022 +0000

    Merge pull request #14 from antomor/extend-documentation

    PP-144: Extend Installation documentation

commit c25e999
Author: Antonio Morrone <[email protected]>
Date:   Mon Apr 4 17:49:50 2022 +0200

    Apply zk fmt

commit daf9510
Author: Antonio Morrone <[email protected]>
Date:   Mon Apr 4 17:22:27 2022 +0200

    Describe the compilation error noticed on Apple intel

commit f693da3
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:57:50 2022 -0300

    apply zk fmt

commit 7e9b20e
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:56:44 2022 -0300

    add new troubleshooting item in launch page

commit 52d8308
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:51:15 2022 -0300

    add troubleshooting items to launch setup dev pages

commit 2164d9d
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:38:42 2022 -0300

    iterate development and setup-dev pages

commit 26de553
Author: mortelli <[email protected]>
Date:   Thu Mar 31 17:24:50 2022 -0300

    iterate launch page

commit 18b1de1
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:54:02 2022 -0300

    apply zk fmt to setup-dev

commit f32679b
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:53:04 2022 -0300

    iterate setup-dev page

commit 971ec08
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:27:51 2022 -0300

    iterate setup-dev page

commit 5178754
Author: optimalbrew <[email protected]>
Date:   Sat Dec 18 16:15:42 2021 -0800

    add more info for specific version number

commit 7a23cc8
Author: deniallugo <[email protected]>
Date:   Mon Dec 20 15:04:47 2021 +0300

    Fix crypto build

    Signed-off-by: deniallugo <[email protected]>

commit 1c83165
Author: mortelli <[email protected]>
Date:   Wed Mar 30 15:54:15 2022 -0300

    Revert "Merge remote-tracking branch 'origin/onboarding' into rsk_merge_master_Dec2021"

    This reverts commit deeaf04, reversing
    changes made to 8a5f80c.

commit deeaf04
Merge: 8a5f80c 5e1ae3f
Author: mortelli <[email protected]>
Date:   Wed Mar 9 00:02:31 2022 -0300

    Merge remote-tracking branch 'origin/onboarding' into rsk_merge_master_Dec2021

commit 5e1ae3f
Author: mortelli <[email protected]>
Date:   Fri Feb 25 16:38:24 2022 -0300

    add p flag to mkdir statement in build script

commit 7630aed
Author: mortelli <[email protected]>
Date:   Thu Feb 24 15:49:32 2022 -0300

    add mkdir to build.sh

commit 2884360
Author: mortelli <[email protected]>
Date:   Thu Feb 24 10:43:44 2022 -0300

    add n flag to cp in build

commit 46524a8
Author: mortelli <[email protected]>
Date:   Wed Feb 23 17:28:04 2022 -0300

    Revert "add mkdir to build.sh"

    This reverts commit afe18bb.

commit afe18bb
Author: mortelli <[email protected]>
Date:   Wed Feb 23 17:24:33 2022 -0300

    add mkdir to build.sh

commit 819316c
Author: mortelli <[email protected]>
Date:   Wed Feb 23 16:48:29 2022 -0300

    fixes for build.sh script

commit 8a5f80c
Merge: 76f29ea a347ea5
Author: Raul Laprida <[email protected]>
Date:   Mon Feb 14 00:46:55 2022 -0300

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into rsk_merge_master_Dec2021

commit 76f29ea
Author: Raul Laprida <[email protected]>
Date:   Mon Feb 14 00:45:01 2022 -0300

    explorer pushed

commit a347ea5
Author: smishraiov <[email protected]>
Date:   Tue Feb 8 09:47:56 2022 -0800

    minor bug fix in hardhat config

commit 80b4bd5
Merge: e3200a8 c42be1c
Author: julianlen <[email protected]>
Date:   Mon Feb 7 14:05:30 2022 -0300

    Merge pull request #9 from rsksmart/deployment

    Deployment

commit e3200a8
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 19:45:20 2022 -0800

    include integration tests individually

commit 3fbdfc5
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 16:29:31 2022 -0800

    update workflow to include all integration tests (excluding testkit)

commit cdf2329
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 15:20:40 2022 -0800

    increase batch test timeout and add https to api url

commit 049d8aa
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 13:10:06 2022 -0800

    update workflow and increase test timeouts

commit c42be1c
Author: Julian Len <[email protected]>
Date:   Tue Feb 1 15:34:14 2022 -0300

    Changed wrong parameters

commit 744e25b
Author: Julian Len <[email protected]>
Date:   Tue Feb 1 15:33:39 2022 -0300

    changed zk folder

commit 7d76cd6
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 21:20:42 2022 -0800

    add more time before starting tests

commit 7ea6b08
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 18:47:50 2022 -0800

    modify CI flow

commit becde38
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 15:34:22 2022 -0800

    changes for CI integration tests (new github actions workflow)

    new file ci-iov-integration.yml
    * modify rskj node.conf to turn automine off
    * create self signed certs using mkcert

commit 2d82c4c
Merge: c34d986 99642c8
Author: smishraiov <[email protected]>
Date:   Wed Jan 26 11:46:12 2022 -0800

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into fix_tx_acc_slots

commit c34d986
Author: smishraiov <[email protected]>
Date:   Wed Jan 26 10:55:07 2022 -0800

    remove tx account slots from RSKJ node.conf and add tx confirmations to deploy-erc20 deployment

commit 0fc8c5b
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 18:46:39 2022 -0300

    Dockerfile for M1 fixed

commit 0ec0ef2
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 13:18:53 2022 -0300

    Base environment is like in testnet with a different chain id and web3 url endpoint, yet it is for regteset

commit 435a79b
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:39:02 2022 -0300

    added the zk config file

commit b1df7cb
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:35:29 2022 -0300

    Modified parameters so it works on mainnet

commit 50c5560
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:31:23 2022 -0300

    mainnet config file

commit c5473d4
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:03:59 2022 -0300

    Modified parameters so it works on testnet

commit f1bba07
Author: Julian Len <[email protected]>
Date:   Tue Jan 25 13:27:15 2022 -0300

    testnet config file

commit a17d4f5
Author: Julian Len <[email protected]>
Date:   Tue Jan 25 11:43:48 2022 -0300

    In hardhat.config.ts I got back the assignation of the env var ETH_CLIENT_CHAIN_ID

commit 99642c8
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 18:46:39 2022 -0300

    Dockerfile for M1 fixed

commit fe48a88
Merge: bcffe67 ac83694
Author: smishraiov <[email protected]>
Date:   Fri Jan 14 12:27:52 2022 -0800

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into rsk_merge_master_Dec2021

commit ac83694
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 16:01:20 2022 -0300

    zk fmt

commit 57871ca
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 16:00:12 2022 -0300

    RSKJ dockerfile for M1 added

commit bcffe67
Author: smishraiov <[email protected]>
Date:   Wed Jan 12 12:39:05 2022 -0800

    remove directory with old dockerfile and node.conf

commit 75f5f8d
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 10:15:57 2021 -0800

    fix ci workflow

commit 878c198
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 09:50:52 2021 -0800

    set default use_https true

commit 669130b
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 09:43:06 2021 -0800

      update rskj node conf and CI flow
      * inlude the rskj docker-compose service name (for CI) in the list of RPC host names
      * change docker.env back to service names from localhost
      * fix version number for wasm-pack (cargo install) to prevent errors from v0.10.2 in sdk/zksync-crypto

commit dc38d7e
Author: smishraiov <[email protected]>
Date:   Sat Dec 18 18:24:39 2021 -0800

    more CI fixes + wasm-pack version error

commit 876e6f0
Author: smishraiov <[email protected]>
Date:   Fri Dec 17 16:52:00 2021 -0800

    add more tests to CI and change default branch to trigger CI test

commit 660bd8e
Author: smishraiov <[email protected]>
Date:   Fri Dec 17 16:19:21 2021 -0800

    fix failing CI and docker issues
    * CI was failing bcos zk_env container could not connect to rskj node port
    * Added rskj dockerfile and node.conf to docker/
    * remove reference to personal docker hub image in compose

commit 45223c6
Author: smishraiov <[email protected]>
Date:   Tue Dec 14 12:44:25 2021 -0800

    fix rskj docker container starting issue

commit 8e9e33d
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 21:58:23 2021 -0800

    fix failing server test by adding use_https to rest server config

    fix ts lint errors

    set REST api default without https. Current implementation (actix + rustls/openssl) does not pass server integration tests. Change default use_https=true once tests are passing

commit 6bc54c8
Merge: 47d5e19 b55ab5a
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 19:29:13 2021 -0800

    Merge latest master branch from Matter Labs into rsk_merge_master_Dec2021

commit 47d5e19
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 19:19:41 2021 -0800

    switch zksync api to openssl from rustls and update actix-web

commit 56ad504
Author: Raul Laprida <[email protected]>
Date:   Wed Sep 15 13:38:38 2021 -0300

    HTTPS support added to JS API

commit be15b53
Merge: 79d475f 93a2d44
Author: Raul Laprida <[email protected]>
Date:   Mon Sep 6 17:29:41 2021 -0300

    Merge pull request #2 from rsksmart/changes-4-tests

    Added a 0x in a private key, and changed the net version expected for…

commit 93a2d44
Author: Julian <[email protected]>
Date:   Fri Sep 3 14:33:17 2021 -0300

    Added a 0x in a private key, and changed the net version expected for the one from rsk

commit 79d475f
Author: Raul Laprida <[email protected]>
Date:   Thu Sep 2 17:47:17 2021 -0300

    testkit tests fixed

commit c2cf7fa
Merge: 81363d2 f59e154
Author: Raul Laprida <[email protected]>
Date:   Mon Aug 30 15:57:21 2021 -0300

    Merge branch 'zksync_contracts_6' into rsk_port_initial

commit 81363d2
Author: Raul Laprida <[email protected]>
Date:   Fri Jul 30 18:01:38 2021 -0300

    Inital port to RSK

    contracts test suite now passes with RSK Iris (if automine enabled)

    Server integration tests passing (if automine disabled)
antomor added a commit that referenced this pull request Jun 6, 2023
* Squashed commit of the following:

commit f14ab4b
Author: Antonio Morrone <[email protected]>
Date:   Tue May 9 10:31:17 2023 +0200

    ROLLUP-101/upgrade rskj version (#51)

    * fix: update docker-compose to use the pre-built image
    * fix: use the latest rskj version and disable tx rate limiter and rskip252
    * ci: comment out all the jobs

commit 3bb8128
Merge: 8b3e865 79af8df
Author: Sergio <[email protected]>
Date:   Thu May 4 15:45:07 2023 -0300

    Merge pull request #52 from rsksmart/feat/remove-explorer

    fix: removes explorer project. it was moved to an independent repo

commit 79af8df
Author: Sergio <[email protected]>
Date:   Wed May 3 14:22:20 2023 -0300

    fix: removes explorer project. it was moved to an independent repo

commit 8b3e865
Author: Antonio Morrone <[email protected]>
Date:   Tue May 2 12:56:07 2023 +0100

    Fix/binaryen update (#50)

    * fix: update binaryen submodule to version_102

commit c9e0584
Author: Alan Hurtarte <[email protected]>
Date:   Wed Aug 24 08:21:03 2022 -0600

    PP-316: rif aggregation fix ci cd (#32)

    * PP-316: Update loadyest.yml to use rsk_branches

    * PP-316: Update runs-on on CI.yml

    * PP-316: using same as ci-iov conf

    * PP-316: fix format missing

    * PP-316: remove circuit test from regular testing

    * PP-316: Added validation to loadtest

    * PP-316: remove automine from lint to avoid confusing

commit 1de5dfb
Author: Alan Hurtarte <[email protected]>
Date:   Fri Aug 19 04:32:51 2022 -0600

    PP 179 update and release zksync js (#28)

    * PP-179: update references to testnet and mainnet

    * PP-179: Update package and readme for rif-aggregation.js

    * PP-179: Fix zksync js reference on the zk init command

    * PP-181: Update explorer reference to zksync.js to rif-explorer package

    * PP-179: Update references to sdk package

    * PP-179: fix npm reference

    * PP-179: Update the rest of test with new sdk package

    * PP-179: remove changelog reference

commit f756520
Author: Alan Hurtarte <[email protected]>
Date:   Tue Aug 16 03:23:42 2022 -0600

    PP-176: Add support for rif token (#26)

    * PP-176: Added rif token support

    * PP-176: Added rif token support

    * PP-176: Remove unused reference to rif

    * PP-176: Remove unused reference to rif. After format

    * PP-176: Added commands to help add rif token to server. Cleanup unused files.

    * PP-176: Update core/lib/storage/migrations/2020-04-07-065600_init_storage/up.sql

    Co-authored-by: Antonio Morrone <[email protected]>

    * PP-176: use deconstruction on script action

    Co-authored-by: Antonio Morrone <[email protected]>

commit 1c8680c
Author: Alan Hurtarte <[email protected]>
Date:   Tue Jun 28 05:57:46 2022 -0600

    PP-172: Added doc section in Troubleshooting about m1 and rosetta fix (#19)

    * PP-172: Added doc section in Troubleshooting about m1 and rosetta fix

    * PP-172: Update docs/launch.md

    Co-authored-by: Antonio Morrone <[email protected]>

commit 59a41c7
Author: Alan Hurtarte <[email protected]>
Date:   Tue Jun 28 05:55:57 2022 -0600

    Pp 175 fix matterlabs links on explorer (#22)

    * PP-175: Update links to work with rif aggregation

    * PP-175: format code to commit

    * PP-175: remove console log

    * PP-175: Update explorer address for regtest and rsk mainnet config file

    * PP-175: update logo

    * PP-175: Fix wrong explorer address. Remove status from navbar

    * PP-175: Fix route in tokens.vue and remove rif_logo_alt

    * PP-175: Update etc/js/env-config.js, regtest to testne

    Co-authored-by: Antonio Morrone <[email protected]>

commit 383de6c
Merge: 267cb4b 5178754
Author: Antonio Morrone <[email protected]>
Date:   Wed May 25 11:50:14 2022 +0000

    Merge pull request #11 from mortelli/rsk_merge_master_Dec2021

    PP-141: fix installation

commit 267cb4b
Merge: 8a5f80c c25e999
Author: Antonio Morrone <[email protected]>
Date:   Fri Apr 8 14:14:11 2022 +0000

    Merge pull request #14 from antomor/extend-documentation

    PP-144: Extend Installation documentation

commit c25e999
Author: Antonio Morrone <[email protected]>
Date:   Mon Apr 4 17:49:50 2022 +0200

    Apply zk fmt

commit daf9510
Author: Antonio Morrone <[email protected]>
Date:   Mon Apr 4 17:22:27 2022 +0200

    Describe the compilation error noticed on Apple intel

commit f693da3
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:57:50 2022 -0300

    apply zk fmt

commit 7e9b20e
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:56:44 2022 -0300

    add new troubleshooting item in launch page

commit 52d8308
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:51:15 2022 -0300

    add troubleshooting items to launch setup dev pages

commit 2164d9d
Author: mortelli <[email protected]>
Date:   Fri Apr 1 14:38:42 2022 -0300

    iterate development and setup-dev pages

commit 26de553
Author: mortelli <[email protected]>
Date:   Thu Mar 31 17:24:50 2022 -0300

    iterate launch page

commit 18b1de1
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:54:02 2022 -0300

    apply zk fmt to setup-dev

commit f32679b
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:53:04 2022 -0300

    iterate setup-dev page

commit 971ec08
Author: mortelli <[email protected]>
Date:   Thu Mar 31 16:27:51 2022 -0300

    iterate setup-dev page

commit 5178754
Author: optimalbrew <[email protected]>
Date:   Sat Dec 18 16:15:42 2021 -0800

    add more info for specific version number

commit 7a23cc8
Author: deniallugo <[email protected]>
Date:   Mon Dec 20 15:04:47 2021 +0300

    Fix crypto build

    Signed-off-by: deniallugo <[email protected]>

commit 1c83165
Author: mortelli <[email protected]>
Date:   Wed Mar 30 15:54:15 2022 -0300

    Revert "Merge remote-tracking branch 'origin/onboarding' into rsk_merge_master_Dec2021"

    This reverts commit deeaf04, reversing
    changes made to 8a5f80c.

commit deeaf04
Merge: 8a5f80c 5e1ae3f
Author: mortelli <[email protected]>
Date:   Wed Mar 9 00:02:31 2022 -0300

    Merge remote-tracking branch 'origin/onboarding' into rsk_merge_master_Dec2021

commit 5e1ae3f
Author: mortelli <[email protected]>
Date:   Fri Feb 25 16:38:24 2022 -0300

    add p flag to mkdir statement in build script

commit 7630aed
Author: mortelli <[email protected]>
Date:   Thu Feb 24 15:49:32 2022 -0300

    add mkdir to build.sh

commit 2884360
Author: mortelli <[email protected]>
Date:   Thu Feb 24 10:43:44 2022 -0300

    add n flag to cp in build

commit 46524a8
Author: mortelli <[email protected]>
Date:   Wed Feb 23 17:28:04 2022 -0300

    Revert "add mkdir to build.sh"

    This reverts commit afe18bb.

commit afe18bb
Author: mortelli <[email protected]>
Date:   Wed Feb 23 17:24:33 2022 -0300

    add mkdir to build.sh

commit 819316c
Author: mortelli <[email protected]>
Date:   Wed Feb 23 16:48:29 2022 -0300

    fixes for build.sh script

commit 8a5f80c
Merge: 76f29ea a347ea5
Author: Raul Laprida <[email protected]>
Date:   Mon Feb 14 00:46:55 2022 -0300

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into rsk_merge_master_Dec2021

commit 76f29ea
Author: Raul Laprida <[email protected]>
Date:   Mon Feb 14 00:45:01 2022 -0300

    explorer pushed

commit a347ea5
Author: smishraiov <[email protected]>
Date:   Tue Feb 8 09:47:56 2022 -0800

    minor bug fix in hardhat config

commit 80b4bd5
Merge: e3200a8 c42be1c
Author: julianlen <[email protected]>
Date:   Mon Feb 7 14:05:30 2022 -0300

    Merge pull request #9 from rsksmart/deployment

    Deployment

commit e3200a8
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 19:45:20 2022 -0800

    include integration tests individually

commit 3fbdfc5
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 16:29:31 2022 -0800

    update workflow to include all integration tests (excluding testkit)

commit cdf2329
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 15:20:40 2022 -0800

    increase batch test timeout and add https to api url

commit 049d8aa
Author: smishraiov <[email protected]>
Date:   Tue Feb 1 13:10:06 2022 -0800

    update workflow and increase test timeouts

commit c42be1c
Author: Julian Len <[email protected]>
Date:   Tue Feb 1 15:34:14 2022 -0300

    Changed wrong parameters

commit 744e25b
Author: Julian Len <[email protected]>
Date:   Tue Feb 1 15:33:39 2022 -0300

    changed zk folder

commit 7d76cd6
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 21:20:42 2022 -0800

    add more time before starting tests

commit 7ea6b08
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 18:47:50 2022 -0800

    modify CI flow

commit becde38
Author: smishraiov <[email protected]>
Date:   Mon Jan 31 15:34:22 2022 -0800

    changes for CI integration tests (new github actions workflow)

    new file ci-iov-integration.yml
    * modify rskj node.conf to turn automine off
    * create self signed certs using mkcert

commit 2d82c4c
Merge: c34d986 99642c8
Author: smishraiov <[email protected]>
Date:   Wed Jan 26 11:46:12 2022 -0800

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into fix_tx_acc_slots

commit c34d986
Author: smishraiov <[email protected]>
Date:   Wed Jan 26 10:55:07 2022 -0800

    remove tx account slots from RSKJ node.conf and add tx confirmations to deploy-erc20 deployment

commit 0fc8c5b
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 18:46:39 2022 -0300

    Dockerfile for M1 fixed

commit 0ec0ef2
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 13:18:53 2022 -0300

    Base environment is like in testnet with a different chain id and web3 url endpoint, yet it is for regteset

commit 435a79b
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:39:02 2022 -0300

    added the zk config file

commit b1df7cb
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:35:29 2022 -0300

    Modified parameters so it works on mainnet

commit 50c5560
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:31:23 2022 -0300

    mainnet config file

commit c5473d4
Author: Julian Len <[email protected]>
Date:   Wed Jan 26 12:03:59 2022 -0300

    Modified parameters so it works on testnet

commit f1bba07
Author: Julian Len <[email protected]>
Date:   Tue Jan 25 13:27:15 2022 -0300

    testnet config file

commit a17d4f5
Author: Julian Len <[email protected]>
Date:   Tue Jan 25 11:43:48 2022 -0300

    In hardhat.config.ts I got back the assignation of the env var ETH_CLIENT_CHAIN_ID

commit 99642c8
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 18:46:39 2022 -0300

    Dockerfile for M1 fixed

commit fe48a88
Merge: bcffe67 ac83694
Author: smishraiov <[email protected]>
Date:   Fri Jan 14 12:27:52 2022 -0800

    Merge branch 'rsk_merge_master_Dec2021' of github.com:rsksmart/ri-aggregation into rsk_merge_master_Dec2021

commit ac83694
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 16:01:20 2022 -0300

    zk fmt

commit 57871ca
Author: Raul Laprida <[email protected]>
Date:   Fri Jan 14 16:00:12 2022 -0300

    RSKJ dockerfile for M1 added

commit bcffe67
Author: smishraiov <[email protected]>
Date:   Wed Jan 12 12:39:05 2022 -0800

    remove directory with old dockerfile and node.conf

commit 75f5f8d
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 10:15:57 2021 -0800

    fix ci workflow

commit 878c198
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 09:50:52 2021 -0800

    set default use_https true

commit 669130b
Author: smishraiov <[email protected]>
Date:   Tue Dec 21 09:43:06 2021 -0800

      update rskj node conf and CI flow
      * inlude the rskj docker-compose service name (for CI) in the list of RPC host names
      * change docker.env back to service names from localhost
      * fix version number for wasm-pack (cargo install) to prevent errors from v0.10.2 in sdk/zksync-crypto

commit dc38d7e
Author: smishraiov <[email protected]>
Date:   Sat Dec 18 18:24:39 2021 -0800

    more CI fixes + wasm-pack version error

commit 876e6f0
Author: smishraiov <[email protected]>
Date:   Fri Dec 17 16:52:00 2021 -0800

    add more tests to CI and change default branch to trigger CI test

commit 660bd8e
Author: smishraiov <[email protected]>
Date:   Fri Dec 17 16:19:21 2021 -0800

    fix failing CI and docker issues
    * CI was failing bcos zk_env container could not connect to rskj node port
    * Added rskj dockerfile and node.conf to docker/
    * remove reference to personal docker hub image in compose

commit 45223c6
Author: smishraiov <[email protected]>
Date:   Tue Dec 14 12:44:25 2021 -0800

    fix rskj docker container starting issue

commit 8e9e33d
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 21:58:23 2021 -0800

    fix failing server test by adding use_https to rest server config

    fix ts lint errors

    set REST api default without https. Current implementation (actix + rustls/openssl) does not pass server integration tests. Change default use_https=true once tests are passing

commit 6bc54c8
Merge: 47d5e19 b55ab5a
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 19:29:13 2021 -0800

    Merge latest master branch from Matter Labs into rsk_merge_master_Dec2021

commit 47d5e19
Author: smishraiov <[email protected]>
Date:   Tue Nov 30 19:19:41 2021 -0800

    switch zksync api to openssl from rustls and update actix-web

commit 56ad504
Author: Raul Laprida <[email protected]>
Date:   Wed Sep 15 13:38:38 2021 -0300

    HTTPS support added to JS API

commit be15b53
Merge: 79d475f 93a2d44
Author: Raul Laprida <[email protected]>
Date:   Mon Sep 6 17:29:41 2021 -0300

    Merge pull request #2 from rsksmart/changes-4-tests

    Added a 0x in a private key, and changed the net version expected for…

commit 93a2d44
Author: Julian <[email protected]>
Date:   Fri Sep 3 14:33:17 2021 -0300

    Added a 0x in a private key, and changed the net version expected for the one from rsk

commit 79d475f
Author: Raul Laprida <[email protected]>
Date:   Thu Sep 2 17:47:17 2021 -0300

    testkit tests fixed

commit c2cf7fa
Merge: 81363d2 f59e154
Author: Raul Laprida <[email protected]>
Date:   Mon Aug 30 15:57:21 2021 -0300

    Merge branch 'zksync_contracts_6' into rsk_port_initial

commit 81363d2
Author: Raul Laprida <[email protected]>
Date:   Fri Jul 30 18:01:38 2021 -0300

    Inital port to RSK

    contracts test suite now passes with RSK Iris (if automine enabled)

    Server integration tests passing (if automine disabled)

* test: fix tests that are failing after merging master

test: fix some tests and use the local zksync.js lib

test: fix withdrawNFT tests

build: add tesseract configuration

test: change the private key used to run the integration tests

style: apply zk fmt

test(testkit): change the index used to retrieve the revert reason

* chore: remove package-lock file of zcli

* fix(contracts): change the error message returned in ForcedExit

* chore: remove useless comments

---------

Co-authored-by: Francisco Tobar <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants