Skip to content

Commit d891e4a

Browse files
authored
make NetworkFeeUSDCents u16 (#1590)
1 parent 6c59a91 commit d891e4a

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

chains/evm/deployment/v1_6_0/sequences/update_lanes.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import (
77
"github.com/Masterminds/semver/v3"
88
"github.com/ethereum/go-ethereum/common"
99

10+
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
11+
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
12+
1013
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router"
1114
fqops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/fee_quoter"
1215
offrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/offramp"
1316
onrampops "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/onramp"
1417
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1518
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
16-
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
17-
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
1819
)
1920

2021
var ConfigureLaneLegAsSource = operations.NewSequence(
@@ -180,7 +181,7 @@ func TranslateFQ(fqc lanes.FeeQuoterDestChainConfig) fqops.DestChainConfig {
180181
DefaultTxGasLimit: fqc.DefaultTxGasLimit,
181182
GasMultiplierWeiPerEth: fqc.GasMultiplierWeiPerEth,
182183
GasPriceStalenessThreshold: fqc.GasPriceStalenessThreshold,
183-
NetworkFeeUSDCents: fqc.NetworkFeeUSDCents,
184+
NetworkFeeUSDCents: uint32(fqc.NetworkFeeUSDCents),
184185
}
185186
}
186187

chains/solana/deployment/v1_6_0/sequences/connect_chains.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ import (
66

77
"github.com/Masterminds/semver/v3"
88
"github.com/gagliardetto/solana-go"
9+
10+
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
11+
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
12+
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
13+
914
fqops "github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment/v1_6_0/operations/fee_quoter"
1015
offrampops "github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment/v1_6_0/operations/offramp"
1116
routerops "github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment/v1_6_0/operations/router"
1217
"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/v0_1_1/fee_quoter"
1318
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1419
ccipapi "github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1520
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
16-
cldf_chain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
17-
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
18-
cldf_ops "github.com/smartcontractkit/chainlink-deployments-framework/operations"
1921
)
2022

2123
var ConfigureLaneLegAsSource = operations.NewSequence(
@@ -86,10 +88,10 @@ var ConfigureLaneLegAsDest = operations.NewSequence(
8688

8789
// Add DestChain to OffRamp
8890
offRampOut, err := operations.ExecuteOperation(b, offrampops.ConnectChains, chains.SolanaChains()[input.Dest.Selector], offrampops.ConnectChainsParams{
89-
RemoteChainSelector: input.Source.Selector,
90-
OffRamp: offRampAddress,
91-
SourceOnRamp: input.Source.OnRamp,
92-
EnabledAsSource: !input.IsDisabled,
91+
RemoteChainSelector: input.Source.Selector,
92+
OffRamp: offRampAddress,
93+
SourceOnRamp: input.Source.OnRamp,
94+
EnabledAsSource: !input.IsDisabled,
9395
IsRMNVerificationDisabled: !input.Source.RMNVerificationEnabled,
9496
})
9597
if err != nil {
@@ -131,7 +133,7 @@ func TranslateFQ(fqc lanes.FeeQuoterDestChainConfig) fee_quoter.DestChainConfig
131133
DefaultTxGasLimit: fqc.DefaultTxGasLimit,
132134
GasMultiplierWeiPerEth: fqc.GasMultiplierWeiPerEth,
133135
GasPriceStalenessThreshold: fqc.GasPriceStalenessThreshold,
134-
NetworkFeeUsdcents: fqc.NetworkFeeUSDCents,
136+
NetworkFeeUsdcents: uint32(fqc.NetworkFeeUSDCents),
135137
}
136138
}
137139

deployment/lanes/lane_update.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/Masterminds/semver/v3"
88
chain_selectors "github.com/smartcontractkit/chain-selectors"
9+
910
"github.com/smartcontractkit/chainlink-ccip/deployment/utils"
1011
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
1112
)
@@ -65,7 +66,7 @@ type FeeQuoterDestChainConfig struct {
6566
DefaultTxGasLimit uint32
6667
GasMultiplierWeiPerEth uint64
6768
GasPriceStalenessThreshold uint32
68-
NetworkFeeUSDCents uint32
69+
NetworkFeeUSDCents uint16
6970
}
7071

7172
type ConnectChainsConfig struct {

0 commit comments

Comments
 (0)