Skip to content

Commit 33dfa69

Browse files
silaslenihansilaslenihan
committed
Added df decoder injection to EVM WT
1 parent 0911121 commit 33dfa69

File tree

17 files changed

+306
-305
lines changed

17 files changed

+306
-305
lines changed

‎core/scripts/go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250408103656-875e982e6437
3838
github.com/smartcontractkit/chainlink-common v0.6.1-0.20250407100046-dfdf9600557b
3939
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250325191518-036bb568a69d
40-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250408161604-b6539361da24
40+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250410012411-577291fb3438
4141
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22
4242
github.com/smartcontractkit/libocr v0.0.0-20250408131511-c90716988ee0
4343
github.com/spf13/cobra v1.8.1
@@ -68,7 +68,7 @@ require (
6868
filippo.io/edwards25519 v1.1.0 // indirect
6969
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
7070
github.com/99designs/keyring v1.2.1 // indirect
71-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
71+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
7272
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
7373
github.com/BurntSushi/toml v1.4.0 // indirect
7474
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
@@ -275,8 +275,8 @@ require (
275275
github.com/lib/pq v1.10.9 // indirect
276276
github.com/linxGnu/grocksdb v1.9.3 // indirect
277277
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
278-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
279-
github.com/magiconair/properties v1.8.7 // indirect
278+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
279+
github.com/magiconair/properties v1.8.9 // indirect
280280
github.com/mailru/easyjson v0.9.0 // indirect
281281
github.com/marcboeker/go-duckdb v1.8.3 // indirect
282282
github.com/maruel/natural v1.1.1 // indirect
@@ -296,7 +296,7 @@ require (
296296
github.com/moby/sys/sequential v0.6.0 // indirect
297297
github.com/moby/sys/user v0.3.0 // indirect
298298
github.com/moby/sys/userns v0.1.0 // indirect
299-
github.com/moby/term v0.5.0 // indirect
299+
github.com/moby/term v0.5.2 // indirect
300300
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
301301
github.com/modern-go/reflect2 v1.0.2 // indirect
302302
github.com/morikuni/aec v1.0.0 // indirect
@@ -308,7 +308,7 @@ require (
308308
github.com/oklog/run v1.1.0 // indirect
309309
github.com/onsi/ginkgo/v2 v2.20.1 // indirect
310310
github.com/opencontainers/go-digest v1.0.0 // indirect
311-
github.com/opencontainers/image-spec v1.1.0 // indirect
311+
github.com/opencontainers/image-spec v1.1.1 // indirect
312312
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
313313
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
314314
github.com/pelletier/go-toml v1.9.5 // indirect
@@ -323,8 +323,8 @@ require (
323323
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
324324
github.com/pressly/goose/v3 v3.21.1 // indirect
325325
github.com/prometheus/client_model v0.6.1 // indirect
326-
github.com/prometheus/common v0.62.0 // indirect
327-
github.com/prometheus/procfs v0.15.1 // indirect
326+
github.com/prometheus/common v0.63.0 // indirect
327+
github.com/prometheus/procfs v0.16.0 // indirect
328328
github.com/prometheus/prometheus v0.302.0 // indirect
329329
github.com/rivo/uniseg v0.4.7 // indirect
330330
github.com/robfig/cron/v3 v3.0.1 // indirect
@@ -378,8 +378,8 @@ require (
378378
github.com/tidwall/match v1.1.1 // indirect
379379
github.com/tidwall/pretty v1.2.1 // indirect
380380
github.com/tidwall/sjson v1.2.5 // indirect
381-
github.com/tklauser/go-sysconf v0.3.13 // indirect
382-
github.com/tklauser/numcpus v0.7.0 // indirect
381+
github.com/tklauser/go-sysconf v0.3.15 // indirect
382+
github.com/tklauser/numcpus v0.10.0 // indirect
383383
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
384384
github.com/ugorji/go/codec v1.2.12 // indirect
385385
github.com/ulule/limiter/v3 v3.11.2 // indirect
@@ -401,7 +401,7 @@ require (
401401
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
402402
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.49.0 // indirect
403403
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
404-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
404+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
405405
go.opentelemetry.io/otel v1.35.0 // indirect
406406
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect
407407
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 // indirect
@@ -425,7 +425,7 @@ require (
425425
golang.org/x/arch v0.11.0 // indirect
426426
golang.org/x/crypto v0.36.0 // indirect
427427
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
428-
golang.org/x/mod v0.23.0 // indirect
428+
golang.org/x/mod v0.24.0 // indirect
429429
golang.org/x/net v0.38.0 // indirect
430430
golang.org/x/oauth2 v0.26.0 // indirect
431431
golang.org/x/sync v0.12.0 // indirect

‎core/scripts/go.sum‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
6767
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
6868
github.com/AlekSi/pointer v1.1.0 h1:SSDMPcXD9jSl8FPy9cRzoRaMJtm9g9ggGTxecRUbQoI=
6969
github.com/AlekSi/pointer v1.1.0/go.mod h1:y7BvfRI3wXPWKXEBhU71nbnIEEZX0QTSB2Bj48UJIZE=
70-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
71-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
70+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
71+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
7272
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
7373
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
7474
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -834,11 +834,12 @@ github.com/linxGnu/grocksdb v1.9.3 h1:s1cbPcOd0cU2SKXRG1nEqCOWYAELQjdqg3RVI2MH9i
834834
github.com/linxGnu/grocksdb v1.9.3/go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA=
835835
github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
836836
github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
837-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
838837
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
838+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
839+
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
839840
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
840-
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
841-
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
841+
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
842+
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
842843
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
843844
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
844845
github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f h1:tVvGiZQFjOXP+9YyGqSA6jE55x1XVxmoPYudncxrZ8U=
@@ -914,8 +915,8 @@ github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
914915
github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
915916
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
916917
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
917-
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
918-
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
918+
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
919+
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
919920
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
920921
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
921922
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -966,8 +967,8 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
966967
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
967968
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
968969
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
969-
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
970-
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
970+
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
971+
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
971972
github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
972973
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
973974
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -1034,13 +1035,13 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
10341035
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
10351036
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
10361037
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
1037-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
1038-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
1038+
github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
1039+
github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
10391040
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
10401041
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
10411042
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
1042-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
1043-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
1043+
github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
1044+
github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
10441045
github.com/prometheus/prometheus v0.302.0 h1:47EsaoBRroS2ekSyMSOPIjXwYnY/mxoFk0xt2dkFvfI=
10451046
github.com/prometheus/prometheus v0.302.0/go.mod h1:YcyCoTbUR/TM8rY3Aoeqr0AWTu/pu1Ehh+trpX3eRzg=
10461047
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
@@ -1130,8 +1131,8 @@ github.com/smartcontractkit/chainlink-common v0.6.1-0.20250407100046-dfdf9600557
11301131
github.com/smartcontractkit/chainlink-common v0.6.1-0.20250407100046-dfdf9600557b/go.mod h1:ASXpANdCfcKd+LF3Vhz37q4rmJ/XYQKEQ3La1k7idp0=
11311132
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250325191518-036bb568a69d h1:RQgBFCrgmB+pkh7yvIUgwVqP6GIl8WA7AIkV9tCONr8=
11321133
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250325191518-036bb568a69d/go.mod h1:lruVSCt+o5Lez400O0f+oNp+MOpN3/nI23Z4ah9qyBg=
1133-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250408161604-b6539361da24 h1:f8AYQ7C2dBQUz2IxvOmTaYHtit+5LWhRDvPz7kaDWJA=
1134-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250408161604-b6539361da24/go.mod h1:koxdz4CxSOqPkProhYwHi1cQwuj2bMtWd/2xZLX1Ou4=
1134+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250410012411-577291fb3438 h1:MRSQOS81YiT2GNbuuhvSedzAPjF/QHTmr0ohtlaJL3k=
1135+
github.com/smartcontractkit/chainlink-evm v0.0.0-20250410012411-577291fb3438/go.mod h1:8lZxhUXic+58IT/v4PTvbBVHSfr/Vrb+brcv6nwCiDQ=
11351136
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
11361137
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
11371138
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250408161305-721208f43882 h1:teDwTZ0GXlxQ65lgVbB44ffbIHlEh4N8wW7zav4lt9c=
@@ -1241,11 +1242,11 @@ github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
12411242
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
12421243
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
12431244
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
1244-
github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
1245-
github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
1245+
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
1246+
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
12461247
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
1247-
github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
1248-
github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
1248+
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
1249+
github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
12491250
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
12501251
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
12511252
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
@@ -1325,8 +1326,8 @@ go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.
13251326
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.49.0/go.mod h1:1P/02zM3OwkX9uki+Wmxw3a5GVb6KUXRsa7m7bOC9Fg=
13261327
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
13271328
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
1328-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
1329-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
1329+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
1330+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
13301331
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 h1:n4xwCdTx3pZqZs2CjS/CUZAs03y3dZcGhC/FepKtEUY=
13311332
go.opentelemetry.io/contrib/propagators/b3 v1.24.0/go.mod h1:k5wRxKRU2uXx2F8uNJ4TaonuEO/V7/5xoz7kdsDACT8=
13321333
go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI=
@@ -1460,8 +1461,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
14601461
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
14611462
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
14621463
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
1463-
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
1464-
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
1464+
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
1465+
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
14651466
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
14661467
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
14671468
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

‎core/services/relay/evm/write_target.go‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import (
1717

1818
chainselectors "github.com/smartcontractkit/chain-selectors"
1919

20+
dftypes "github.com/smartcontractkit/chainlink-evm/pkg/report/datafeeds"
21+
dfevm "github.com/smartcontractkit/chainlink-evm/pkg/report/datafeeds/evm"
2022
"github.com/smartcontractkit/chainlink-evm/pkg/report/monitor"
2123
"github.com/smartcontractkit/chainlink-evm/pkg/writetarget"
2224

@@ -100,7 +102,7 @@ func NewWriteTarget(ctx context.Context, relayer *Relayer, chain legacyevm.Chain
100102
return nil, fmt.Errorf("failed to get chain info: %w", err)
101103
}
102104

103-
beholder, err := writetarget.NewMonitor(ctx, lggr)
105+
beholder, err := writetarget.NewMonitor(ctx, lggr, dfevm.DecodeAsFeedUpdated)
104106
if err != nil {
105107
return nil, fmt.Errorf("failed to create Aptos WT monitor client: %+w", err)
106108
}
@@ -215,43 +217,13 @@ func evaluate(rawRequest capabilities.CapabilityRequest) (receiver string, err e
215217
return r.Config.Address, nil
216218
}
217219

218-
func decodeReportMetadata(data []byte) (metadata ReportV1Metadata, err error) {
220+
func decodeReportMetadata(data []byte) (metadata dftypes.Metadata, err error) {
219221
if len(data) < metadata.Length() {
220222
return metadata, fmt.Errorf("data too short: %d bytes", len(data))
221223
}
222224
return metadata, binary.Read(bytes.NewReader(data[:metadata.Length()]), binary.BigEndian, &metadata)
223225
}
224226

225-
func (rm ReportV1Metadata) Encode() ([]byte, error) {
226-
buf := new(bytes.Buffer)
227-
err := binary.Write(buf, binary.BigEndian, rm)
228-
if err != nil {
229-
return nil, err
230-
}
231-
return buf.Bytes(), nil
232-
}
233-
234-
func (rm ReportV1Metadata) Length() int {
235-
bytes, err := rm.Encode()
236-
if err != nil {
237-
return 0
238-
}
239-
return len(bytes)
240-
}
241-
242-
// Note: This should be a shared type that the OCR3 package validates as well
243-
type ReportV1Metadata struct {
244-
Version uint8
245-
WorkflowExecutionID [32]byte
246-
Timestamp uint32
247-
DonID uint32
248-
DonConfigVersion uint32
249-
WorkflowCID [32]byte
250-
WorkflowName [10]byte
251-
WorkflowOwner [20]byte
252-
ReportID [2]byte
253-
}
254-
255227
func getChainInfo(chainID uint64) (monitor.ChainInfo, error) {
256228
chainSelector := chainselectors.EvmChainIdToChainSelector()[chainID]
257229
chainFamily, err := chainselectors.GetSelectorFamily(chainSelector)

0 commit comments

Comments
 (0)