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

Mercury 1.0 (parallel composition) #10810

Merged
merged 10 commits into from
Feb 22, 2024
Merged

Mercury 1.0 (parallel composition) #10810

merged 10 commits into from
Feb 22, 2024

Conversation

samsondav
Copy link
Collaborator

@samsondav samsondav commented Sep 27, 2023 •
edited
Loading

Based on this sketch.

This merge is intended to enable LLO for benchmarking purposes.

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from 66b131a to d6ba92b Compare September 27, 2023 13:30
@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch 7 times, most recently from a4725bd to f109e6b Compare November 14, 2023 14:56
@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from f109e6b to 54941b1 Compare November 29, 2023 15:22
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch 3 times, most recently from 86f2bad to 9ec118e Compare December 6, 2023 18:04
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2023

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

3 similar comments
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 7, 2023

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from 4f59a53 to eda2815 Compare December 11, 2023 22:31
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

2 similar comments
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from c640d16 to 1d6f4ce Compare December 14, 2023 16:40
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from ec27073 to 1b2bec1 Compare January 4, 2024 14:43
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 4, 2024

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from 1b2bec1 to 54a7cfb Compare January 11, 2024 16:55
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Go solidity wrappers are out-of-date, regenerate them via the make wrappers-all command

jmank88
jmank88 reviewed Feb 21, 2024
View reviewed changes
core/services/ocr2/plugins/llo/integration_test.go
}
})

// TODO: test verification
Copy link
Contributor

Choose a reason for hiding this comment

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

For this PR?

jmank88
jmank88 reviewed Feb 21, 2024
View reviewed changes
core/services/ocr2/plugins/llo/integration_test.go Outdated
func setConfig(t *testing.T, steve *bind.TransactOpts, backend *backends.SimulatedBackend, verifierContract *channel_verifier.ChannelVerifier, verifierAddress common.Address, nodes []Node, oracles []confighelper.OracleIdentityExtra) ocr2types.ConfigDigest {
// Setup config on contract
rawOnchainConfig := datastreamsllo.OnchainConfig{}
// TODO: Move away from JSON
Copy link
Contributor

Choose a reason for hiding this comment

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

Future ticket?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It already has one and listed in another comment elsewhere. Will remove.

https://smartcontract-it.atlassian.net/jira/software/c/projects/MERC/issues/MERC-3661

jmank88
jmank88 reviewed Feb 21, 2024
View reviewed changes
core/services/llo/transmitter_test.go Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Junk or implement?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Needs implementing: https://smartcontract-it.atlassian.net/browse/MERC-3659

jmank88
jmank88 reviewed Feb 21, 2024
View reviewed changes
core/services/llo/orm.go
return dfns, scanned.BlockNum, nil
}

// TODO: Test this method
Copy link
Contributor

Choose a reason for hiding this comment

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

This PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

https://smartcontract-it.atlassian.net/jira/software/c/projects/MERC/issues/MERC-3653 (added comment)

jmank88
jmank88 reviewed Feb 21, 2024
View reviewed changes
GNUmakefile
@@ -31,6 +31,7 @@ gomodtidy: ## Run go mod tidy on all modules.
go mod tidy
cd ./core/scripts && go mod tidy
cd ./integration-tests && go mod tidy
cd ./integration-tests/load && go mod tidy
Copy link
Contributor

Choose a reason for hiding this comment

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

Wen gomods?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't know what that means... do you need me to do something here? I added this because it was missing.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nothing to do. This is necessary for now.
I was referring to https://github.com/jmank88/gomods

@samsondav samsondav force-pushed the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch from 4a4d071 to 8086d31 Compare February 22, 2024 14:02
@cl-sonarqube-production
Copy link

Quality Gate passed Quality Gate passed

Issues
24 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
84.2% Coverage on New Code
1.7% Duplication on New Code

See analysis details on SonarQube

@samsondav samsondav added this pull request to the merge queue Feb 22, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 22, 2024
@jmank88 jmank88 added this pull request to the merge queue Feb 22, 2024
Merged via the queue into develop with commit 601aa07 Feb 22, 2024
97 checks passed
@jmank88 jmank88 deleted the MERC-1516-v-1-0-multichain-mercury-parallel-composition branch February 22, 2024 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fletch153 Fletch153 Fletch153 approved these changes

@akuzni2 akuzni2 Awaiting requested review from akuzni2

@JoshC2k JoshC2k Awaiting requested review from JoshC2k

@krehermann krehermann Awaiting requested review from krehermann

@jmank88 jmank88 Awaiting requested review from jmank88

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@samsondav @jmank88 @krehermann @Fletch153