Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extracted txm + fees from core #475

Merged
merged 17 commits into from
Mar 13, 2023
Merged

Extracted txm + fees from core #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b777e73
Txm module
sdrug Mar 3, 2023
b70d78a
Fees module
sdrug Mar 3, 2023
a71cef7
Go mod dependencies
sdrug Mar 3, 2023
155ac7c
Formatting
sdrug Mar 3, 2023
3ec1a4c
Test cleanup on timeout
sdrug Mar 5, 2023
e333334
Go mod tidy integration tests
sdrug Mar 5, 2023
843e2b5
Reducing race test count to 1 and bumping up test timeout to 15m
sdrug Mar 6, 2023
10f0889
Getting rid of core utils dependency
sdrug Mar 7, 2023
78dd821
Solana keystore from core
sdrug Mar 8, 2023
3ea21a7
Geetting rid of chainlink core dependency
sdrug Mar 8, 2023
40130bb
Formatting
sdrug Mar 8, 2023
6a27461
Go mod tidy integration-tests
sdrug Mar 8, 2023
ba3393a
Tagging txm tests with integration flag
sdrug Mar 8, 2023
9e35552
Latest commit of chainlink-relay
sdrug Mar 8, 2023
d35de70
Txm tests using util from chainlink-relay
sdrug Mar 8, 2023
4f4ea97
Formatting
sdrug Mar 8, 2023
77ac97d
solana txm to use simple keystore interface (#480)
aalu1418 Mar 9, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/relay.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: Build
run: go build -v ./pkg/...
- name: Test
run: go test ./pkg/... -v
run: go test ./pkg/... -v -tags integration
- name: Test with the race detector enabled
run: go test ./pkg/... -v -race -count=10
run: go test ./pkg/... -v -race -count=10 -timeout=15m
48 changes: 27 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ require (
github.com/gagliardetto/gofuzz v1.2.2
github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27
github.com/gagliardetto/treeout v0.1.4
github.com/google/uuid v1.3.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.1
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230220202756-c2609b4f5b00
github.com/smartcontractkit/libocr v0.0.0-20221121171434-482da3ed36d8
github.com/stretchr/testify v1.7.5
github.com/prometheus/client_golang v1.14.0
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230309154839-2b6a5b078888
github.com/smartcontractkit/libocr v0.0.0-20221209172631-568a30f68407
github.com/stretchr/testify v1.8.2
go.uber.org/multierr v1.8.0
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
golang.org/x/sync v0.1.0
gopkg.in/guregu/null.v4 v4.0.0
)
Expand All @@ -33,43 +35,47 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/linkedin/goavro/v2 v2.12.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/onsi/gomega v1.19.0 // indirect
github.com/onsi/gomega v1.24.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.33.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/riferrei/srclient v0.5.4 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
github.com/tidwall/gjson v1.9.3 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
google.golang.org/protobuf v1.28.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
replace (
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.1
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
)
99 changes: 54 additions & 45 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 21 additions & 22 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ require (
github.com/onsi/gomega v1.24.1
github.com/rs/zerolog v1.28.0
github.com/satori/go.uuid v1.2.0
github.com/smartcontractkit/chainlink v1.10.0
github.com/smartcontractkit/chainlink v1.12.0
github.com/smartcontractkit/chainlink-env v0.3.8
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20221027174234-50b4d94d7135
github.com/smartcontractkit/chainlink-testing-framework v1.9.0
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230104220507-18c889b45fb5
github.com/smartcontractkit/libocr v0.0.0-20221209172631-568a30f68407
github.com/stretchr/testify v1.8.1
golang.org/x/crypto v0.1.0
github.com/stretchr/testify v1.8.2
golang.org/x/crypto v0.5.0
golang.org/x/sync v0.1.0
gopkg.in/guregu/null.v4 v4.0.0
)
Expand All @@ -46,8 +46,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
github.com/btcsuite/btcd v0.23.1 // indirect
github.com/btcsuite/btcd v0.23.4 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.5.72 // indirect
Expand Down Expand Up @@ -90,8 +89,8 @@ require (
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
github.com/gagliardetto/treeout v0.1.4 // indirect
github.com/getsentry/sentry-go v0.15.0 // indirect
github.com/gin-contrib/sessions v0.0.5 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 // indirect
github.com/gin-gonic/gin v1.8.1 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-kit/kit v0.12.0 // indirect
Expand All @@ -113,7 +112,6 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomodule/redigo v2.0.0+incompatible // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
Expand Down Expand Up @@ -270,14 +268,14 @@ require (
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
github.com/scylladb/go-reflectx v1.0.1 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.22.10 // indirect
github.com/shirou/gopsutil/v3 v3.22.12 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/slack-go/slack v0.11.4 // indirect
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230220202756-c2609b4f5b00 // indirect
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230309154839-2b6a5b078888 // indirect
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20220930034704-572ac07611cb // indirect
github.com/smartcontractkit/ocr2keepers v0.4.8 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20221206151523-7ae0ec615c0e // indirect
github.com/smartcontractkit/ocr2keepers v0.6.8 // indirect
github.com/smartcontractkit/ocr2vrf v0.0.0-20230117141905-c3a5c0467fd4 // indirect
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb // indirect
github.com/smartcontractkit/terra.go v1.0.3-0.20220108002221-62b39252ee16 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
Expand All @@ -288,6 +286,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.12.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tendermint/btcd v0.1.1 // indirect
Expand All @@ -298,11 +297,11 @@ require (
github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
github.com/terra-money/core v0.5.20 // indirect
github.com/theodesp/go-heaps v0.0.0-20190520121037-88e35354fe0a // indirect
github.com/tidwall/gjson v1.14.3 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
github.com/umbracle/ethgo v0.1.3 // indirect
github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
Expand All @@ -322,19 +321,19 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/exp v0.0.0-20220608143224-64259d1afd70 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.3.0 // indirect
golang.org/x/tools v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
gonum.org/v1/gonum v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d // indirect
google.golang.org/grpc v1.49.0 // indirect
Expand Down
Loading