Skip to content

Commit ff8cd6e

Browse files
mmsqemmsqe
authored
Problem: trust_threshold is not aligned for latest hermes (#164)
for more info, https://github.com/informalsystems/hermes/blob/v1.8.0/config.toml#L364
1 parent 7867ed9 commit ff8cd6e

File tree

4 files changed

+132
-151
lines changed

4 files changed

+132
-151
lines changed

‎hermes/cmd/cmd.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ func GetCommands() []*plugin.Command {
102102
{Name: flagChainBMaxBlockTime, DefaultValue: "30s", Usage: "maximum block time of the chain B", Type: plugin.FlagTypeString},
103103
{Name: flagChainATrustingPeriod, DefaultValue: "14days", Usage: "trusting period of the chain A", Type: plugin.FlagTypeString},
104104
{Name: flagChainBTrustingPeriod, DefaultValue: "14days", Usage: "trusting period of the chain B", Type: plugin.FlagTypeString},
105-
{Name: flagChainATrustThresholdNumerator, DefaultValue: "2", Usage: "trusting threshold numerator of the chain A", Type: plugin.FlagTypeUint64},
106-
{Name: flagChainBTrustThresholdNumerator, DefaultValue: "2", Usage: "trusting threshold numerator of the chain B", Type: plugin.FlagTypeUint64},
107-
{Name: flagChainATrustThresholdDenominator, DefaultValue: "3", Usage: "trusting threshold denominator of the chain A", Type: plugin.FlagTypeUint64},
108-
{Name: flagChainBTrustThresholdDenominator, DefaultValue: "3", Usage: "trusting threshold denominator of the chain B", Type: plugin.FlagTypeUint64},
105+
{Name: flagChainATrustThreshold, DefaultValue: "2/3", Usage: "trust threshold of the chain A", Type: plugin.FlagTypeString},
106+
{Name: flagChainBTrustThreshold, DefaultValue: "2/3", Usage: "trust threshold of the chain B", Type: plugin.FlagTypeString},
109107
{Name: flagChainAMemoPrefix, Usage: "memo prefix of the chain A", Type: plugin.FlagTypeString},
110108
{Name: flagChainBMemoPrefix, Usage: "memo prefix of the chain B", Type: plugin.FlagTypeString},
111109
{Name: flagChainAFaucet, Usage: "faucet URL of the chain A", Type: plugin.FlagTypeString},

‎hermes/cmd/configure.go‎

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -450,31 +450,30 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
450450
chainARPCAddr = args[1]
451451
chainAGRPCAddr = args[2]
452452

453-
chainAEventSourceMode, _ = flags.GetString(flagChainAEventSourceMode)
454-
chainAEventSourceURL, _ = flags.GetString(flagChainAEventSourceURL)
455-
chainAEventSourceBatchDelay, _ = flags.GetString(flagChainAEventSourceBatchDelay)
456-
chainARPCTimeout, _ = flags.GetString(flagChainARPCTimeout)
457-
chainAAccountPrefix, _ = flags.GetString(flagChainAAccountPrefix)
458-
chainAAddressType, _ = flags.GetString(flagChainAAddressType)
459-
chainAKeyName, _ = flags.GetString(flagChainAKeyName)
460-
chainAKeyStoreType, _ = flags.GetString(flagChainAKeyStoreType)
461-
chainAStorePrefix, _ = flags.GetString(flagChainAStorePrefix)
462-
chainADefaultGas, _ = flags.GetUint64(flagChainADefaultGas)
463-
chainAMaxGas, _ = flags.GetUint64(flagChainAMaxGas)
464-
chainAGasPrice, _ = flags.GetString(flagChainAGasPrice)
465-
chainAGasMultiplier, _ = flags.GetString(flagChainAGasMultiplier)
466-
chainAMaxMsgNum, _ = flags.GetUint64(flagChainAMaxMsgNum)
467-
chainAMaxTxSize, _ = flags.GetUint64(flagChainAMaxTxSize)
468-
chainAClockDrift, _ = flags.GetString(flagChainAClockDrift)
469-
chainAMaxBlockTime, _ = flags.GetString(flagChainAMaxBlockTime)
470-
chainATrustingPeriod, _ = flags.GetString(flagChainATrustingPeriod)
471-
chainATrustThresholdNumerator, _ = flags.GetUint64(flagChainATrustThresholdNumerator)
472-
chainATrustThresholdDenominator, _ = flags.GetUint64(flagChainATrustThresholdDenominator)
473-
chainACCVConsumerChain, _ = flags.GetBool(flagChainACCVConsumerChain)
474-
chainATrustedNode, _ = flags.GetBool(flagChainATrustedNode)
475-
chainAMemoPrefix, _ = flags.GetString(flagChainAMemoPrefix)
476-
chainAType, _ = flags.GetString(flagChainAType)
477-
chainASequentialBatchTx, _ = flags.GetBool(flagChainASequentialBatchTx)
453+
chainAEventSourceMode, _ = flags.GetString(flagChainAEventSourceMode)
454+
chainAEventSourceURL, _ = flags.GetString(flagChainAEventSourceURL)
455+
chainAEventSourceBatchDelay, _ = flags.GetString(flagChainAEventSourceBatchDelay)
456+
chainARPCTimeout, _ = flags.GetString(flagChainARPCTimeout)
457+
chainAAccountPrefix, _ = flags.GetString(flagChainAAccountPrefix)
458+
chainAAddressType, _ = flags.GetString(flagChainAAddressType)
459+
chainAKeyName, _ = flags.GetString(flagChainAKeyName)
460+
chainAKeyStoreType, _ = flags.GetString(flagChainAKeyStoreType)
461+
chainAStorePrefix, _ = flags.GetString(flagChainAStorePrefix)
462+
chainADefaultGas, _ = flags.GetUint64(flagChainADefaultGas)
463+
chainAMaxGas, _ = flags.GetUint64(flagChainAMaxGas)
464+
chainAGasPrice, _ = flags.GetString(flagChainAGasPrice)
465+
chainAGasMultiplier, _ = flags.GetString(flagChainAGasMultiplier)
466+
chainAMaxMsgNum, _ = flags.GetUint64(flagChainAMaxMsgNum)
467+
chainAMaxTxSize, _ = flags.GetUint64(flagChainAMaxTxSize)
468+
chainAClockDrift, _ = flags.GetString(flagChainAClockDrift)
469+
chainAMaxBlockTime, _ = flags.GetString(flagChainAMaxBlockTime)
470+
chainATrustingPeriod, _ = flags.GetString(flagChainATrustingPeriod)
471+
chainATrustThreshold, _ = flags.GetString(flagChainATrustThreshold)
472+
chainACCVConsumerChain, _ = flags.GetBool(flagChainACCVConsumerChain)
473+
chainATrustedNode, _ = flags.GetBool(flagChainATrustedNode)
474+
chainAMemoPrefix, _ = flags.GetString(flagChainAMemoPrefix)
475+
chainAType, _ = flags.GetString(flagChainAType)
476+
chainASequentialBatchTx, _ = flags.GetBool(flagChainASequentialBatchTx)
478477
)
479478

480479
fmt.Println("aefaefaefeaf _ " + chainAGasMultiplier)
@@ -485,7 +484,7 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
485484
}
486485

