Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chains/evm/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ extract-bytecode-abi: ## Extract bytecode and abi from versioned gobindings to b

.PHONY: operations
operations: pnpmdep
#./scripts/compile_all
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have been on, turning it off makes it quicker but could lead to wrong ops being generated

./scripts/compile_all
go run cmd/operations-gen/main.go -config deployment/operations_gen_config.yaml
11 changes: 9 additions & 2 deletions chains/evm/cmd/operations-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ type TemplateData struct {
NoDeployment bool
Constructor *ConstructorData
StructDefs []StructDefData
WriteArgStructs []ArgStructData
ArgStructs []ArgStructData
Operations []OperationData
ContractMethods []ContractMethodData
}
Expand Down Expand Up @@ -618,7 +618,7 @@ func prepareTemplateData(info *ContractInfo) TemplateData {
AccessControl: writeOp.AccessControl,
})
if len(funcInfo.Parameters) > 1 {
data.WriteArgStructs = append(data.WriteArgStructs, ArgStructData{
data.ArgStructs = append(data.ArgStructs, ArgStructData{
Name: funcInfo.Name + "Args",
Fields: prepareParameters(funcInfo.Parameters),
})
Expand All @@ -634,6 +634,13 @@ func prepareTemplateData(info *ContractInfo) TemplateData {
IsWrite: false,
ReturnType: readOp.ReturnType,
})
// Generate Args struct for read operations with multiple parameters
if len(funcInfo.Parameters) > 1 {
data.ArgStructs = append(data.ArgStructs, ArgStructData{
Name: funcInfo.Name + "Args",
Fields: prepareParameters(funcInfo.Parameters),
})
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion chains/evm/cmd/operations-gen/operations.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ type {{.Name}} struct {
{{- end}}
}
{{- end}}
{{range .WriteArgStructs}}
{{range .ArgStructs}}

type {{.Name}} struct {
{{- range .Fields}}
Expand Down
44 changes: 44 additions & 0 deletions chains/evm/deployment/operations_gen_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,34 @@ contracts:
access: owner
- name: setChainRateLimiterConfig
access: owner
- name: getToken
access: public
- name: isSupportedToken
access: public
- name: getAllowListEnabled
access: public
- name: getAllowList
access: public
- name: applyAllowListUpdates
access: owner
- name: getRouter
access: public
- name: setRouter
access: owner
- name: getSupportedChains
access: public
- name: getRemoteToken
access: public
- name: getRemotePools
access: public
- name: addRemotePool
access: owner
- name: removeRemotePool
access: owner
- name: getCurrentInboundRateLimiterState
access: public
- name: getCurrentOutboundRateLimiterState
access: public

- contract_name: BurnMintTokenPool
version: "1.6.1"
Expand Down Expand Up @@ -101,12 +129,22 @@ contracts:
access: owner
- name: applyTokenTransferFeeConfigUpdates
access: owner
- name: getDestChainConfig
access: public
- name: getTokenTransferFeeConfig
access: public

- contract_name: OnRamp
version: "1.6.0"
functions:
- name: applyDestChainConfigUpdates
access: owner
- name: getDestChainConfig
access: public
- name: getStaticConfig
access: public
- name: getDynamicConfig
access: public

- contract_name: OffRamp
package_name: offramp
Expand All @@ -116,3 +154,9 @@ contracts:
access: owner
- name: setOCR3Configs
access: owner
- name: getStaticConfig
access: public
- name: getDynamicConfig
access: public
- name: getSourceChainConfig
access: public
56 changes: 38 additions & 18 deletions chains/evm/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 53 additions & 16 deletions chains/evm/deployment/v1_6_0/operations/offramp/offramp.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading