Support Lorentz HF (#20)

yoshidan · web-flow · commit d3e2f61e242b · 2025-04-07T17:46:49.000+09:00
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,4 +37,4 @@ jobs:
           source /opt/sgxsdk/environment
           make prepare-contracts
           make build-images
-          make USE_UPGRADE_TEST=yes e2e-test
+          make USE_UPGRADE_TEST=no e2e-test
diff --git a/Makefile b/Makefile
@@ -131,7 +131,7 @@ $(Signed_RustEnclave_Name): $(RustEnclave_Name)
 
 .PHONY: enclave
 enclave:
-	@cd enclave && RUSTFLAGS=$(RUSTFLAGS) BSC_BLOCKS_PER_EPOCH=20 cargo build $(CARGO_TARGET) $(CARGO_FEATURES)
+	@cd enclave && RUSTFLAGS=$(RUSTFLAGS) cargo build $(CARGO_TARGET) $(CARGO_FEATURES)
 	@mkdir -p ./lib
 	@cp enclave/target/$(OUTPUT_PATH)/libproxy_enclave.a ./lib/libenclave.a
 
diff --git a/enclave/Cargo.lock b/enclave/Cargo.lock
diff --git a/enclave/Cargo.toml b/enclave/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["staticlib"]
 [dependencies]
 enclave-runtime = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.12" }
 tendermint-lc = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.12", default-features = false }
-parlia-elc = { git = "https://github.com/datachainlab/parlia-elc",  rev = "v0.3.8-p1", default-features = false, features=["dev"] }
+parlia-elc = { git = "https://github.com/datachainlab/parlia-elc",  rev = "v0.3.9", default-features = false }
 
 [patch."crates-io"]
 getrandom = { git = "https://github.com/datachainlab/getrandom-sgx-lite" }
diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/datachainlab/cosmos-bsc-ibc-lcp
 go 1.22.0
 
 require (
-	github.com/datachainlab/ethereum-ibc-relay-chain v0.3.13
-	github.com/datachainlab/ibc-hd-signer v0.1.1
-	github.com/datachainlab/ibc-parlia-relay v0.3.9-p1
-	github.com/datachainlab/lcp-go v0.2.13
-	github.com/hyperledger-labs/yui-relayer v0.5.10
+	github.com/datachainlab/ethereum-ibc-relay-chain v0.3.17
+	github.com/datachainlab/ibc-hd-signer v0.1.2
+	github.com/datachainlab/ibc-parlia-relay v0.3.13-ts
+	github.com/datachainlab/lcp-go v0.2.15
+	github.com/hyperledger-labs/yui-relayer v0.5.11
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -414,14 +414,14 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
 github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.3.13 h1:RbYtraeZwN55qfbzfoDIJPK8CWWx5dWfO8CfnvS+dhk=
-github.com/datachainlab/ethereum-ibc-relay-chain v0.3.13/go.mod h1:dxL5umpjncKRw7iBFE2W+dGpmmWOiggth0aQsJrtLKM=
-github.com/datachainlab/ibc-hd-signer v0.1.1 h1:ws90eXVjjLcx2i6iPJu2bJ2w06tIeuSyIBfYbOIEv68=
-github.com/datachainlab/ibc-hd-signer v0.1.1/go.mod h1:I1pas5LB8QupngqT05/h3u1nqhHww9OOnAwliuPEd3c=
-github.com/datachainlab/ibc-parlia-relay v0.3.9-p1 h1:y3FqQVZacZogxhiP6yrQM5oP6JSF+p6N/iPsCXsR5AY=
-github.com/datachainlab/ibc-parlia-relay v0.3.9-p1/go.mod h1:0zarxJyO75kj4cR6Ylf8ilUbJuvcFfXww8Ek0NjxoL4=
-github.com/datachainlab/lcp-go v0.2.13 h1:zpjZ4blf//uVtSWv5bHOst5trmF7CvX7yygJK6WhFOE=
-github.com/datachainlab/lcp-go v0.2.13/go.mod h1:S/fUTQ4LtN6/D0NJv4DaEBH6qbZkdyBUQ+6jrNYJPjY=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.3.17 h1:oyDLIbc9hyp31c3OoIB5wHm51tpyDrYAu1KBA1KxfEw=
+github.com/datachainlab/ethereum-ibc-relay-chain v0.3.17/go.mod h1:sf+ti1uM1joxhukxIyj8oDQ5yf7d+e+nl+3vtn9f5CM=
+github.com/datachainlab/ibc-hd-signer v0.1.2 h1:fWAYjMBVyM390OllX/l58mZYA7we0spEBFLYKWYTwfw=
+github.com/datachainlab/ibc-hd-signer v0.1.2/go.mod h1:nwH0Z3TK/7jbu/oInGGWGRimQ+LCn6yvDyjMZrw9mR4=
+github.com/datachainlab/ibc-parlia-relay v0.3.13-ts h1:Xm0kNgvbCGZduI9aF6pi/vocognjU21Rcm/39v82sRA=
+github.com/datachainlab/ibc-parlia-relay v0.3.13-ts/go.mod h1:YkqwnY+1CFEeRe3aQmg053YSSkXK0sTeX39GUNN83d0=
+github.com/datachainlab/lcp-go v0.2.15 h1:UOelDhvE0/2lzCjeBSFghUkBkq3YJhnQhaTf3EKSZNg=
+github.com/datachainlab/lcp-go v0.2.15/go.mod h1:AmdXcxocZ1/qH86GEHeQOxTozE+06lH3Fkgg+LsZJu0=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -778,8 +778,8 @@ github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXM
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
-github.com/hyperledger-labs/yui-relayer v0.5.10 h1:j35SRowNfVDU3gvq4Th3Wy8ufRD5K4wbXDLQAGOgT8w=
-github.com/hyperledger-labs/yui-relayer v0.5.10/go.mod h1:kJvSmuagdDsSlvbnHtEHbhmkUlAS43/ArLDwukOKSlo=
+github.com/hyperledger-labs/yui-relayer v0.5.11 h1:tBDWJa96jQhxL9zLDbB94VvSgw0f8Xk9tqPuKMT3ARw=
+github.com/hyperledger-labs/yui-relayer v0.5.11/go.mod h1:kJvSmuagdDsSlvbnHtEHbhmkUlAS43/ArLDwukOKSlo=
 github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
 github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
diff --git a/tests/e2e/cases/tm2bsc/configs/templates/ibc-1.json.tpl b/tests/e2e/cases/tm2bsc/configs/templates/ibc-1.json.tpl
@@ -41,7 +41,8 @@
         "numerator": 1,
         "denominator": 2
       },
-      "refreshBlockDifferenceThreshold": 10000
+      "refreshBlockDifferenceThreshold": 10000,
+      "network": "localnet"
     },
     "lcp_service_address": "localhost:50051",
     "mrenclave": $MRENCLAVE,
