From 5b38395ee6c4af0d0774ef76d63f1625d96f0d5b Mon Sep 17 00:00:00 2001
From: Phu Ngo <12547020+NgoKimPhu@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:33:37 +0700
Subject: [PATCH] feat: batchable eth client can now be flushed manually

---
 go.mod                      | 2 +-
 go.sum                      | 4 ++--
 pkg/client/eth_batchable.go | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 86f7401..ff1e391 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.3
 
 require (
-	github.com/KyberNetwork/kutils v0.3.1
+	github.com/KyberNetwork/kutils v0.3.2
 	github.com/KyberNetwork/kyber-trace-go v0.1.2
 	github.com/bufbuild/protovalidate-go v0.6.4
 	github.com/cenkalti/backoff/v4 v4.3.0
diff --git a/go.sum b/go.sum
index b58a2ef..61dae9f 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,8 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-2024071716455
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-20240717164558-a6c49f84cc0f.2/go.mod h1:ylS4c28ACSI59oJrOdW4pHS4n0Hw4TgSPHn8rpHl4Yw=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/KyberNetwork/kutils v0.3.1 h1:0Z3gSd/HxyDdXmgDwoYCTurcUXPDLJgVReuNpOAV4zI=
-github.com/KyberNetwork/kutils v0.3.1/go.mod h1:a6mG7UxKANmqzs2FnAe9FzGXQ8fRVxq/PWIrSt+L+uc=
+github.com/KyberNetwork/kutils v0.3.2 h1:cBoyP99gSO7+PzCp1/5LLi5rsIw965NxJ9fRvQtlPe0=
+github.com/KyberNetwork/kutils v0.3.2/go.mod h1:a6mG7UxKANmqzs2FnAe9FzGXQ8fRVxq/PWIrSt+L+uc=
 github.com/KyberNetwork/kyber-trace-go v0.1.2 h1:x82SuCYTj4naoGNQ02DoSQgl7f07grl8RL8cKGAFNLw=
 github.com/KyberNetwork/kyber-trace-go v0.1.2/go.mod h1:X6hVacmKMeOEOlFh4TyfEHaEVRerFQ5YLuQ4keRV3hw=
 github.com/KyberNetwork/logger v0.1.0 h1:Iibu9Ls+tipjR+C0iXhzUYM1VtRgmmR1HHWGufPYcbs=
diff --git a/pkg/client/eth_batchable.go b/pkg/client/eth_batchable.go
index c74ed65..284dd6d 100644
--- a/pkg/client/eth_batchable.go
+++ b/pkg/client/eth_batchable.go
@@ -79,6 +79,12 @@ func (b *BatchableEthClient) CallContract(ctx context.Context, msg ethereum.Call
 	return task.Result()
 }
 
+// Flush executes all currently queued requests.
+func (b *BatchableEthClient) Flush() {
+	b.batcher.Flush()
+	b.archiveBatcher.Flush()
+}
+
 func (b *BatchableEthClient) Close() {
 	b.EthClient.Close()
 	b.batcher.Close()