From 6692a8cd087ef10451a19323802f33118e3e4bc7 Mon Sep 17 00:00:00 2001
From: zhi <thecoderzhi@gmail.com>
Date: Fri, 22 Dec 2023 12:03:53 +0800
Subject: [PATCH] add two tokens and update start heights

---
 witness-service/docker-compose-relayer.yml   | 48 ++++++++++----------
 witness-service/docker-compose-witness.yml   | 48 ++++++++++----------
 witness-service/witness-config-bsc.yaml      |  5 +-
 witness-service/witness-config-ethereum.yaml | 10 +++-
 witness-service/witness-config-iotex.yaml    |  3 ++
 witness-service/witness-config-matic.yaml    |  2 +-
 6 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/witness-service/docker-compose-relayer.yml b/witness-service/docker-compose-relayer.yml
index f0cdd23..76c8867 100644
--- a/witness-service/docker-compose-relayer.yml
+++ b/witness-service/docker-compose-relayer.yml
@@ -36,31 +36,31 @@ services:
       - database
     command: relayer -config=/etc/iotube-relayer/relayer-config-ethereum.yaml
 
-  heco-relayer:
-    container_name: heco-relayer
-    image: relayer:latest
-    restart: on-failure
-    ports:
-      - 7002:7002
-      - 8002:8002
-    volumes:
-      - $IOTEX_RELAYER/etc/relayer-config-heco.yaml:/etc/iotube-relayer/relayer-config-heco.yaml:ro
-    links:
-      - database
-    command: relayer -config=/etc/iotube-relayer/relayer-config-heco.yaml
+#  heco-relayer:
+#    container_name: heco-relayer
+#    image: relayer:latest
+#    restart: on-failure
+#    ports:
+#      - 7002:7002
+#      - 8002:8002
+#    volumes:
+#      - $IOTEX_RELAYER/etc/relayer-config-heco.yaml:/etc/iotube-relayer/relayer-config-heco.yaml:ro
+#    links:
+#      - database
+#    command: relayer -config=/etc/iotube-relayer/relayer-config-heco.yaml
 
-  polis-relayer:
-    container_name: polis-relayer
-    image: relayer:latest
-    restart: on-failure
-    ports:
-      - 7005:7005
-      - 8005:8005
-    volumes:
-      - $IOTEX_RELAYER/etc/relayer-config-polis.yaml:/etc/iotube-relayer/relayer-config-polis.yaml:ro
-    links:
-      - database
-    command: relayer -config=/etc/iotube-relayer/relayer-config-polis.yaml
+#  polis-relayer:
+#    container_name: polis-relayer
+#    image: relayer:latest
+#    restart: on-failure
+#    ports:
+#      - 7005:7005
+#      - 8005:8005
+#    volumes:
+#      - $IOTEX_RELAYER/etc/relayer-config-polis.yaml:/etc/iotube-relayer/relayer-config-polis.yaml:ro
+#    links:
+#      - database
+#    command: relayer -config=/etc/iotube-relayer/relayer-config-polis.yaml
 
   bsc-relayer:
     container_name: bsc-relayer
diff --git a/witness-service/docker-compose-witness.yml b/witness-service/docker-compose-witness.yml
index 029131f..fb4b7a3 100644
--- a/witness-service/docker-compose-witness.yml
+++ b/witness-service/docker-compose-witness.yml
@@ -38,31 +38,31 @@ services:
       WITNESS_PRIVATE_KEY: ${WITNESS_PRIVATE_KEY}
       RELAYER_URL: ${RELAYER_URL}
 
-  heco-witness:
-    container_name: heco-witness
-    image: witness:latest
-    restart: on-failure
-    volumes:
-      - $IOTEX_WITNESS/etc/witness-config-heco.yaml:/etc/iotube-witness/witness-config-heco.yaml:ro
-      - $IOTEX_WITNESS/etc/witness-config-heco.secret.yaml:/etc/iotube-witness/witness-config-heco.secret.yaml:ro
-    network_mode: host
-    command: witness -config=/etc/iotube-witness/witness-config-heco.yaml -secret=/etc/iotube-witness/witness-config-heco.secret.yaml
-    environment:
-      WITNESS_PRIVATE_KEY: ${WITNESS_PRIVATE_KEY}
-      RELAYER_URL: ${RELAYER_URL}
+#  heco-witness:
+#    container_name: heco-witness
+#    image: witness:latest
+#    restart: on-failure
+#    volumes:
+#      - $IOTEX_WITNESS/etc/witness-config-heco.yaml:/etc/iotube-witness/witness-config-heco.yaml:ro
+#      - $IOTEX_WITNESS/etc/witness-config-heco.secret.yaml:/etc/iotube-witness/witness-config-heco.secret.yaml:ro
+#    network_mode: host
+#    command: witness -config=/etc/iotube-witness/witness-config-heco.yaml -secret=/etc/iotube-witness/witness-config-heco.secret.yaml
+#    environment:
+#      WITNESS_PRIVATE_KEY: ${WITNESS_PRIVATE_KEY}
+#      RELAYER_URL: ${RELAYER_URL}
 