487486
optChainA := []hermes.ChainOption{
488-
hermes.WithChainTrustThreshold(chainATrustThresholdNumerator, chainATrustThresholdDenominator),
487+
hermes.WithChainTrustThreshold(chainATrustThreshold),
489488
hermes.WithChainGasMultiplier(chainAGasMulti),
490489
hermes.WithChainCCVConsumerChain(chainACCVConsumerChain),
491490
hermes.WithChainTrustedNode(chainATrustedNode),
@@ -561,31 +560,30 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
561560
chainBRPCAddr = args[4]
562561
chainBGRPCAddr = args[5]
563562

564-
chainBEventSourceMode, _ = flags.GetString(flagChainBEventSourceMode)
565-
chainBEventSourceURL, _ = flags.GetString(flagChainBEventSourceURL)
566-
chainBEventSourceBatchDelay, _ = flags.GetString(flagChainBEventSourceBatchDelay)
567-
chainBRPCTimeout, _ = flags.GetString(flagChainBRPCTimeout)
568-
chainBAccountPrefix, _ = flags.GetString(flagChainBAccountPrefix)
569-
chainBAddressType, _ = flags.GetString(flagChainBAddressType)
570-
chainBKeyName, _ = flags.GetString(flagChainBKeyName)
571-
chainBKeyStoreType, _ = flags.GetString(flagChainBKeyStoreType)
572-
chainBStorePrefix, _ = flags.GetString(flagChainBStorePrefix)
573-
chainBDefaultGas, _ = flags.GetUint64(flagChainBDefaultGas)
574-
chainBMaxGas, _ = flags.GetUint64(flagChainBMaxGas)
575-
chainBGasPrice, _ = flags.GetString(flagChainBGasPrice)
576-
chainBGasMultiplier, _ = flags.GetString(flagChainBGasMultiplier)
577-
chainBMaxMsgNum, _ = flags.GetUint64(flagChainBMaxMsgNum)
578-
chainBMaxTxSize, _ = flags.GetUint64(flagChainBMaxTxSize)
579-
chainBClockDrift, _ = flags.GetString(flagChainBClockDrift)
580-
chainBMaxBlockTime, _ = flags.GetString(flagChainBMaxBlockTime)
581-
chainBTrustingPeriod, _ = flags.GetString(flagChainBTrustingPeriod)
582-
chainBTrustThresholdNumerator, _ = flags.GetUint64(flagChainBTrustThresholdNumerator)
583-
chainBTrustThresholdDenominator, _ = flags.GetUint64(flagChainBTrustThresholdDenominator)
584-
chainBCCVConsumerChain, _ = flags.GetBool(flagChainBCCVConsumerChain)
585-
chainBTrustedNode, _ = flags.GetBool(flagChainBTrustedNode)
586-
chainBMemoPrefix, _ = flags.GetString(flagChainBMemoPrefix)
587-
chainBType, _ = flags.GetString(flagChainBType)
588-
chainBSequentialBatchTx, _ = flags.GetBool(flagChainBSequentialBatchTx)
563+
chainBEventSourceMode, _ = flags.GetString(flagChainBEventSourceMode)
564+
chainBEventSourceURL, _ = flags.GetString(flagChainBEventSourceURL)
565+
chainBEventSourceBatchDelay, _ = flags.GetString(flagChainBEventSourceBatchDelay)
566+
chainBRPCTimeout, _ = flags.GetString(flagChainBRPCTimeout)
567+
chainBAccountPrefix, _ = flags.GetString(flagChainBAccountPrefix)
568+
chainBAddressType, _ = flags.GetString(flagChainBAddressType)
569+
chainBKeyName, _ = flags.GetString(flagChainBKeyName)
570+
chainBKeyStoreType, _ = flags.GetString(flagChainBKeyStoreType)
571+
chainBStorePrefix, _ = flags.GetString(flagChainBStorePrefix)
572+
chainBDefaultGas, _ = flags.GetUint64(flagChainBDefaultGas)
573+
chainBMaxGas, _ = flags.GetUint64(flagChainBMaxGas)
574+
chainBGasPrice, _ = flags.GetString(flagChainBGasPrice)
575+
chainBGasMultiplier, _ = flags.GetString(flagChainBGasMultiplier)
576+
chainBMaxMsgNum, _ = flags.GetUint64(flagChainBMaxMsgNum)
577+
chainBMaxTxSize, _ = flags.GetUint64(flagChainBMaxTxSize)
578+
chainBClockDrift, _ = flags.GetString(flagChainBClockDrift)
579+
chainBMaxBlockTime, _ = flags.GetString(flagChainBMaxBlockTime)
580+
chainBTrustingPeriod, _ = flags.GetString(flagChainBTrustingPeriod)
581+
chainBTrustThreshold, _ = flags.GetString(flagChainBTrustThreshold)
582+
chainBCCVConsumerChain, _ = flags.GetBool(flagChainBCCVConsumerChain)
583+
chainBTrustedNode, _ = flags.GetBool(flagChainBTrustedNode)
584+
chainBMemoPrefix, _ = flags.GetString(flagChainBMemoPrefix)
585+
chainBType, _ = flags.GetString(flagChainBType)
586+
chainBSequentialBatchTx, _ = flags.GetBool(flagChainBSequentialBatchTx)
589587
)
590588

