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

Jump to bottom

[BCI-3862][chainlink] - Change DSL Block primitive to string instead of int #14033

Merged
merged 23 commits into from
Aug 8, 2024
Merged

[BCI-3862][chainlink] - Change DSL Block primitive to string instead of int #14033

merged 23 commits into from
Aug 8, 2024

Conversation

Farber98
Copy link
Contributor

@Farber98 Farber98 commented Aug 5, 2024 •
edited by jira bot
Loading

Task Description:

Change ChainReader block DSL uint64 type to string and update EVM implementation to reflect changes

This PR:

This PR fixes all the reference failures within chainlink after modifying chainlink-common block proto field

Ticket:

Depends On:

@Farber98 Farber98 self-assigned this Aug 5, 2024
@Farber98 Farber98 mentioned this pull request Aug 5, 2024
Closed
@Farber98
Copy link
Contributor Author

Farber98 commented Aug 6, 2024 •
edited
Loading

@ilija42 Once smartcontractkit/chainlink-common#683 gets merged, do I need a separate PR to bump common like this one? Or can I do it in this same PR.

Also, when bumping the ref, do we use UTC for the new timestamp?

Solution: run go get github.com/smartcontractkit/chainlink-common@xyz where xyz is the latest commit hash here https://github.com/smartcontractkit/chainlink-common/pull/683/commits. Need to do this in root, /integration-tests, /integration-tests/load and /core/scripts. Then run make gomodtidy in root

ilija42
ilija42 requested changes Aug 6, 2024
View reviewed changes
Copy link
Contributor

@ilija42 ilija42 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should first reference the common changes so that CI passes, then once common is merged you can update the reference to the squashed commit hash from common master branch, you don't need separate PRs

ilija42
ilija42 reviewed Aug 6, 2024
View reviewed changes
go.mod Outdated
@@ -9,7 +9,7 @@ require (
github.com/NethermindEth/juno v0.3.1
github.com/NethermindEth/starknet.go v0.7.1-0.20240401080518-34a506f3cfdb
github.com/XSAM/otelsql v0.27.0
github.com/avast/retry-go/v4 v4.6.0
github.com/avast/retry-go/v4 v4.5.1
Copy link
Contributor

@ilija42 ilija42 Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did this downgrade? this is causing build failure

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should revert this change and run tidy

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@Farber98 Farber98 marked this pull request as ready for review August 6, 2024 14:57
@Farber98 Farber98 requested review from a team as code owners August 6, 2024 14:57
ilija42
ilija42 requested changes Aug 6, 2024
View reviewed changes
Copy link
Contributor

@ilija42 ilija42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but has merge conflicts

Farber98 added 2 commits August 7, 2024 23:44
@Farber98
reference to changes in common
2fa9c8d
@Farber98
Merge branch 'BCI-3862-change-dsl-block-primitive-to-string' of githu…
9bf5f9f 
…b.com:smartcontractkit/chainlink into BCI-3862-change-dsl-block-primitive-to-string
@Farber98 Farber98 dismissed stale reviews from EasterTheBunny and ilija42 via 9bf5f9f August 8, 2024 02:46
@Farber98 Farber98 mentioned this pull request Aug 8, 2024
Merged
ilija42
ilija42 previously approved these changes Aug 8, 2024
View reviewed changes
EasterTheBunny
EasterTheBunny previously approved these changes Aug 8, 2024
View reviewed changes
@Farber98 Farber98 dismissed stale reviews from EasterTheBunny and ilija42 via f5b077a August 8, 2024 14:36
@ilija42 ilija42 enabled auto-merge August 8, 2024 14:43
@cl-sonarqube-production
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarQube

silaslenihan
silaslenihan approved these changes Aug 8, 2024
View reviewed changes
Copy link
Contributor

@silaslenihan silaslenihan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ilija42 ilija42 added this pull request to the merge queue Aug 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 8, 2024
@ilija42 ilija42 added this pull request to the merge queue Aug 8, 2024
Merged via the queue into develop with commit 375e17b Aug 8, 2024
118 checks passed
@ilija42 ilija42 deleted the BCI-3862-change-dsl-block-primitive-to-string branch August 8, 2024 16:27
@github-actions github-actions bot mentioned this pull request Aug 8, 2024
Draft
momentmaker added a commit that referenced this pull request Aug 8, 2024
@momentmaker
Merge branch 'develop' into re-2756/goreleaser-build-image
4d17c65 
* develop:
  CRIB CI integration (#13924)
  fix: refactor sonarqube scan args (#13875)
  BCI-3492 [LogPoller]: Allow withObservedExecAndRowsAffected to report non-zero rows affected (#14057)
  Add error mapping for Astar (#13990)
  [BCI-3862][chainlink] - Change DSL Block primitive to string instead of int (#14033)
  [KS-412] Validate called DON membership in TriggerPublisher (#14040)
  [TT-1429] notifying guardian on some failures (#14073)
  Add Mantle errors (#14053)
  Fix write target nil dereferences (#14059)
  Allow retrying failed transmissions (#14017)
  auto-11214: migrate more tests to foundry (#13934)
This was referenced Aug 18, 2024
Draft
Draft
Draft
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ilija42 ilija42 ilija42 approved these changes

@silaslenihan silaslenihan silaslenihan approved these changes

@EasterTheBunny EasterTheBunny EasterTheBunny left review comments

Assignees

@Farber98 Farber98

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Farber98 @EasterTheBunny @silaslenihan @ilija42