Skip to content

Commit

Permalink
ocr2plus
Browse files Browse the repository at this point in the history
  • Loading branch information
@samsondav
samsondav committed May 18, 2023
1 parent 72ab323 commit 28debb4
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 30 deletions.
3 changes: 0 additions & 3 deletions core/services/ocr2/plugins/median/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ import (
"os/exec"
"time"

"github.com/hashicorp/go-plugin"

"github.com/smartcontractkit/chainlink-relay/pkg/loop"
"github.com/smartcontractkit/chainlink-relay/pkg/types"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
Expand Down
2 changes: 1 addition & 1 deletion core/services/ocr2/plugins/promwrapper/plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion core/services/relay/evm/mercury/queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"sync"

ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2/types"
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink/v2/core/logger"
"github.com/smartcontractkit/chainlink/v2/core/services"
Expand Down
2 changes: 1 addition & 1 deletion core/services/relay/evm/mercury/queue_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/zap/zapcore"

ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2/types"
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
"github.com/smartcontractkit/chainlink/v2/core/logger"
Expand Down
1 change: 0 additions & 1 deletion core/services/relay/evm/mercury/transmitter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
pkgerrors "github.com/pkg/errors"
"golang.org/x/exp/maps"

"github.com/smartcontractkit/libocr/offchainreporting2/chains/evmutil"
"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ require (
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/pyroscope-io/godeltaprof v0.1.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand Down
21 changes: 0 additions & 21 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1384,37 +1384,16 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
<<<<<<< HEAD
github.com/smartcontractkit/chainlink-cosmos v0.4.0 h1:xYLAcJJIm0cyMtYtMaosO45bykEwcwQOmZz3mz46Y2A=
github.com/smartcontractkit/chainlink-cosmos v0.4.0/go.mod h1:938jBqOrhdCq4A8enUiBliiDLBndAXebHIitKsDVqY0=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230517200758-40dada2543a1 h1:/gqM+lMSfoxdNSeruMgEdqA7a/RJuz6l36LPuKoI1EU=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230517200758-40dada2543a1/go.mod h1:f7/HKcJWWFzINrkDDlpKsFaU6D+8D4B4OrQxkkCX4oc=
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230516001004-0216997a2508 h1:hsCcqkK7ZgABURMRYbNgRdVbNJv7JJPGlgKJbukjMsk=
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230516001004-0216997a2508/go.mod h1:CUmP50gxZsjwEYA7balCV3mhvX0CrR/a01X6jGBZR8I=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230424184429-bfdf6bddb239 h1:YmYkbdM5YXVV+IWgp+5ctfplMEoXamT0LR0qsnM4eps=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230424184429-bfdf6bddb239/go.mod h1:RZzvRfGjMe4lBOT1H/MRfjnNoyUWOiHlOcHx/BZYg+M=
github.com/smartcontractkit/libocr v0.0.0-20230413082317-9561d14087cc h1:aSCDAai0Dmbhp/KHTtJnC/EJcaEz4CAO80SKRzRZiQA=
github.com/smartcontractkit/libocr v0.0.0-20230413082317-9561d14087cc/go.mod h1:5JnCHuYgmIP9ZyXzgAfI5Iwu0WxBtBKp+ApeT5o1Cjw=
github.com/smartcontractkit/ocr2keepers v0.6.15 h1:dFhg+qT+tc6b3G8N4qnAHuHe8N0m8CSA8g4YGSeTGPo=
github.com/smartcontractkit/ocr2keepers v0.6.15/go.mod h1:gqIksJFzdXFsHfGdCWm1uTxbwvAltgcwcaqIgAStC1A=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230510102715-c58be582bf19 h1:RxaC+V34UEP2u/riXfcvWPZEglri4UsfQi5joUObZ08=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230510102715-c58be582bf19/go.mod h1:AZbOisIoA3cOUku8suZ+KWBnzbRiafmhi7UKiXoezrk=
=======
github.com/smartcontractkit/chainlink-cosmos v0.1.7-0.20230501143435-e21d4d0d7c8a h1:c32ykM9q1+A6tPiDegN0bRCeYcMa/haOzuBtdwxCp4Y=
github.com/smartcontractkit/chainlink-cosmos v0.1.7-0.20230501143435-e21d4d0d7c8a/go.mod h1:9D1rABsu/8415Mf2UqCrdfSXuf+VREQhaYTPbYC+eMk=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230511154236-76abdbeb5406 h1:6UGrDLLznVHa8KYaCZqGo6rI8Ih9KigZwqnYzY6j718=
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230511154236-76abdbeb5406/go.mod h1:9s33DvMfjkqhCP26UlAcC3DjcO8JA8YeeHSWeILMgj8=
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230501143522-22fc1daaef73 h1:N4EVt7+pPo0GJgw2PBWQ4dtSAsUhrs+Vn796M8RRTgI=
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230501143522-22fc1daaef73/go.mod h1:3AfSgbihCE55DmFg6PIntCIRWZvK1PjFUtD6U3O6aPE=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230501143535-c29c0b851783 h1:OK8PPBcQ0xxlmW6BwBUUKKBrpSVHTcs9dWflVJdHri4=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230501143535-c29c0b851783/go.mod h1:ks83EY2frE17c17UVRinfbTXlIAP6IpLDCdfKRThE/w=
github.com/smartcontractkit/libocr v0.0.0-20230510184648-c86c76435c5e h1:/q41YGl/yMfm/M9zh449qmON9UqjuIQw7uIx5okq9q0=
github.com/smartcontractkit/libocr v0.0.0-20230510184648-c86c76435c5e/go.mod h1:7Pd28puvezPJXB+xRJlcsx5CfzzkFJbMXydaAEsL4E8=
github.com/smartcontractkit/ocr2keepers v0.6.15-0.20230501143604-90dddd91b5bc h1:mYmaBdyJAk9J3tve7CZYn0ur9qw4Yw31ZQnY1BMhKWk=
github.com/smartcontractkit/ocr2keepers v0.6.15-0.20230501143604-90dddd91b5bc/go.mod h1:wgPK9PDqfm4I+8bXZuDmgx4BnKTsZcrCQ2al+seMb2g=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230511132215-c7d370897a3d h1:TFK8odPcxuiwwRyDA9A57LUfuXfa9orE81fcjhyDkiw=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230511132215-c7d370897a3d/go.mod h1:8XXFm+2hiYTjFBQKro1dmG2KUaA1XA+295csQ8REJIE=
>>>>>>> 4f9effa053 (Implements new chainlink-relay + libocr versions)
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A=
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk=
github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb6vPbtRQ=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/contracts/contract_models.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator"
"github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator"
ocrConfigHelper "github.com/smartcontractkit/libocr/offchainreporting/confighelper"
ocrConfigHelper2 "github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
ocrConfigHelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"

"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/flux_aggregator_wrapper"
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/functions_billing_registry_events_mock"
Expand Down

0 comments on commit 28debb4

Please sign in to comment.