Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: trust_threshold is not aligned for latest hermes #164

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix: trust_threshold is not aligned for latest hermes #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions hermes/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,8 @@ func GetCommands() []*plugin.Command {
{Name: flagChainBMaxBlockTime, DefaultValue: "30s", Usage: "maximum block time of the chain B", Type: plugin.FlagTypeString},
{Name: flagChainATrustingPeriod, DefaultValue: "14days", Usage: "trusting period of the chain A", Type: plugin.FlagTypeString},
{Name: flagChainBTrustingPeriod, DefaultValue: "14days", Usage: "trusting period of the chain B", Type: plugin.FlagTypeString},
{Name: flagChainATrustThresholdNumerator, DefaultValue: "2", Usage: "trusting threshold numerator of the chain A", Type: plugin.FlagTypeUint64},
{Name: flagChainBTrustThresholdNumerator, DefaultValue: "2", Usage: "trusting threshold numerator of the chain B", Type: plugin.FlagTypeUint64},
{Name: flagChainATrustThresholdDenominator, DefaultValue: "3", Usage: "trusting threshold denominator of the chain A", Type: plugin.FlagTypeUint64},
{Name: flagChainBTrustThresholdDenominator, DefaultValue: "3", Usage: "trusting threshold denominator of the chain B", Type: plugin.FlagTypeUint64},
{Name: flagChainATrustThreshold, DefaultValue: "2/3", Usage: "trust threshold of the chain A", Type: plugin.FlagTypeString},
{Name: flagChainBTrustThreshold, DefaultValue: "2/3", Usage: "trust threshold of the chain B", Type: plugin.FlagTypeString},
{Name: flagChainAMemoPrefix, Usage: "memo prefix of the chain A", Type: plugin.FlagTypeString},
{Name: flagChainBMemoPrefix, Usage: "memo prefix of the chain B", Type: plugin.FlagTypeString},
{Name: flagChainAFaucet, Usage: "faucet URL of the chain A", Type: plugin.FlagTypeString},
Expand Down
102 changes: 50 additions & 52 deletions hermes/cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,31 +450,30 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
chainARPCAddr = args[1]
chainAGRPCAddr = args[2]

chainAEventSourceMode, _ = flags.GetString(flagChainAEventSourceMode)
chainAEventSourceURL, _ = flags.GetString(flagChainAEventSourceURL)
chainAEventSourceBatchDelay, _ = flags.GetString(flagChainAEventSourceBatchDelay)
chainARPCTimeout, _ = flags.GetString(flagChainARPCTimeout)
chainAAccountPrefix, _ = flags.GetString(flagChainAAccountPrefix)
chainAAddressType, _ = flags.GetString(flagChainAAddressType)
chainAKeyName, _ = flags.GetString(flagChainAKeyName)
chainAKeyStoreType, _ = flags.GetString(flagChainAKeyStoreType)
chainAStorePrefix, _ = flags.GetString(flagChainAStorePrefix)
chainADefaultGas, _ = flags.GetUint64(flagChainADefaultGas)
chainAMaxGas, _ = flags.GetUint64(flagChainAMaxGas)
chainAGasPrice, _ = flags.GetString(flagChainAGasPrice)
chainAGasMultiplier, _ = flags.GetString(flagChainAGasMultiplier)
chainAMaxMsgNum, _ = flags.GetUint64(flagChainAMaxMsgNum)
chainAMaxTxSize, _ = flags.GetUint64(flagChainAMaxTxSize)
chainAClockDrift, _ = flags.GetString(flagChainAClockDrift)
chainAMaxBlockTime, _ = flags.GetString(flagChainAMaxBlockTime)
chainATrustingPeriod, _ = flags.GetString(flagChainATrustingPeriod)
chainATrustThresholdNumerator, _ = flags.GetUint64(flagChainATrustThresholdNumerator)
chainATrustThresholdDenominator, _ = flags.GetUint64(flagChainATrustThresholdDenominator)
chainACCVConsumerChain, _ = flags.GetBool(flagChainACCVConsumerChain)
chainATrustedNode, _ = flags.GetBool(flagChainATrustedNode)
chainAMemoPrefix, _ = flags.GetString(flagChainAMemoPrefix)
chainAType, _ = flags.GetString(flagChainAType)
chainASequentialBatchTx, _ = flags.GetBool(flagChainASequentialBatchTx)
chainAEventSourceMode, _ = flags.GetString(flagChainAEventSourceMode)
chainAEventSourceURL, _ = flags.GetString(flagChainAEventSourceURL)
chainAEventSourceBatchDelay, _ = flags.GetString(flagChainAEventSourceBatchDelay)
chainARPCTimeout, _ = flags.GetString(flagChainARPCTimeout)
chainAAccountPrefix, _ = flags.GetString(flagChainAAccountPrefix)
chainAAddressType, _ = flags.GetString(flagChainAAddressType)
chainAKeyName, _ = flags.GetString(flagChainAKeyName)
chainAKeyStoreType, _ = flags.GetString(flagChainAKeyStoreType)
chainAStorePrefix, _ = flags.GetString(flagChainAStorePrefix)
chainADefaultGas, _ = flags.GetUint64(flagChainADefaultGas)
chainAMaxGas, _ = flags.GetUint64(flagChainAMaxGas)
chainAGasPrice, _ = flags.GetString(flagChainAGasPrice)
chainAGasMultiplier, _ = flags.GetString(flagChainAGasMultiplier)
chainAMaxMsgNum, _ = flags.GetUint64(flagChainAMaxMsgNum)
chainAMaxTxSize, _ = flags.GetUint64(flagChainAMaxTxSize)
chainAClockDrift, _ = flags.GetString(flagChainAClockDrift)
chainAMaxBlockTime, _ = flags.GetString(flagChainAMaxBlockTime)
chainATrustingPeriod, _ = flags.GetString(flagChainATrustingPeriod)
chainATrustThreshold, _ = flags.GetString(flagChainATrustThreshold)
chainACCVConsumerChain, _ = flags.GetBool(flagChainACCVConsumerChain)
chainATrustedNode, _ = flags.GetBool(flagChainATrustedNode)
chainAMemoPrefix, _ = flags.GetString(flagChainAMemoPrefix)
chainAType, _ = flags.GetString(flagChainAType)
chainASequentialBatchTx, _ = flags.GetBool(flagChainASequentialBatchTx)
)

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

