adds RoundInterval to StoreData in client-sdk

ark-network · Sep 2, 2024 · 3d8d0e3 · 3d8d0e3
1 parent e46f2ce
commit 3d8d0e3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/pkg/client-sdk/client.go b/pkg/client-sdk/client.go
@@ -98,6 +98,7 @@ func (a *arkClient) InitWithWallet(
 		ClientType:          args.ClientType,
 		Network:             network,
 		RoundLifetime:       info.RoundLifetime,
+		RoundInterval:       info.RoundInterval,
 		UnilateralExitDelay: info.UnilateralExitDelay,
 		MinRelayFee:         uint64(info.MinRelayFee),
 	}
@@ -161,6 +162,7 @@ func (a *arkClient) Init(
 		ClientType:          args.ClientType,
 		Network:             network,
 		RoundLifetime:       info.RoundLifetime,
+		RoundInterval:       info.RoundInterval,
 		UnilateralExitDelay: info.UnilateralExitDelay,
 		MinRelayFee:         uint64(info.MinRelayFee),
 	}

diff --git a/pkg/client-sdk/store/file/store.go b/pkg/client-sdk/store/file/store.go
@@ -27,6 +27,7 @@ type storeData struct {
 	ClientType          string `json:"client_type"`
 	Network             string `json:"network"`
 	RoundLifetime       string `json:"round_lifetime"`
+	RoundInterval       string `json:"round_interval"`
 	UnilateralExitDelay string `json:"unilateral_exit_delay"`
 	MinRelayFee         string `json:"min_relay_fee"`
 }
@@ -38,6 +39,7 @@ func (d storeData) isEmpty() bool {
 func (d storeData) decode() store.StoreData {
 	network := utils.NetworkFromString(d.Network)
 	roundLifetime, _ := strconv.Atoi(d.RoundLifetime)
+	roundInterval, _ := strconv.Atoi(d.RoundInterval)
 	unilateralExitDelay, _ := strconv.Atoi(d.UnilateralExitDelay)
 	minRelayFee, _ := strconv.Atoi(d.MinRelayFee)
 	buf, _ := hex.DecodeString(d.AspPubkey)
@@ -49,6 +51,7 @@ func (d storeData) decode() store.StoreData {
 		ClientType:          d.ClientType,
 		Network:             network,
 		RoundLifetime:       int64(roundLifetime),
+		RoundInterval:       int64(roundInterval),
 		UnilateralExitDelay: int64(unilateralExitDelay),
 		MinRelayFee:         uint64(minRelayFee),
 	}
@@ -62,6 +65,7 @@ func (d storeData) asMap() map[string]string {
 		"client_type":           d.ClientType,
 		"network":               d.Network,
 		"round_lifetime":        d.RoundLifetime,
+		"round_interval":        d.RoundInterval,
 		"unilateral_exit_delay": d.UnilateralExitDelay,
 		"min_relay_fee":         d.MinRelayFee,
 	}
@@ -106,6 +110,7 @@ func (s *Store) AddData(ctx context.Context, data store.StoreData) error {
 		ClientType:          data.ClientType,
 		Network:             data.Network.Name,
 		RoundLifetime:       fmt.Sprintf("%d", data.RoundLifetime),
+		RoundInterval:       fmt.Sprintf("%d", data.RoundInterval),
 		UnilateralExitDelay: fmt.Sprintf("%d", data.UnilateralExitDelay),
 		MinRelayFee:         fmt.Sprintf("%d", data.MinRelayFee),
 	}

diff --git a/pkg/client-sdk/store/store.go b/pkg/client-sdk/store/store.go
@@ -19,6 +19,7 @@ type StoreData struct {
 	ClientType          string
 	Network             common.Network
 	RoundLifetime       int64
+	RoundInterval       int64
 	UnilateralExitDelay int64
 	MinRelayFee         uint64
 }

diff --git a/pkg/client-sdk/store/store_test.go b/pkg/client-sdk/store/store_test.go
@@ -24,6 +24,7 @@ func TestStore(t *testing.T) {
 		ClientType:          client.GrpcClient,
 		Network:             common.LiquidRegTest,
 		RoundLifetime:       512,
+		RoundInterval:       10,
 		UnilateralExitDelay: 512,
 		MinRelayFee:         300,
 	}

diff --git a/pkg/client-sdk/wallet/wallet_test.go b/pkg/client-sdk/wallet/wallet_test.go
@@ -27,6 +27,7 @@ func TestWallet(t *testing.T) {
 		ClientType:          client.GrpcClient,
 		Network:             common.LiquidRegTest,
 		RoundLifetime:       512,
+		RoundInterval:       10,
 		UnilateralExitDelay: 512,
 		MinRelayFee:         300,
 	}

diff --git a/pkg/client-sdk/wasm/browser/config_store.go b/pkg/client-sdk/wasm/browser/config_store.go
@@ -28,6 +28,7 @@ type storeData struct {
 	ExplorerURL         string `json:"explorer_url"`
 	Network             string `json:"network"`
 	RoundLifetime       string `json:"round_lifetime"`
+	RoundInterval       string `json:"round_interval"`
 	UnilateralExitDelay string `json:"unilateral_exit_delay"`
 	MinRelayFee         string `json:"min_relay_fee"`
 }
@@ -57,6 +58,7 @@ func (s *localStorageStore) AddData(ctx context.Context, data store.StoreData) e
 		ClientType:          data.ClientType,
 		Network:             data.Network.Name,
 		RoundLifetime:       fmt.Sprintf("%d", data.RoundLifetime),
+		RoundInterval:       fmt.Sprintf("%d", data.RoundInterval),
 		UnilateralExitDelay: fmt.Sprintf("%d", data.UnilateralExitDelay),
 		MinRelayFee:         fmt.Sprintf("%d", data.MinRelayFee),
 	}
@@ -82,6 +84,7 @@ func (s *localStorageStore) GetData(ctx context.Context) (*store.StoreData, erro
 	}
 	network := utils.NetworkFromString(s.store.Call("getItem", "network").String())
 	roundLifetime, _ := strconv.Atoi(s.store.Call("getItem", "round_lifetime").String())
+	roundInterval, _ := strconv.Atoi(s.store.Call("getItem", "round_interval").String())
 	unilateralExitDelay, _ := strconv.Atoi(s.store.Call("getItem", "unilateral_exit_delay").String())
 	minRelayFee, _ := strconv.Atoi(s.store.Call("getItem", "min_relay_fee").String())
 
@@ -92,6 +95,7 @@ func (s *localStorageStore) GetData(ctx context.Context) (*store.StoreData, erro
 		ClientType:          s.store.Call("getItem", "client_type").String(),
 		Network:             network,
 		RoundLifetime:       int64(roundLifetime),
+		RoundInterval:       int64(roundInterval),
 		UnilateralExitDelay: int64(unilateralExitDelay),
 		MinRelayFee:         uint64(minRelayFee),
 	}, nil