Merge pull request #54 from datachainlab/feature/rolentz_msec

Support msec timestamp and 500 epoch length in BEP520

Author: yoshidan

.github/workflows/ci.yml

@@ -54,7 +54,9 @@ jobs:
         run: |
           make chain
           make contracts
-          sleep 20
+          # epoch is 200, 400, 500, 1000
+          # must wait for 400 block (1.5sec * 400)
+          sleep 600
           make relayer
           make test
       - name: integration-test

README.md

@@ -3,8 +3,8 @@
 ![CI](https://github.com/datachainlab/ibc-parlia-relay/workflows/CI/badge.svg?branch=main)
 
 ## Supported Versions
-- [yui-relayer v0.5.3](https://github.com/hyperledger-labs/yui-relayer/releases/tag/v0.5.3)
-- [ethereum-ibc-relay-chain v0.3.4](https://github.com/datachainlab/ethereum-ibc-relay-chain/releases/tag/v0.3.4)
+- [yui-relayer v0.5.11](https://github.com/hyperledger-labs/yui-relayer/releases/tag/v0.5.11)
+- [ethereum-ibc-relay-chain v0.3.16](https://github.com/datachainlab/ethereum-ibc-relay-chain/releases/tag/v0.3.6)
 
 ## Setup Relayer
 
@@ -29,14 +29,6 @@ func main() {
 }
 ```
 
-## Change blocks per epoch 
-
-* You can change blocks per epoch by build arguments.
-* This is only for local net.
-```
-go build -tags dev -ldflags="-X github.com/datachainlab/ibc-parlia-relay/module/constant.blocksPerEpoch=20" -o testrly .
-```
-
 ## Development
 
 Generate proto buf with protobuf definition of [parlia-elc](https://github.com/datachainlab/parlia-elc).
@@ -48,3 +40,12 @@ cd ibc-parlia-relay
 make proto-import
 make proto-gen
 ```
+
+## About ForkSpec
+
+1. Set HF height as soon as possible
+As soon as the HF height is determined, please modify the timestamp in the ForkSpec to the height as soon as possible.
+HF height is calculated from timestamp, but the further away from the HF, the longer it takes to calculate.
+
+2. Limitation of the CreateClient
+When the latest HF height is not set it is impossible to create client if the latest finalize header is after latest HF timestamp

e2e/Makefile

@@ -13,8 +13,7 @@ contracts:
 .PHONY:relayer
 relayer:
 	rm -rf .testrly
-	go build -tags dev -ldflags="-X github.com/datachainlab/ibc-parlia-relay/module/constant.blocksPerEpoch=20" -o testrly .
-	# go build -o testrly .
+	go build -o testrly .
 	./testrly config init --home .testrly
 	./testrly chains add-dir config/demo/ --home .testrly
 	./testrly paths add ibc0 ibc1 ibc01 --file=config/path.json --home .testrly

e2e/chains/bsc/Dockerfile.bootstrap

@@ -3,8 +3,8 @@ FROM ghcr.io/foundry-rs/foundry:nightly-462b2ac6c038dc24b8f38b0c59b664d0740604c2
 RUN apk add --d --no-cache ca-certificates npm nodejs bash alpine-sdk expect jq curl bash python3
 RUN curl -sSL https://install.python-poetry.org | python3 -
 
-RUN git clone https://github.com/bnb-chain/bsc-genesis-contract -b v1.2.4 /root/genesis \
-    && cd /root/genesis && npm ci
+RUN git clone https://github.com/bnb-chain/bsc-genesis-contract -b develop /root/genesis \
+    && cd /root/genesis && git checkout 44ebc6c17a00bd24db3240141a78091528dcebbb && npm ci
 
 RUN cd /root/genesis && /root/.local/bin/poetry install
 RUN cd /root/genesis && forge install --no-git --no-commit foundry-rs/forge-std@v1.7.3

e2e/chains/bsc/docker-compose.bsc.yml

@@ -5,5 +5,5 @@ services:
       dockerfile: Dockerfile.bsc
       args:
         GIT_SOURCE: https://github.com/bnb-chain/bsc
-        GIT_CHECKOUT_BRANCH: v1.5.5
+        GIT_CHECKOUT_BRANCH: v1.5.9
     image: bsc-geth:docker-local

e2e/chains/bsc/docker-compose.simple.yml

@@ -19,7 +19,6 @@ services:
       dockerfile: Dockerfile.bootstrap
     env_file: .env
     environment:
-      BLOCKS_PER_EPOCH: 20
       INIT_HOLDER_BALANCE: "500000000000000000000"
       NUMS_OF_VALIDATOR: 5
       INIT_NUM_OF_CABINETS: 4
@@ -42,7 +41,6 @@ services:
       dockerfile: Dockerfile.bootstrap
     env_file: .env2
     environment:
-      BLOCKS_PER_EPOCH: 20
       INIT_HOLDER_BALANCE: "500000000000000000000"
       NUMS_OF_VALIDATOR: 3
       INIT_NUM_OF_CABINETS: 2

e2e/chains/bsc/genesis/contracts/BSCValidatorSet.sol

@@ -35,6 +35,7 @@
     "bohrTime": 0,
     "pascalTime": 0,
     "pragueTime": 0,
+    "lorentzTime": 0,
     "blobSchedule": {
       "cancun": {
         "target": 3,
@@ -48,8 +49,6 @@
       }
     },
     "parlia": {
-      "period": 3,
-      "epoch": {{BLOCKS_PER_EPOCH}}
     }
   },
   "nonce": "0x0",

e2e/chains/bsc/genesis/genesis-template.template

@@ -1,7 +1,7 @@
 const web3 = require("web3")
 
 const addresses = "{{INIT_HOLDER_ADDRESSES}}"
-const balance = web3.utils.toBN("{{INIT_HOLDER_BALANCE}}").toString("hex")
+const balance = BigInt("{{INIT_HOLDER_BALANCE}}").toString(16)
 const init_holders = addresses.split(",").map(address => ({ address, balance }));
 
 exports = module.exports = init_holders

e2e/chains/bsc/genesis/scripts/init_holders.template

@@ -35,10 +35,9 @@ function init_validator() {
 function generate_genesis() {
   INIT_HOLDER_ADDRESSES=$(ls ${workspace}/init-holders | tr '\n' ',')
   INIT_HOLDER_ADDRESSES=${INIT_HOLDER_ADDRESSES/%,/}
-  echo "blocks per epoch = ${BLOCKS_PER_EPOCH}"
 
   echo "replace genesis-template.template"
-  sed "s/{{BLOCKS_PER_EPOCH}}/${BLOCKS_PER_EPOCH}/g" genesis-template.template >genesis-template.json
+  cp genesis-template.template genesis-template.json
 
   echo "replace init_holders.template"
   sed "s/{{INIT_HOLDER_ADDRESSES}}/${INIT_HOLDER_ADDRESSES}/g" scripts/init_holders.template | sed "s/{{INIT_HOLDER_BALANCE}}/${INIT_HOLDER_BALANCE}/g" >scripts/init_holders.js
@@ -49,7 +48,7 @@ function generate_genesis() {
 
   echo "replace generate.py"
   sed "s/dev_chain_id: int = 714/dev_chain_id: int = ${BSC_CHAIN_ID}/g" scripts/generate.py > scripts/generate.py.out
-  sed "s/epoch: str = \"200\"/epoch: str = \"${BLOCKS_PER_EPOCH}\"/g" scripts/generate.py.out > scripts/generate.py
+  cp scripts/generate.py.out scripts/generate.py
 
   echo "start generate validators"
   node scripts/generate-validator.js