Skip to content

Commit db75bad

Browse files
ecPabloecPablo
authored
chore: swap contract_state.go usages with cld-changesets (#22282)
* chore: swap contract_state.go usages with cld-changesets * fix: lint errors
1 parent f502927 commit db75bad

25 files changed

Lines changed: 100 additions & 113 deletions

‎deployment/ccip/view/v1_0/rmn_proxy_contract.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@ import (
66

77
"github.com/ethereum/go-ethereum/common"
88

9+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
10+
911
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_0_0/rmn_proxy_contract"
10-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
1112
)
1213

1314
type RMNProxyView struct {
14-
types.ContractMetaData
15+
commoncldchangesets.ContractMetaData
1516
RMN common.Address `json:"rmn"`
1617
}
1718

1819
func GenerateRMNProxyView(r *rmn_proxy_contract.RMNProxy) (RMNProxyView, error) {
1920
if r == nil {
2021
return RMNProxyView{}, errors.New("cannot generate view for nil RMNProxy")
2122
}
22-
meta, err := types.NewContractMetaData(r, r.Address())
23+
meta, err := commoncldchangesets.NewContractMetaData(r, r.Address())
2324
if err != nil {
2425
return RMNProxyView{}, fmt.Errorf("failed to generate contract metadata for RMNProxy: %w", err)
2526
}

‎deployment/ccip/view/v1_2/price_registry.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66

77
"github.com/ethereum/go-ethereum/common"
88

9+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
10+
911
price_registry_1_2_0 "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/price_registry"
10-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
1112
)
1213

1314
type PriceRegistryView struct {
14-
types.ContractMetaData
15+
commoncldchangesets.ContractMetaData
1516
FeeTokens []common.Address `json:"feeTokens"`
1617
StalenessThreshold string `json:"stalenessThreshold"`
1718
Updaters []common.Address `json:"updaters"`
@@ -21,7 +22,7 @@ func GeneratePriceRegistryView(pr *price_registry_1_2_0.PriceRegistry) (PriceReg
2122
if pr == nil {
2223
return PriceRegistryView{}, errors.New("cannot generate view for nil PriceRegistry")
2324
}
24-
meta, err := types.NewContractMetaData(pr, pr.Address())
25+
meta, err := commoncldchangesets.NewContractMetaData(pr, pr.Address())
2526
if err != nil {
2627
return PriceRegistryView{}, fmt.Errorf("failed to generate contract metadata for PriceRegistry %s: %w", pr.Address(), err)
2728
}

‎deployment/ccip/view/v1_2/router.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import (
55

66
"github.com/ethereum/go-ethereum/common"
77

8+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
9+
810
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/router"
9-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
1011
)
1112

1213
type RouterView struct {
13-
types.ContractMetaData
14+
commoncldchangesets.ContractMetaData
1415
IsTestRouter bool `json:"isTestRouter"`
1516
WrappedNative common.Address `json:"wrappedNative,omitempty"`
1617
ARMProxy common.Address `json:"armProxy,omitempty"`
@@ -19,7 +20,7 @@ type RouterView struct {
1920
}
2021

2122
func GenerateRouterView(r *router.Router, isTestRouter bool) (RouterView, error) {
22-
meta, err := types.NewContractMetaData(r, r.Address())
23+
meta, err := commoncldchangesets.NewContractMetaData(r, r.Address())
2324
if err != nil {
2425
return RouterView{}, fmt.Errorf("view error to get router metadata: %w", err)
2526
}

‎deployment/ccip/view/v1_5/commit_store.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package v1_5
33
import (
44
"github.com/ethereum/go-ethereum/common"
55

6+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
7+
68
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/commit_store"
7-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
89
)
910

1011
type CommitStoreView struct {
11-
types.ContractMetaData
12+
commoncldchangesets.ContractMetaData
1213
DynamicConfig commit_store.CommitStoreDynamicConfig `json:"dynamicConfig"`
1314
ExpectedNextSequenceNumber uint64 `json:"expectedNextSequenceNumber"`
1415
LatestPriceEpochAndRound uint64 `json:"latestPriceEpochAndRound"`

‎deployment/ccip/view/v1_5/offramp.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import (
44
"errors"
55
"fmt"
66

7+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
8+
79
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/evm_2_evm_offramp"
8-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
910
)
1011

1112
type OffRampView struct {
12-
types.ContractMetaData
13+
commoncldchangesets.ContractMetaData
1314
StaticConfig evm_2_evm_offramp.EVM2EVMOffRampStaticConfig `json:"staticConfig"`
1415
DynamicConfig evm_2_evm_offramp.EVM2EVMOffRampDynamicConfig `json:"dynamicConfig"`
1516
}
@@ -18,7 +19,7 @@ func GenerateOffRampView(r *evm_2_evm_offramp.EVM2EVMOffRamp) (OffRampView, erro
1819
if r == nil {
1920
return OffRampView{}, errors.New("cannot generate view for nil OffRamp")
2021
}
21-
meta, err := types.NewContractMetaData(r, r.Address())
22+
meta, err := commoncldchangesets.NewContractMetaData(r, r.Address())
2223
if err != nil {
2324
return OffRampView{}, fmt.Errorf("failed to generate contract metadata for OffRamp %s: %w", r.Address(), err)
2425
}

‎deployment/ccip/view/v1_5/onramp.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import (
44
"errors"
55
"fmt"
66

7+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
8+
79
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/evm_2_evm_onramp"
8-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
910
)
1011

1112
type OnRampView struct {
12-
types.ContractMetaData
13+
commoncldchangesets.ContractMetaData
1314
StaticConfig evm_2_evm_onramp.EVM2EVMOnRampStaticConfig `json:"staticConfig"`
1415
DynamicConfig evm_2_evm_onramp.EVM2EVMOnRampDynamicConfig `json:"dynamicConfig"`
1516
}
@@ -18,7 +19,7 @@ func GenerateOnRampView(r *evm_2_evm_onramp.EVM2EVMOnRamp) (OnRampView, error) {
1819
if r == nil {
1920
return OnRampView{}, errors.New("cannot generate view for nil OnRamp")
2021
}
21-
meta, err := types.NewContractMetaData(r, r.Address())
22+
meta, err := commoncldchangesets.NewContractMetaData(r, r.Address())
2223
if err != nil {
2324
return OnRampView{}, fmt.Errorf("failed to generate contract metadata for OnRamp %s: %w", r.Address(), err)
2425
}

‎deployment/ccip/view/v1_5/rmn.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ import (
44
"errors"
55
"fmt"
66

7+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
8+
79
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/rmn_contract"
8-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
910
)
1011

1112
type RMNView struct {
12-
types.ContractMetaData
13+
commoncldchangesets.ContractMetaData
1314
ConfigDetails rmn_contract.GetConfigDetails `json:"configDetails"`
1415
}
1516

1617
func GenerateRMNView(r *rmn_contract.RMNContract) (RMNView, error) {
1718
if r == nil {
1819
return RMNView{}, errors.New("cannot generate view for nil RMN")
1920
}
20-
meta, err := types.NewContractMetaData(r, r.Address())
21+
meta, err := commoncldchangesets.NewContractMetaData(r, r.Address())
2122
if err != nil {
2223
return RMNView{}, fmt.Errorf("failed to generate contract metadata for RMN: %w", err)
2324
}

‎deployment/ccip/view/v1_5/token_pool.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66
"github.com/ethereum/go-ethereum/accounts/abi/bind"
77
"github.com/ethereum/go-ethereum/common"
88

9+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
10+
911
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/burn_mint_token_pool_and_proxy"
1012
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/token_pool"
1113

1214
"github.com/smartcontractkit/chainlink/deployment/ccip/view/shared"
1315
v1_5_1 "github.com/smartcontractkit/chainlink/deployment/ccip/view/v1_5_1"
14-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
1516
)
1617

1718
type TokenPoolContract interface {
@@ -108,7 +109,7 @@ func GenerateTokenPoolView(pool TokenPoolContract, priceFeed common.Address) (v1
108109
}
109110

110111
return v1_5_1.TokenPoolView{
111-
ContractMetaData: types.ContractMetaData{
112+
ContractMetaData: commoncldchangesets.ContractMetaData{
112113
TypeAndVersion: typeAndVersion,
113114
Address: pool.Address(),
114115
Owner: owner,

‎deployment/ccip/view/v1_5/tokenadminregistry.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"golang.org/x/sync/errgroup"
1010

1111
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_0/token_admin_registry"
12+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
1213

1314
"github.com/smartcontractkit/chainlink/deployment/ccip/view/shared"
14-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
1515
)
1616

1717
type TokenAdminRegistryView struct {
18-
types.ContractMetaData
18+
commoncldchangesets.ContractMetaData
1919
Tokens map[common.Address]TokenDetails `json:"tokens"`
2020
}
2121

@@ -33,7 +33,7 @@ func GenerateTokenAdminRegistryView(taContract *token_admin_registry.TokenAdminR
3333
if err != nil {
3434
return TokenAdminRegistryView{}, fmt.Errorf("view error for token admin registry: %w", err)
3535
}
36-
tvMeta, err := types.NewContractMetaData(taContract, taContract.Address())
36+
tvMeta, err := commoncldchangesets.NewContractMetaData(taContract, taContract.Address())
3737
if err != nil {
3838
return TokenAdminRegistryView{}, fmt.Errorf("metadata error for token admin registry: %w", err)
3939
}

‎deployment/ccip/view/v1_5_1/token_pool.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"github.com/ethereum/go-ethereum/common"
88
"golang.org/x/exp/maps"
99

10+
commoncldchangesets "github.com/smartcontractkit/cld-changesets/pkg/common"
11+
1012
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/burn_from_mint_token_pool"
1113
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/burn_mint_token_pool"
1214
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_5_1/burn_with_from_mint_token_pool"
@@ -17,7 +19,6 @@ import (
1719
lock_release_token_pool_v1_6_1 "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_1/lock_release_token_pool"
1820

1921
"github.com/smartcontractkit/chainlink/deployment/ccip/view/shared"
20-
"github.com/smartcontractkit/chainlink/deployment/common/view/types"
2122
)
2223

2324
type TokenPoolContract interface {
@@ -106,7 +107,7 @@ type PoolView struct {
106107
}
107108

108109
type TokenPoolView struct {
109-
types.ContractMetaData
110+
commoncldchangesets.ContractMetaData
110111
Token common.Address `json:"token"`
111112
TokenPriceFeed common.Address `json:"tokenPriceFeed"`
112113
RemoteChainConfigs map[uint64]RemoteChainConfig `json:"remoteChainConfigs"`
@@ -190,7 +191,7 @@ func GenerateTokenPoolView(pool TokenPoolContract, priceFeed common.Address) (To
190191
}
191192

192193
return TokenPoolView{
193-
ContractMetaData: types.ContractMetaData{
194+
ContractMetaData: commoncldchangesets.ContractMetaData{
194195
TypeAndVersion: typeAndVersion,
195196
Address: pool.Address(),
196197
Owner: owner,

0 commit comments

Comments
 (0)