optChainA := []hermes.ChainOption{
hermes.WithChainTrustThreshold(chainATrustThresholdNumerator, chainATrustThresholdDenominator),
hermes.WithChainTrustThreshold(chainATrustThreshold),
hermes.WithChainGasMultiplier(chainAGasMulti),
hermes.WithChainCCVConsumerChain(chainACCVConsumerChain),
hermes.WithChainTrustedNode(chainATrustedNode),
Expand Down Expand Up @@ -561,31 +560,30 @@ func newHermesConfig(flags plugin.Flags, args []string, customCfg string) (*herm
chainBRPCAddr = args[4]
chainBGRPCAddr = args[5]

chainBEventSourceMode, _ = flags.GetString(flagChainBEventSourceMode)
chainBEventSourceURL, _ = flags.GetString(flagChainBEventSourceURL)
chainBEventSourceBatchDelay, _ = flags.GetString(flagChainBEventSourceBatchDelay)
chainBRPCTimeout, _ = flags.GetString(flagChainBRPCTimeout)
chainBAccountPrefix, _ = flags.GetString(flagChainBAccountPrefix)
chainBAddressType, _ = flags.GetString(flagChainBAddressType)
chainBKeyName, _ = flags.GetString(flagChainBKeyName)
chainBKeyStoreType, _ = flags.GetString(flagChainBKeyStoreType)
chainBStorePrefix, _ = flags.GetString(flagChainBStorePrefix)
chainBDefaultGas, _ = flags.GetUint64(flagChainBDefaultGas)
chainBMaxGas, _ = flags.GetUint64(flagChainBMaxGas)
chainBGasPrice, _ = flags.GetString(flagChainBGasPrice)
chainBGasMultiplier, _ = flags.GetString(flagChainBGasMultiplier)
chainBMaxMsgNum, _ = flags.GetUint64(flagChainBMaxMsgNum)
chainBMaxTxSize, _ = flags.GetUint64(flagChainBMaxTxSize)
chainBClockDrift, _ = flags.GetString(flagChainBClockDrift)
chainBMaxBlockTime, _ = flags.GetString(flagChainBMaxBlockTime)
chainBTrustingPeriod, _ = flags.GetString(flagChainBTrustingPeriod)
chainBTrustThresholdNumerator, _ = flags.GetUint64(flagChainBTrustThresholdNumerator)
chainBTrustThresholdDenominator, _ = flags.GetUint64(flagChainBTrustThresholdDenominator)
chainBCCVConsumerChain, _ = flags.GetBool(flagChainBCCVConsumerChain)
chainBTrustedNode, _ = flags.GetBool(flagChainBTrustedNode)
chainBMemoPrefix, _ = flags.GetString(flagChainBMemoPrefix)
chainBType, _ = flags.GetString(flagChainBType)
chainBSequentialBatchTx, _ = flags.GetBool(flagChainBSequentialBatchTx)
chainBEventSourceMode, _ = flags.GetString(flagChainBEventSourceMode)
chainBEventSourceURL, _ = flags.GetString(flagChainBEventSourceURL)
chainBEventSourceBatchDelay, _ = flags.GetString(flagChainBEventSourceBatchDelay)
chainBRPCTimeout, _ = flags.GetString(flagChainBRPCTimeout)
chainBAccountPrefix, _ = flags.GetString(flagChainBAccountPrefix)
chainBAddressType, _ = flags.GetString(flagChainBAddressType)
chainBKeyName, _ = flags.GetString(flagChainBKeyName)
chainBKeyStoreType, _ = flags.GetString(flagChainBKeyStoreType)
chainBStorePrefix, _ = flags.GetString(flagChainBStorePrefix)
chainBDefaultGas, _ = flags.GetUint64(flagChainBDefaultGas)
chainBMaxGas, _ = flags.GetUint64(flagChainBMaxGas)
chainBGasPrice, _ = flags.GetString(flagChainBGasPrice)
chainBGasMultiplier, _ = flags.GetString(flagChainBGasMultiplier)
chainBMaxMsgNum, _ = flags.GetUint64(flagChainBMaxMsgNum)
chainBMaxTxSize, _ = flags.GetUint64(flagChainBMaxTxSize)
chainBClockDrift, _ = flags.GetString(flagChainBClockDrift)
chainBMaxBlockTime, _ = flags.GetString(flagChainBMaxBlockTime)
chainBTrustingPeriod, _ = flags.GetString(flagChainBTrustingPeriod)
chainBTrustThreshold, _ = flags.GetString(flagChainBTrustThreshold)
chainBCCVConsumerChain, _ = flags.GetBool(flagChainBCCVConsumerChain)
chainBTrustedNode, _ = flags.GetBool(flagChainBTrustedNode)
chainBMemoPrefix, _ = flags.GetString(flagChainBMemoPrefix)
chainBType, _ = flags.GetString(flagChainBType)
chainBSequentialBatchTx, _ = flags.GetBool(flagChainBSequentialBatchTx)
)

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

optChainB := []hermes.ChainOption{
hermes.WithChainTrustThreshold(chainBTrustThresholdNumerator, chainBTrustThresholdDenominator),
hermes.WithChainTrustThreshold(chainBTrustThreshold),
hermes.WithChainGasMultiplier(chainBGasMulti),
hermes.WithChainCCVConsumerChain(chainBCCVConsumerChain),
hermes.WithChainTrustedNode(chainBTrustedNode),
Expand Down
106 changes: 52 additions & 54 deletions hermes/cmd/flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,59 @@ import (
)

const (
flagChainAPortID = "chain-a-port-id"
flagChainAEventSourceMode = "chain-a-event-source-mode"
flagChainAEventSourceURL = "chain-a-event-source-url"
flagChainAEventSourceBatchDelay = "chain-a-event-source-batch-delay"
flagChainARPCTimeout = "chain-a-rpc-timeout"
flagChainAAccountPrefix = "chain-a-account-prefix"
flagChainAAddressType = "chain-a-address-types"
flagChainAKeyName = "chain-a-key-name"
flagChainAKeyStoreType = "chain-a-key-store-type"
flagChainAStorePrefix = "chain-a-store-prefix"
flagChainADefaultGas = "chain-a-default-gas"
flagChainAMaxGas = "chain-a-max-gas"
flagChainAGasPrice = "chain-a-gas-price"
flagChainAGasMultiplier = "chain-a-gas-multiplier"
flagChainAMaxMsgNum = "chain-a-max-msg-num"
flagChainAMaxTxSize = "chain-a-tx-size"
flagChainAClockDrift = "chain-a-clock-drift"
flagChainAMaxBlockTime = "chain-a-max-block-time"
flagChainATrustingPeriod = "chain-a-trusting-period"
flagChainATrustThresholdNumerator = "chain-a-trust-threshold-numerator"
flagChainATrustThresholdDenominator = "chain-a-trust-threshold-denominator"
flagChainAFaucet = "chain-a-faucet"
flagChainACCVConsumerChain = "chain-a-ccv-consumer-chain"
flagChainATrustedNode = "chain-a-trusted-node"
flagChainAMemoPrefix = "chain-a-memo-prefix"
flagChainAType = "chain-a-type"
flagChainASequentialBatchTx = "chain-a-sequential-batch-tx"
flagChainAPortID = "chain-a-port-id"
flagChainAEventSourceMode = "chain-a-event-source-mode"
flagChainAEventSourceURL = "chain-a-event-source-url"
flagChainAEventSourceBatchDelay = "chain-a-event-source-batch-delay"
flagChainARPCTimeout = "chain-a-rpc-timeout"
flagChainAAccountPrefix = "chain-a-account-prefix"
flagChainAAddressType = "chain-a-address-types"
flagChainAKeyName = "chain-a-key-name"
flagChainAKeyStoreType = "chain-a-key-store-type"
flagChainAStorePrefix = "chain-a-store-prefix"
flagChainADefaultGas = "chain-a-default-gas"
flagChainAMaxGas = "chain-a-max-gas"
flagChainAGasPrice = "chain-a-gas-price"
flagChainAGasMultiplier = "chain-a-gas-multiplier"
flagChainAMaxMsgNum = "chain-a-max-msg-num"
flagChainAMaxTxSize = "chain-a-tx-size"
flagChainAClockDrift = "chain-a-clock-drift"
flagChainAMaxBlockTime = "chain-a-max-block-time"
flagChainATrustingPeriod = "chain-a-trusting-period"
flagChainATrustThreshold = "chain-a-trust-threshold"
flagChainAFaucet = "chain-a-faucet"
flagChainACCVConsumerChain = "chain-a-ccv-consumer-chain"
flagChainATrustedNode = "chain-a-trusted-node"
flagChainAMemoPrefix = "chain-a-memo-prefix"
flagChainAType = "chain-a-type"
flagChainASequentialBatchTx = "chain-a-sequential-batch-tx"

flagChainBPortID = "chain-b-port-id"
flagChainBEventSourceMode = "chain-b-event-source-mode"
flagChainBEventSourceURL = "chain-b-event-source-url"
flagChainBEventSourceBatchDelay = "chain-b-event-source-batch-delay"
flagChainBRPCTimeout = "chain-b-rpc-timeout"
flagChainBAccountPrefix = "chain-b-account-prefix"
flagChainBAddressType = "chain-b-address-types"
flagChainBKeyName = "chain-b-key-name"
flagChainBKeyStoreType = "chain-b-key-store-type"
flagChainBStorePrefix = "chain-b-store-prefix"
flagChainBDefaultGas = "chain-b-default-gas"
flagChainBMaxGas = "chain-b-max-gas"
flagChainBGasPrice = "chain-b-gas-price"
flagChainBGasMultiplier = "chain-b-gas-multiplier"
flagChainBMaxMsgNum = "chain-b-max-msg-num"
flagChainBMaxTxSize = "chain-b-tx-size"
flagChainBClockDrift = "chain-b-clock-drift"
flagChainBMaxBlockTime = "chain-b-max-block-time"
flagChainBTrustingPeriod = "chain-b-trusting-period"
flagChainBTrustThresholdNumerator = "chain-b-trust-threshold-numerator"
flagChainBTrustThresholdDenominator = "chain-b-trust-threshold-denominator"
flagChainBFaucet = "chain-b-faucet"
flagChainBCCVConsumerChain = "chain-b-ccv-consumer-chain"
flagChainBTrustedNode = "chain-b-trusted-node"
flagChainBMemoPrefix = "chain-b-memo-prefix"
flagChainBType = "chain-b-type"
flagChainBSequentialBatchTx = "chain-b-sequential-batch-tx"
flagChainBPortID = "chain-b-port-id"
flagChainBEventSourceMode = "chain-b-event-source-mode"
flagChainBEventSourceURL = "chain-b-event-source-url"
flagChainBEventSourceBatchDelay = "chain-b-event-source-batch-delay"
flagChainBRPCTimeout = "chain-b-rpc-timeout"
flagChainBAccountPrefix = "chain-b-account-prefix"
flagChainBAddressType = "chain-b-address-types"
flagChainBKeyName = "chain-b-key-name"
flagChainBKeyStoreType = "chain-b-key-store-type"
flagChainBStorePrefix = "chain-b-store-prefix"
flagChainBDefaultGas = "chain-b-default-gas"
flagChainBMaxGas = "chain-b-max-gas"
flagChainBGasPrice = "chain-b-gas-price"
flagChainBGasMultiplier = "chain-b-gas-multiplier"
flagChainBMaxMsgNum = "chain-b-max-msg-num"
flagChainBMaxTxSize = "chain-b-tx-size"
flagChainBClockDrift = "chain-b-clock-drift"
flagChainBMaxBlockTime = "chain-b-max-block-time"
flagChainBTrustingPeriod = "chain-b-trusting-period"
flagChainBTrustThreshold = "chain-b-trust-threshold"
flagChainBFaucet = "chain-b-faucet"
flagChainBCCVConsumerChain = "chain-b-ccv-consumer-chain"
flagChainBTrustedNode = "chain-b-trusted-node"
flagChainBMemoPrefix = "chain-b-memo-prefix"
flagChainBType = "chain-b-type"
flagChainBSequentialBatchTx = "chain-b-sequential-batch-tx"

flagTelemetryEnabled = "telemetry-enabled"
flagTelemetryHost = "telemetry-host"
Expand Down
Loading
Loading