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

Update enterprise version #103

Merged
merged 237 commits into from
Apr 15, 2024
Merged

Update enterprise version #103

merged 237 commits into from
Apr 15, 2024

Conversation

Chengxuan
Copy link

Pulls in the latest hyper ledger main into enterprise branch

peterbroadhurst and others added 30 commits May 3, 2023 15:02
Signed-off-by: Peter Broadhurst <peter.broadhurst@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Co-authored-by: Nicko Guyer <nguyer@users.noreply.github.com>
Signed-off-by: Dzianis Andreyenka <andreenkodn@gmail.com>
Signed-off-by: Andrés Torres <andres@kalyp.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Documentation for working with the Tezos Blockchain
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
alex-semenyuk and others added 20 commits April 7, 2024 14:06
Signed-off-by: alexey semenyuk <alexsemenyuk88@gmail.com>
Signed-off-by: alexey semenyuk <alexsemenyuk88@gmail.com>
…ontract

DeployContract implementation for Tezos connector
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>
"batch_pin" and "contract_invoke_pin" pull from the same pool of nonces
for private messages, and thus need to share a single dispatch thread (per
message type). This ensures that the order in which nonces are assigned is
the order in which nonces are actually used (which is critical for ordering).

"unpinned" private messages can continue to be a separate dispatcher, as
they don't require nonces.

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
To preserve the correct ordering of nonces, gap fill batches cannot be queued
on the normal assembly loop (which might already have other messages queued).
The special batch must be created, sealed, and dispatched immediately instead
of the cancelled batch. Messages in both batches must be updated accordingly
to move them to "cancelled" or "sent".

Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
Signed-off-by: Andrew Richardson <andrew.richardson@kaleido.io>
feat: Add metrics for messaging when performing a token transfer
Allow cancelling a batch that is stuck in dispatch
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
…cific behaviour

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Add documentation to outline how EVM revert errors are handled
Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
…erprise-version

Signed-off-by: Chengxuan Xing <chengxuan.xing@kaleido.io>
@Chengxuan Chengxuan requested review from nguyer and ssmirr April 15, 2024 11:34
@EnriqueL8
Copy link

There is quite a lot in this PR and it's basically updating it with FF 1.3

Copy link

@EnriqueL8 EnriqueL8 left a comment

Choose a reason for hiding this comment

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

I'm happy with bringing these changes in but needs thorough testing in dev, especially the Dockefile changes

Comment on lines +83 to +86
COPY --from=firefly-builder --chown=1001:0 /firefly/firefly ./firefly
COPY --from=firefly-builder --chown=1001:0 /firefly/db ./db
COPY --from=solidity-builder --chown=1001:0 /firefly/solidity_firefly/build/contracts ./contracts
COPY --from=fabric-builder --chown=1001:0 /firefly/smart_contracts/fabric/firefly-go/firefly_fabric.tar.gz ./contracts/firefly_fabric.tar.gz

Choose a reason for hiding this comment

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

Need to be careful with this one and the way we run on k8s

Copy link

@nguyer nguyer left a comment

Choose a reason for hiding this comment

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

Leaving my approval on this, as all of this has presumably already been reviewed in the open source.

https://github.com/hyperledger/firefly/pull/1461/files#diff-b2e77d2a6574b8e68136b226be7c14dff6897e0c30751d33585d9d2bb916cea9R25-R42 might be a very relevant bit of the docs that anyone running this themselves should be aware of

@Chengxuan Chengxuan merged commit eebfba9 into enterprise Apr 15, 2024
1 check passed
@Chengxuan Chengxuan deleted the update-enterprise-version branch April 15, 2024 13:44
@Chengxuan Chengxuan restored the update-enterprise-version branch April 15, 2024 13:57
@Chengxuan Chengxuan deleted the update-enterprise-version branch April 15, 2024 13:57
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.