Chore/resolve master conflicts #118
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
MikkySnow
commented
Jul 23, 2024
MikkySnow
commented
- Resolve conflicts between develop and master branches
* refactor: migrate files from evm-module repo * refactor: migrate files from evm-module repo * refactor: migrate files from evm-module repo * refactor: migrate files from evm-module repo * refactor: migrate librustgo into chain repo * refactor: cleanup go-sgxvm * refactor: add sgx-sdk as a submodule * refactor: set sgx-sdk version * WIP deb dir * WIP deb dockerfile, bash script Fix deb systemd run command * fix: restore vesting test * WIP build-deb pipeline * Fix build_deb.sh #1 * Fix build_deb.sh #2 * fix: fix build and startup issues * Version number does not start with digit * artifact path * Implement draft of x/did module * tests: start adding tests for x/did module * tests: add more tests for DID create * tests: extend tests * tests: add test for DID deactivation * tests: add tests for updating DID * tests: extend keeper tests * chore: add did json rpc * fix: comments * refactor: remove redundant submodule * fix: fix makefile * refactor: remove evm-module * feat: add debug commands * fix: trying to fix issue with verification method * refactor: sort imports * add: add command to generate sample payload for DID document * chore: add unit tests in did types * chore: add unit tests for did document payload * chore * refactor: update constants * feat: add proto file for did resource * feat: add types/utils for DID resource * feat: add keeper methods for DID resource * fix: fix compilation issues * feat: add query for did resource * feat: extend genesis impl * feat: add cli commands for did resources * feat: register createResource command * refactor: merge debug commands * feat: add draft of sample resource debug cmd * test: add basic test for did resource creation * refactor: comment test * refactor: refactor to remove redundant args * feat: register sample did resource cmd * feat: register codec for MsgCreateResource * hotfix: remove empty submodule * refactor: remove empty submodule * feat: add `did` and `util` namespaces to default list * refactor: add keeper methods * feat: connect DIDKeeper to EVMKeeper * feat: pass DIDKeeper to connector * feat: add draft of identity precompile * fix: fixing compilation issues * fix: fixing complication issues * fix: fix compilation issues * refactor: add comments and merge small files into one * refactor: remove unused crate * fix: fix compilation issue * refactoring: cleanup tx handler * feat: provide querier to precompileset * refactor: moving precompiles into sgxvm (in progress) * refactor: moving precompiles into sgxvm (in progress) * refactor: fix warnings * fix: fix compilation issue * fix: return datacopy precompile * refactor: prettify * feat: provide GoQuerier to Identity precompile * feat: add function to encode request for credentials verification * feat: add draft of precompile for VC verification * feat: add request for obtaining verification material * feat: pass GoQueroer * feat: add query for verification methods * feat: finish precompile part * feat: add GetVerificationMethods function to connector * feat: implement connector for DID * test: prepare test for VC precompile * test: add test for getting verification methods using connector * chore: update mod reference * chore: refactor reference to simapp * chore: fix referencing issue * test: add draft of credentials contract and test * feat: increase default balances * test: cleanup * test: add basic test for interaction with VC.sol * chore: reformat code * test: add draft of integration test * chore: uncomment * refactor: remove unused precompile crates * test: add actual data * fix: fixed precompile issue * refactor: remove todo's and reformat the code * refactor: reduce code size * refactor: remove unused derived trait * refactor: remove unused submodule * chore: fix app.go * chore: upgrade library and module * chore: upgrade testing library * fix app.go to include consensus keeper * chore: fix iavl && exp/slices error * fix: ante handler * test: update test contract for VC * test: uncomment test for gas estimation * chore: update moudles * fix: fix protobuf issue * chore: remove duplicate sethook for govkeeper * refactor: add comments + reduce code size * refactor: use ENCLAVE_HOME instead of CHAIN_HOME * refactor: refactor tests * refactor: resolve todo * chore: fix vesting module unit testing * chore: fix setupWithT * chore: fix chain Id * chore: add update to date eip712 * chore: set fees acount to be gas amount multiplied * refactor: add nosgx build flag * refactor: cleanup * feat: add draft of command for macos build * chore: fix unit test failure in ante handler * chore: fix eip unit test issue * chore: fix chainId issue * fix: trying to fix issue with build tags * fix: fix build issue for linux amd64 * feat: add command for build for windows * refactor: remove sgx-related commands from swisstronikcli * feat: add build instructions for arm64 and amd64 * fix: typo fix * First CI try * CI #2 * CI #3 * CI #4 * CI #5 * CI #6 Update upload-artifact to v3 * Added badge to README, switch to tag-only runs, enable manual triggers * fix: quick fix for identity precompile * refactor: remove redundant debug logs and comments * refactor: create a separate directory for sgxvm enclave * fix: fix compilation issues during refactor * refactor: remove sgx-sdk submodule * refactor: remove sgx-sdk submodule from go-sgxvm * refactor: move sgx-sdk into sgxvm directory * refactor: set submodule version * refactor: wip: migrating to a new structure * refactor: apply new structure * chore: update README * docs: update README * refactor: simplify build process * fix: trying to fix issue with protobuf generation * fix: fix issue with cyclic import * test: update sign_tx_test.go * chore: update protobuf & enclave * refactor: use cometbft instead of tendermint * fix: fix build issue * chore: add nbf validation * chore: fix comparison of nbf date * fix: fix build issues in tests * feat: cache node public key * chore: add issuer in identiy return RLP, decode it in VC.sol * test: small test fixes * refactor: use cometbft instead of tendermint * refactor: update protobuf * chore: update wrapper dyn lib * refactor: remove unused import * test: update VC.sol test contract * test: add test for nbf field of JWT proof * chore: update protobuf and dyn lib * refactor: return data from precompile in ABI format * test: add check for returned data from VC.sol * chore: update protobuf * fix: restore tests * feat: add method to obtain controlled DIDs by provided verification material * chore: set eth key type to legacy Cdc * feat: add method to add and remove associated did * feat: use AddDIDControlledBy and RemoveControlledDID calls * feat: add query for controlled dids * feat: add query for all controlled documents * test: add basic test for indexing verification material * test: update test to check verification method index * feat: add did_documentsControlledBy request * test: add test for adding and removing VM from index * feat: add cli command to query all controlled docs * fix: trying to fix docker build * fix: revert Cargo.lock * refactor: rename did tx commands * fix: fix docker build * chore: setup handler * chore: add eip * refactor: update version to v1.0.1 * Iterate on deb builds, port changes to Dockerfile * Fix env * Enclave home, remove /opt/swisstronik on rm * feat: take ENCLAVE_HOME from runtime * Enclave home in systemd file * Remove SGX-breaking options from systemd * Modify docs accordingly * refactor: add SEED_HOME env var * Added SEED_HOME env var to systemd service * chore: add distribution param keeper and feemarket keeper module check consPram Block item * chore: add default statement * Fix deb pipeline to react to tags, get version from git tag * feat: update dylib * refactor: rename comments * refactor: update comments and names * fix: fix issue with path to enclave file * fix: restore ibc tests * refactor: refactor test utils * refactor: remove redundant code * Fix `swisstronikd debug sample-did-resource` (#55) * fix: fix issue with derivation of collection id * fix: fix issue with signature for creation of resource * Add debug command to sign DID document command (#57) * chore: add sign did document * chore: renaming * chore: fix to compare with multibase address and loop all verification method * chore: rename variable --------- Co-authored-by: Denis <[email protected]> Co-authored-by: kenta92115 <[email protected]> Co-authored-by: kenta92115 <[email protected]>
* Fix denom prefix Signed-off-by: Dylan Schultz <[email protected]> * Replace `aswtr` with `utils.BaseDenom` --------- Signed-off-by: Dylan Schultz <[email protected]> Co-authored-by: Hungry Warrior <[email protected]>
… into chore/resolve-master-conflicts
delneg
approved these changes
Jul 23, 2024
MikkySnow
added a commit
that referenced
this pull request
Jul 23, 2024
This reverts commit f784b7a.
MikkySnow
added a commit
that referenced
this pull request
Jul 23, 2024
This reverts commit f784b7a.
MikkySnow
added a commit
that referenced
this pull request
Jul 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.