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.

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

chore/1.7.0 merge conflicts develop 3 #7202

Closed

Conversation

HenryNguyen5
Copy link
Collaborator

@HenryNguyen5 HenryNguyen5 commented Aug 9, 2022

No description provided.

EasterTheBunny and others added 30 commits July 25, 2022 11:10
All instances of upkeepID being passed to log output are formatted
as strings to make grep searches easier in logs.
To verify the log output is formatted as expected, a unit test was added to
`RegistrySynchronizer.syncUpkeepWithCallback`. To accomplish a unit test on
this private member function, the test needed to be in the keeper package
directly which eliminated the ability to use `cltest` for testing.

To avoid the eth client dependency, I introduced a new interface that private
functions can receive as a parameter instead of a `RegistryWrapper` directly.
This allows function isolation with minimal test setup and simplifies unit
testing without the need to rely on the cltest package.
UpkeepIdentifier was created as a wrapper for `utils.Big` to provide support for
specific formatting associated with the underlying data. The future intention of
this new type is to use it in place of `utils.Big` where the data should be
considered an upkeepID. This will allow type checking to apply to instances where
an upkeepID is the intended data to be passed through.

In addition, errors from the registry wrapper were refactored to provide more
context to the errors and leverage the value of error wrapping to identify errors
as having originating from contract communication.
* Rinkeby and Goerli
* Sim backend cltest cleanup

* Update core/internal/cltest/README.md

Co-authored-by: Jordan Krage <jmank88@gmail.com>

* Fix test

* Fix forwarder test

Co-authored-by: Jordan Krage <jmank88@gmail.com>
* add tx metadata and metrics to track fwd tx states

* handle case where tx metadata is nil

* use strconv for readability
The same pretty print upkeepID function applies to the prettyID field
of the job spec. The upkeepID was kept the same; an int represented
as a string.

To better ensure correctness of the entire job spec, including the
upkeepID, UpkeepExecuter.execute was refactored by pulling the job
spec build step into its own function. That function is now covered
by a unit test.
Updated tests for addLog and added some new ones
- "msg" has special meaning and overrides the main log message, we
  intended to log it as structured data instead.
* feat: time until and between tx broadcasts prom metric

* feat: time until tx confirmed metric in eth_confirmer

* feat: report blocks elapsed until tx confirmed

* feat: vrf sim metrics

1. vrf_request_time_between_sims: this will record the duration in
between two simulation attempts of the same request.
2. vrf_request_time_until_initial_sim: this will record the duration
until a request is first simulated after it's been received.
* Validate the admin address on the FMS chain specific config
- Removed Valuer/Scanner implementation from model.go
- Changed new interfaces to private
- Changed registry sync error to private
Convert NULL tx_index values in log_broadcaster to -1
* update chainlink-starknet/relayer

* import starknet keys from chainlink-starknet, slight interface changes to handle external keys

* fix up keystore references

* placate linter

* connect txm to chains

* return stark key in web + cli

* bump starknet version, module reorg fixes

* add orm test + fix remaining module changes

* update keystore with better naming + controllers with explicit descriptions

* fix ORM test

* fix linter

* clean up go.mod

* update chainlink-starknet/relayer

* connect txm + client, update orm test case

* adjust starkpubkey naming, fix debug logs
This reverts commit b927978.
jmank88 and others added 27 commits August 4, 2022 11:52
* tools/bin: remove p/parallel flags from tests

* core/chains/solana/soltxm: TestTxm_Integration extend timeout to test deadline; core/internal/testutils: consolidate Context helpers

* adjust default context

Co-authored-by: Vyzaldy Sanchez <vyzaldysanchez@gmail.com>
Co-authored-by: Jordan Krage <jmank88@gmail.com>
* allow admin to mutate check data

* addressed comments

* refactor event
* allow admin change for upkeeps

* addressed comments

* handle proposed admin in migration
A change was made to the complete repo to alter data types of gas to uint32. This
caused tests in this branch to fail as they were expecting uint64.

Also applied some changes to integration tests that were failing when using the
-short flag.
* set timeout for batchSendTransactions call in ethConfirmer

* bump timeout to 30s and add timeout to batch call in eth_resender

* use a different timeout value already consumed by other methods in eth confirmer

* increase batch trasnaction timeout to 10 mins

* change eth resender batch send timeout to 30 seconds
…mat-bigint-upkeepid

Pretty format bigint upkeepID
…ients

Clarify README wrt execution clients
@github-actions
Copy link
Contributor

github-actions bot commented Aug 9, 2022

I see that you haven't updated any CHANGELOG files. Would it make sense to do so?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.