Skip to content

Commit 7c6bfc0

Browse files
committed
Update tee proto
1 parent bc68fc9 commit 7c6bfc0

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ update-capabilities:
6969

7070
# Override if you wish to test against a branch.
7171
# Alternatively, you can override the directory in chainlink-common to point to this repository
72-
COMMON_VERSION ?= b8745afcfc871d3c3e311b37bf085fe07d057153
72+
COMMON_VERSION ?= e01fae1cf266c005b65ffabd0e112e2c2e969a71
7373
MODULE := github.com/smartcontractkit/chainlink-common
7474

7575
# Override on Windows if you aren't using a Unix-like shell:

cre/execution_handler.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"github.com/smartcontractkit/chainlink-protos/cre/go/sdk"
55
"google.golang.org/protobuf/proto"
66
"google.golang.org/protobuf/types/known/anypb"
7-
"google.golang.org/protobuf/types/known/emptypb"
87
)
98

109
// ExecutionHandler defines a coupling of a Trigger and a callback function to be used by the SDK.
@@ -45,13 +44,13 @@ func teeRequirements[A AcceptedTees](tees A) *sdk.Requirements {
4544
reqs := &sdk.Requirements{Tee: &sdk.Tee{}}
4645
switch typedTees := any(tees).(type) {
4746
case []TeeAndRegions:
48-
typeRegions := make([]*sdk.TeeTypeAndRegions, len(typedTees))
47+
typesRegions := make([]*sdk.TeeTypeAndRegions, len(typedTees))
4948
for i, tee := range typedTees {
50-
typeRegions[i] = &sdk.TeeTypeAndRegions{Type: tee.Type, Regions: tee.Regions}
49+
typesRegions[i] = &sdk.TeeTypeAndRegions{Type: tee.Type, Regions: tee.Regions}
5150
}
52-
reqs.Tee.Type = &sdk.Tee_TypeSelection{TypeSelection: &sdk.TeeTypeSelection{Types: typeRegions}}
53-
case AnyTee:
54-
reqs.Tee.Type = &sdk.Tee_Any{Any: &emptypb.Empty{}}
51+
reqs.Tee.Item = &sdk.Tee_TeeTypesAndRegions{TeeTypesAndRegions: &sdk.TeeTypesAndRegions{TeeTypeAndRegions: typesRegions}}
52+
case Regions:
53+
reqs.Tee.Item = &sdk.Tee_AnyRegions{AnyRegions: &sdk.Regions{Regions: typedTees}}
5554
}
5655
return reqs
5756
}

cre/runner.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ type TeeAndRegions struct {
2828
Regions []string
2929
}
3030

31+
type Regions []string
32+
3133
const TeeType_TEE_TYPE_AWS_NITRO = sdk.TeeType_TEE_TYPE_AWS_NITRO
3234

3335
type AcceptedTees interface {
34-
[]TeeAndRegions | AnyTee
36+
[]TeeAndRegions | Regions
3537
}

cre/wasm/runner_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func TestHandlerInTee(t *testing.T) {
180180
subs := result.TriggerSubscriptions.Subscriptions
181181
require.Len(t, subs, 1)
182182
expected := &sdk.Requirements{
183-
Tee: &sdk.Tee{Type: &sdk.Tee_TypeSelection{TypeSelection: &sdk.TeeTypeSelection{Types: []*sdk.TeeTypeAndRegions{{Type: sdk.TeeType_TEE_TYPE_AWS_NITRO, Regions: []string{"us-west-2"}}}}}},
183+
Tee: &sdk.Tee{Item: &sdk.Tee_TeeTypesAndRegions{TeeTypesAndRegions: &sdk.TeeTypesAndRegions{TeeTypeAndRegions: []*sdk.TeeTypeAndRegions{{Type: sdk.TeeType_TEE_TYPE_AWS_NITRO, Regions: []string{"us-west-2"}}}}}},
184184
}
185185
assert.True(t, proto.Equal(expected, subs[0].Requirements))
186186
default:
@@ -199,7 +199,7 @@ func TestHandlerInTee(t *testing.T) {
199199
func(_ string, _ cre.TeeRuntime, _ *basictrigger.Outputs) (string, error) {
200200
return "tee-result", nil
201201
},
202-
cre.AnyTee{},
202+
cre.Regions{"us-west-2"},
203203
),
204204
}, nil
205205
})
@@ -211,7 +211,7 @@ func TestHandlerInTee(t *testing.T) {
211211
subs := result.TriggerSubscriptions.Subscriptions
212212
require.Len(t, subs, 1)
213213
expected := &sdk.Requirements{
214-
Tee: &sdk.Tee{Type: &sdk.Tee_Any{Any: &emptypb.Empty{}}},
214+
Tee: &sdk.Tee{Item: &sdk.Tee_AnyRegions{AnyRegions: &sdk.Regions{Regions: []string{"us-west-2"}}}},
215215
}
216216
assert.True(t, proto.Equal(expected, subs[0].Requirements))
217217
default:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.25.3
55
require (
66
github.com/ethereum/go-ethereum v1.17.2
77
github.com/shopspring/decimal v1.4.0
8-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260427170224-3b3204904066
8+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260501160256-5806971948f2
99
github.com/stretchr/testify v1.11.1
1010
google.golang.org/protobuf v1.36.11
1111
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
2727
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
2828
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
2929
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
30-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260427170224-3b3204904066 h1:XgmfrVnD6Z2yf6f+4qcGZlqvdJlffRippMmvqE8Yl3c=
31-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260427170224-3b3204904066/go.mod h1:Jqt53s27Tr0jDl8mdBXg1xhu6F8Fci8JOuq43tgHOM8=
30+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260501160256-5806971948f2 h1:RKmSjhsAHuN4A62fJn/wGj/dXCBfrRTojo5ZQZfL/y8=
31+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260501160256-5806971948f2/go.mod h1:Jqt53s27Tr0jDl8mdBXg1xhu6F8Fci8JOuq43tgHOM8=
3232
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
3333
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
3434
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=

0 commit comments

Comments
 (0)