From 14d041eca711cd52ffa70c1c2baf0afaa9c2bbd1 Mon Sep 17 00:00:00 2001 From: Ishan Date: Mon, 19 Feb 2024 17:43:27 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Update=20interop=20example?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/custom_config_node_one.json | 9 +++++++-- .../config/custom_config_node_two.json | 9 +++++++-- .../pos-mainchain-fast/config/default/config.json | 9 --------- .../pos-sidechain-example-one/config/default/config.json | 6 +++++- .../pos-sidechain-example-two/config/default/config.json | 6 +++++- .../src/block_event_handler.ts | 1 - 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/examples/interop/pos-mainchain-fast/config/custom_config_node_one.json b/examples/interop/pos-mainchain-fast/config/custom_config_node_one.json index 736e377a30..ab446d8d28 100644 --- a/examples/interop/pos-mainchain-fast/config/custom_config_node_one.json +++ b/examples/interop/pos-mainchain-fast/config/custom_config_node_one.json @@ -1,7 +1,12 @@ { "system": { - "dataPath": "~/.lisk/pos-mainchain-node-one", - "logLevel": "info" + "dataPath": "~/.lisk/mainchain-node-one", + "logLevel": "debug", + "keepEventsForHeights": -1, + "keepInclusionProofsForHeights": -1, + "inclusionProofKeys": [ + "83ed0d250000160811fdaf692ba77eabfbfc3a6bb3c4cf6a87beafd28cfe90b5dc64cb20ab46" + ] }, "rpc": { "modes": ["ipc"], diff --git a/examples/interop/pos-mainchain-fast/config/custom_config_node_two.json b/examples/interop/pos-mainchain-fast/config/custom_config_node_two.json index 99c18dcc72..d4e0812e9d 100644 --- a/examples/interop/pos-mainchain-fast/config/custom_config_node_two.json +++ b/examples/interop/pos-mainchain-fast/config/custom_config_node_two.json @@ -1,7 +1,12 @@ { "system": { - "dataPath": "~/.lisk/pos-mainchain-node-two", - "logLevel": "info" + "dataPath": "~/.lisk/mainchain-node-two", + "logLevel": "debug", + "keepEventsForHeights": -1, + "keepInclusionProofsForHeights": -1, + "inclusionProofKeys": [ + "83ed0d250000ac894ab085f50b81fe000e99ccb27e5543de69f63d4f9105daab15dce90f81b3" + ] }, "rpc": { "modes": ["ipc"], diff --git a/examples/interop/pos-mainchain-fast/config/default/config.json b/examples/interop/pos-mainchain-fast/config/default/config.json index 38ecf0f438..4f2b2b8709 100644 --- a/examples/interop/pos-mainchain-fast/config/default/config.json +++ b/examples/interop/pos-mainchain-fast/config/default/config.json @@ -1,13 +1,4 @@ { - "system": { - "dataPath": "~/.lisk/pos-mainchain-fast", - "keepEventsForHeights": -1, - "keepInclusionProofsForHeights": -1, - "inclusionProofKeys": [ - "83ed0d250000160811fdaf692ba77eabfbfc3a6bb3c4cf6a87beafd28cfe90b5dc64cb20ab46" - ], - "logLevel": "info" - }, "rpc": { "modes": ["ipc"], "port": 7881, diff --git a/examples/interop/pos-sidechain-example-one/config/default/config.json b/examples/interop/pos-sidechain-example-one/config/default/config.json index 55f8adb31d..48b73923fa 100644 --- a/examples/interop/pos-sidechain-example-one/config/default/config.json +++ b/examples/interop/pos-sidechain-example-one/config/default/config.json @@ -2,7 +2,11 @@ "system": { "dataPath": "~/.lisk/pos-sidechain-example-one", "keepEventsForHeights": 300, - "logLevel": "info" + "logLevel": "info", + "keepInclusionProofsForHeights": -1, + "inclusionProofKeys": [ + "83ed0d250000fb5e512425fc9449316ec95969ebe71e2d576dbab833d61e2a5b9330fd70ee02" + ] }, "rpc": { "modes": ["ipc"], diff --git a/examples/interop/pos-sidechain-example-two/config/default/config.json b/examples/interop/pos-sidechain-example-two/config/default/config.json index 0297e306f9..2a1575e421 100644 --- a/examples/interop/pos-sidechain-example-two/config/default/config.json +++ b/examples/interop/pos-sidechain-example-two/config/default/config.json @@ -2,7 +2,11 @@ "system": { "dataPath": "~/.lisk/pos-sidechain-example-two", "keepEventsForHeights": 300, - "logLevel": "info" + "logLevel": "info", + "keepInclusionProofsForHeights": -1, + "inclusionProofKeys": [ + "83ed0d250000fb5e512425fc9449316ec95969ebe71e2d576dbab833d61e2a5b9330fd70ee02" + ] }, "rpc": { "modes": ["ipc"], diff --git a/framework-plugins/lisk-framework-chain-connector-plugin/src/block_event_handler.ts b/framework-plugins/lisk-framework-chain-connector-plugin/src/block_event_handler.ts index 47e29b7e24..b8465e3c0d 100644 --- a/framework-plugins/lisk-framework-chain-connector-plugin/src/block_event_handler.ts +++ b/framework-plugins/lisk-framework-chain-connector-plugin/src/block_event_handler.ts @@ -230,7 +230,6 @@ export class BlockEventHandler { if (ccuSubmitResult) { this._lastSentCCUTxID = ccuSubmitResult; // If CCU was sent successfully then save the lastSentCCM if any - // TODO: Add function to check on the receiving chain whether last sent CCM was accepted or not if (computedCCUParams.lastCCMToBeSent) { this._lastSentCCM = computedCCUParams.lastCCMToBeSent; }