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

Merge main into feat freeze account 2023.02.03 #123

Conversation

sstanculeanu
Copy link
Contributor

No description provided.

andreibancioiu and others added 30 commits December 29, 2022 13:59
Add "libbls" (compiled as a library)
Rename Elrond to MultiversX (part 1).
* rebranding + usage of mx-chain-go v1.4.4

* removed gogoproto replace

* replaced elrond to multiversX also in code

* removed MultiversX from Proxy, Notifee, ShardCoordinator

* removed MultiversX from Proxy, Notifee, ShardCoordinator 2

* proxy test renamed
…freeze_account_2023.02.03

# Conflicts:
#	aggregator/graphqlResponseGetter_test.go
#	aggregator/notifees/mxNotifee_test.go
#	authentication/native/client.go
#	authentication/native/client_test.go
#	blockchain/cryptoProvider/signer_test.go
#	blockchain/interface.go
#	blockchain/proxy.go
#	blockchain/proxy_test.go
#	builders/errors.go
#	builders/txBuilder.go
#	builders/txBuilder_test.go
#	data/address.go
#	data/transaction.go
#	disabled/blockchainHookCounter.go
#	examples/examplesPriceAggregator/main.go
#	examples/examplesTransaction/main.go
#	examples/networks.go
#	go.mod
#	go.sum
#	headerCheck/factory/cryptoComponents.go
#	headerCheck/interface.go
#	interactors/wallet.go
#	testsCommon/proxyStub.go
#	workflows/moveBalanceHandler.go
@sstanculeanu sstanculeanu self-assigned this Feb 3, 2023
@sstanculeanu sstanculeanu merged commit fb6fb08 into feat/freeze-account Feb 3, 2023
@sstanculeanu sstanculeanu deleted the merge_main_into_feat_freeze_account_2023.02.03 branch February 3, 2023 11:47
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.

7 participants