diff --git a/tests/e2e/chains/bsc/Dockerfile.bootstrap b/tests/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
diff --git a/tests/e2e/chains/bsc/contracts/hardhat.config.js b/tests/e2e/chains/bsc/contracts/hardhat.config.js
@@ -8,7 +8,6 @@ module.exports = {
   solidity: {
     version: "0.8.28",
     settings: {
-      evmVersion: "cancun",
       optimizer: {
         enabled: true,
         runs: 9_999_999
diff --git a/tests/e2e/chains/bsc/docker-compose.bsc.yml b/tests/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
diff --git a/tests/e2e/chains/bsc/docker-compose.yml b/tests/e2e/chains/bsc/docker-compose.yml
@@ -11,7 +11,6 @@ services:
       dockerfile: Dockerfile.bootstrap
     env_file: .env
     environment:
-      BLOCKS_PER_EPOCH: 20
       INIT_HOLDER_BALANCE: "500000000000000000000"
       NUMS_OF_VALIDATOR: 3
       INIT_NUM_OF_CABINETS: 2
diff --git a/tests/e2e/chains/bsc/genesis/genesis-template.template b/tests/e2e/chains/bsc/genesis/genesis-template.template
@@ -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",
diff --git a/tests/e2e/chains/bsc/genesis/scripts/init_holders.template b/tests/e2e/chains/bsc/genesis/scripts/init_holders.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
diff --git a/tests/e2e/chains/bsc/scripts/bootstrap.sh b/tests/e2e/chains/bsc/scripts/bootstrap.sh
@@ -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
diff --git a/tests/e2e/scripts/run_e2e_test.sh b/tests/e2e/scripts/run_e2e_test.sh
@@ -20,7 +20,9 @@ LCP_PID=$!
 
 make -C tests/e2e/cases/tm2bsc network
 
-sleep 60
+# must wait 2 epoch ( 1.5 * 400 )
+echo "wait 2 epoch"
+sleep 600
 
 ./tests/e2e/cases/tm2bsc/scripts/gen_rly_config.sh
 
@@ -36,6 +38,7 @@ kill $LCP_PID
 ./tests/e2e/scripts/init_lcp.sh
 ${LCP_BIN} --log_level=info service start --enclave=${ENCLAVE_PATH} --address=127.0.0.1:50051 --threads=2 &
 LCP_PID=$!
+
 make -C tests/e2e/cases/tm2bsc restore
 
 make -C tests/e2e/cases/tm2bsc test