-  polis-witness:
-    container_name: polis-witness
-    image: witness:latest
-    restart: on-failure
-    volumes:
-      - $IOTEX_WITNESS/etc/witness-config-polis.yaml:/etc/iotube-witness/witness-config-polis.yaml:ro
-      - $IOTEX_WITNESS/etc/witness-config-polis.secret.yaml:/etc/iotube-witness/witness-config-polis.secret.yaml:ro
-    network_mode: host
-    command: witness -config=/etc/iotube-witness/witness-config-polis.yaml -secret=/etc/iotube-witness/witness-config-polis.secret.yaml
-    environment:
-      WITNESS_PRIVATE_KEY: ${WITNESS_PRIVATE_KEY}
-      RELAYER_URL: ${RELAYER_URL}
+#  polis-witness:
+#    container_name: polis-witness
+#    image: witness:latest
+#    restart: on-failure
+#    volumes:
+#      - $IOTEX_WITNESS/etc/witness-config-polis.yaml:/etc/iotube-witness/witness-config-polis.yaml:ro
+#      - $IOTEX_WITNESS/etc/witness-config-polis.secret.yaml:/etc/iotube-witness/witness-config-polis.secret.yaml:ro
+#    network_mode: host
+#    command: witness -config=/etc/iotube-witness/witness-config-polis.yaml -secret=/etc/iotube-witness/witness-config-polis.secret.yaml
+#    environment:
+#      WITNESS_PRIVATE_KEY: ${WITNESS_PRIVATE_KEY}
+#      RELAYER_URL: ${RELAYER_URL}
 
   bsc-witness:
     container_name: bsc-witness
diff --git a/witness-service/witness-config-bsc.yaml b/witness-service/witness-config-bsc.yaml
index 5cd5db9..d7ba6c8 100644
--- a/witness-service/witness-config-bsc.yaml
+++ b/witness-service/witness-config-bsc.yaml
@@ -9,7 +9,7 @@ database:
 cashiers:
   - id: "bsc-to-iotex"
     relayerURL: ":7001"
-    startBlockHeight: 5177821
+    startBlockHeight: 34560000
     cashierContractAddress: "0x797f1465796fd89ea7135e76dbc7cdb136bba1ca"
     tokenSafeContractAddress: "0xfbe9a4138afdf1fa639a8c2818a0c4513fc4ce4b"
     validatorContractAddress: "io10xr64as4krm5nufd5l2ddc43al6tl0smumkg7y"
@@ -39,3 +39,6 @@ cashiers:
       # IoTexShiba
       - token1: "0x52702a7301be185cc97bf3fe6d497a83e7772fde"
         token2: "io1ld5l9sxecjzkftkn9tcudu6z5qmvjj2zfamvcw"
+      # DRF
+      - token2: "io1mm5eya89mz3dmp0lqtlfuydf67nrdhnwg92dy4"
+        token1: "0x02dF5253Bc4EfC9F8f744133Ff99981b18Df0473"
diff --git a/witness-service/witness-config-ethereum.yaml b/witness-service/witness-config-ethereum.yaml
index 4e68279..1ca3388 100644
--- a/witness-service/witness-config-ethereum.yaml
+++ b/witness-service/witness-config-ethereum.yaml
@@ -9,7 +9,7 @@ database:
 cashiers:
   - id: "ethereum-to-iotex"
     relayerURL: ":7001"
-    startBlockHeight: 11827636
+    startBlockHeight: 18800000
     validatorContractAddress: "io10xr64as4krm5nufd5l2ddc43al6tl0smumkg7y"
     cashierContractAddress: "0xa0fd7430852361931b23a31f84374ba3314e1682"
     tokenSafeContractAddress: "0xc2e0f31d739cb3153ba5760a203b3bd7c27f0d7a"
@@ -59,4 +59,10 @@ cashiers:
         token1: "0xf79deaBc1406a3AD07c70877fBaEb90777B77E68"
       # CTSI
       - token2: "io16ajfjch2hlm56vnhlwvs7g7aptnvx40ksyvrz5"
-        token1: "0x30e68fACB9D4E04FEdc12A8Cc539639f90F40c63"
\ No newline at end of file
+        token1: "0x30e68fACB9D4E04FEdc12A8Cc539639f90F40c63"
+      # DATA
+      - token2: "io1rt3y6jfg4ph64txhrn6pf54n5jv6mv5mjlp37u"
+        token1: "0x03F353dd6a5d65d533f4746AEBc927E7FEa34284"
+      # DRF
+      - token1: "io1mm5eya89mz3dmp0lqtlfuydf67nrdhnwg92dy4"
+        token2: "0x02dF5253Bc4EfC9F8f744133Ff99981b18Df0473"
diff --git a/witness-service/witness-config-iotex.yaml b/witness-service/witness-config-iotex.yaml
index 5945fe7..2f74926 100644
--- a/witness-service/witness-config-iotex.yaml
+++ b/witness-service/witness-config-iotex.yaml
@@ -156,3 +156,6 @@ cashiers:
       # WIFI
       - token1: "io1em553udth5j85hjp4z9j3xgdhq00qz7uq5egha"
         token2: "0x8F26b442B6681567f6EaA75828140712f939Fb9e"
+      # DATA
+      - token1: "io1rt3y6jfg4ph64txhrn6pf54n5jv6mv5mjlp37u"
+        token2: "0x03F353dd6a5d65d533f4746AEBc927E7FEa34284"
diff --git a/witness-service/witness-config-matic.yaml b/witness-service/witness-config-matic.yaml
index 3c8a37e..d5ce406 100644
--- a/witness-service/witness-config-matic.yaml
+++ b/witness-service/witness-config-matic.yaml
@@ -10,7 +10,7 @@ database:
 cashiers:
   - id: "matic-to-iotex"
     relayerURL: ":7001"
-    startBlockHeight: 15246000
+    startBlockHeight: 51400000
     cashierContractAddress: "0xf72CFb704d49aC7BB7FFa420AE5f084C671A29be"
     tokenSafeContractAddress: "0xA239F03Cda98A7d2AaAA51e7bF408e5d73399e45"
     validatorContractAddress: "io10xr64as4krm5nufd5l2ddc43al6tl0smumkg7y"