591589
chainBGasMulti := new(big.Float)
@@ -595,7 +593,7 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
595593
}
596594

597595
optChainB := []hermes.ChainOption{
598-
hermes.WithChainTrustThreshold(chainBTrustThresholdNumerator, chainBTrustThresholdDenominator),
596+
hermes.WithChainTrustThreshold(chainBTrustThreshold),
599597
hermes.WithChainGasMultiplier(chainBGasMulti),
600598
hermes.WithChainCCVConsumerChain(chainBCCVConsumerChain),
601599
hermes.WithChainTrustedNode(chainBTrustedNode),

‎hermes/cmd/flag.go‎

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,59 @@ import (
55
)
66

77
const (
8-
flagChainAPortID = "chain-a-port-id"
9-
flagChainAEventSourceMode = "chain-a-event-source-mode"
10-
flagChainAEventSourceURL = "chain-a-event-source-url"
11-
flagChainAEventSourceBatchDelay = "chain-a-event-source-batch-delay"
12-
flagChainARPCTimeout = "chain-a-rpc-timeout"
13-
flagChainAAccountPrefix = "chain-a-account-prefix"
14-
flagChainAAddressType = "chain-a-address-types"
15-
flagChainAKeyName = "chain-a-key-name"
16-
flagChainAKeyStoreType = "chain-a-key-store-type"
17-
flagChainAStorePrefix = "chain-a-store-prefix"
18-
flagChainADefaultGas = "chain-a-default-gas"
19-
flagChainAMaxGas = "chain-a-max-gas"
20-
flagChainAGasPrice = "chain-a-gas-price"
21-
flagChainAGasMultiplier = "chain-a-gas-multiplier"
22-
flagChainAMaxMsgNum = "chain-a-max-msg-num"
23-
flagChainAMaxTxSize = "chain-a-tx-size"
24-
flagChainAClockDrift = "chain-a-clock-drift"
25-
flagChainAMaxBlockTime = "chain-a-max-block-time"
26-
flagChainATrustingPeriod = "chain-a-trusting-period"
27-
flagChainATrustThresholdNumerator = "chain-a-trust-threshold-numerator"
28-
flagChainATrustThresholdDenominator = "chain-a-trust-threshold-denominator"
29-
flagChainAFaucet = "chain-a-faucet"
30-
flagChainACCVConsumerChain = "chain-a-ccv-consumer-chain"
31-
flagChainATrustedNode = "chain-a-trusted-node"
32-
flagChainAMemoPrefix = "chain-a-memo-prefix"
33-
flagChainAType = "chain-a-type"
34-
flagChainASequentialBatchTx = "chain-a-sequential-batch-tx"
8+
flagChainAPortID = "chain-a-port-id"
9+
flagChainAEventSourceMode = "chain-a-event-source-mode"
10+
flagChainAEventSourceURL = "chain-a-event-source-url"
11+
flagChainAEventSourceBatchDelay = "chain-a-event-source-batch-delay"
12+
flagChainARPCTimeout = "chain-a-rpc-timeout"
13+
flagChainAAccountPrefix = "chain-a-account-prefix"
14+
flagChainAAddressType = "chain-a-address-types"
15+
flagChainAKeyName = "chain-a-key-name"
16+
flagChainAKeyStoreType = "chain-a-key-store-type"
17+
flagChainAStorePrefix = "chain-a-store-prefix"
18+
flagChainADefaultGas = "chain-a-default-gas"
19+
flagChainAMaxGas = "chain-a-max-gas"
20+
flagChainAGasPrice = "chain-a-gas-price"
21+
flagChainAGasMultiplier = "chain-a-gas-multiplier"
22+
flagChainAMaxMsgNum = "chain-a-max-msg-num"
23+
flagChainAMaxTxSize = "chain-a-tx-size"
24+
flagChainAClockDrift = "chain-a-clock-drift"
25+
flagChainAMaxBlockTime = "chain-a-max-block-time"
26+
flagChainATrustingPeriod = "chain-a-trusting-period"
27+
flagChainATrustThreshold = "chain-a-trust-threshold"
28+
flagChainAFaucet = "chain-a-faucet"
29+
flagChainACCVConsumerChain = "chain-a-ccv-consumer-chain"
30+
flagChainATrustedNode = "chain-a-trusted-node"
31+
flagChainAMemoPrefix = "chain-a-memo-prefix"
32+
flagChainAType = "chain-a-type"
33+
flagChainASequentialBatchTx = "chain-a-sequential-batch-tx"
3534

36-
flagChainBPortID = "chain-b-port-id"
37-
flagChainBEventSourceMode = "chain-b-event-source-mode"
38-
flagChainBEventSourceURL = "chain-b-event-source-url"
39-
flagChainBEventSourceBatchDelay = "chain-b-event-source-batch-delay"
40-
flagChainBRPCTimeout = "chain-b-rpc-timeout"
41-
flagChainBAccountPrefix = "chain-b-account-prefix"
42-
flagChainBAddressType = "chain-b-address-types"
43-
flagChainBKeyName = "chain-b-key-name"
44-
flagChainBKeyStoreType = "chain-b-key-store-type"
45-
flagChainBStorePrefix = "chain-b-store-prefix"
46-
flagChainBDefaultGas = "chain-b-default-gas"
47-
flagChainBMaxGas = "chain-b-max-gas"
48-
flagChainBGasPrice = "chain-b-gas-price"
49-
flagChainBGasMultiplier = "chain-b-gas-multiplier"
50-
flagChainBMaxMsgNum = "chain-b-max-msg-num"
51-
flagChainBMaxTxSize = "chain-b-tx-size"
52-
flagChainBClockDrift = "chain-b-clock-drift"
53-
flagChainBMaxBlockTime = "chain-b-max-block-time"
54-
flagChainBTrustingPeriod = "chain-b-trusting-period"
55-
flagChainBTrustThresholdNumerator = "chain-b-trust-threshold-numerator"
56-
flagChainBTrustThresholdDenominator = "chain-b-trust-threshold-denominator"
57-
flagChainBFaucet = "chain-b-faucet"
58-
flagChainBCCVConsumerChain = "chain-b-ccv-consumer-chain"
59-
flagChainBTrustedNode = "chain-b-trusted-node"
60-
flagChainBMemoPrefix = "chain-b-memo-prefix"
61-
flagChainBType = "chain-b-type"
62-
flagChainBSequentialBatchTx = "chain-b-sequential-batch-tx"
35+
flagChainBPortID = "chain-b-port-id"
36+
flagChainBEventSourceMode = "chain-b-event-source-mode"
37+
flagChainBEventSourceURL = "chain-b-event-source-url"
38+
flagChainBEventSourceBatchDelay = "chain-b-event-source-batch-delay"
39+
flagChainBRPCTimeout = "chain-b-rpc-timeout"
40+
flagChainBAccountPrefix = "chain-b-account-prefix"
41+
flagChainBAddressType = "chain-b-address-types"
42+
flagChainBKeyName = "chain-b-key-name"
43+
flagChainBKeyStoreType = "chain-b-key-store-type"
44+
flagChainBStorePrefix = "chain-b-store-prefix"
45+
flagChainBDefaultGas = "chain-b-default-gas"
46+
flagChainBMaxGas = "chain-b-max-gas"
47+
flagChainBGasPrice = "chain-b-gas-price"
48+
flagChainBGasMultiplier = "chain-b-gas-multiplier"
49+
flagChainBMaxMsgNum = "chain-b-max-msg-num"
50+
flagChainBMaxTxSize = "chain-b-tx-size"
51+
flagChainBClockDrift = "chain-b-clock-drift"
52+
flagChainBMaxBlockTime = "chain-b-max-block-time"
53+
flagChainBTrustingPeriod = "chain-b-trusting-period"
54+
flagChainBTrustThreshold = "chain-b-trust-threshold"
55+
flagChainBFaucet = "chain-b-faucet"
56+
flagChainBCCVConsumerChain = "chain-b-ccv-consumer-chain"
57+
flagChainBTrustedNode = "chain-b-trusted-node"
58+
flagChainBMemoPrefix = "chain-b-memo-prefix"
59+
flagChainBType = "chain-b-type"
60+
flagChainBSequentialBatchTx = "chain-b-sequential-batch-tx"
6361

6462
flagTelemetryEnabled = "telemetry-enabled"
6563
flagTelemetryHost = "telemetry-host"

0 commit comments

Comments
 (0)