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

refactor: fix db structure #3616

Merged

Conversation

stringhandler
Copy link
Collaborator

Fix the database structure for collectibles

# Conflicts:
#	applications/tari_collectibles/src-tauri/src/app_state.rs
#	applications/tari_collectibles/src-tauri/src/commands/assets/mod.rs
#	applications/tari_collectibles/src-tauri/src/commands/wallets/mod.rs
#	applications/tari_collectibles/src-tauri/src/main.rs
#	applications/tari_collectibles/src-tauri/src/schema.rs
#	applications/tari_collectibles/src-tauri/src/storage/mod.rs
#	applications/tari_collectibles/src-tauri/src/storage/sqlite/mod.rs
#	applications/tari_collectibles/src-tauri/src/storage/sqlite/models/mod.rs
#	applications/tari_collectibles/web-app/src/binding.js
@stringhandler stringhandler changed the base branch from development to validator-node November 24, 2021 17:18
Copy link
Contributor

@delta1 delta1 left a comment

Choose a reason for hiding this comment

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

LGTM

@stringhandler stringhandler merged commit 3a80adf into tari-project:validator-node Nov 25, 2021
sdbondi added a commit to sdbondi/tari that referenced this pull request Dec 12, 2021
* development: (77 commits)
  chore: merge development
  refactor: split transaction file (tari-project#3653)
  refactor: change transaction mod name
  chore: fix imports fmt (tari-project#3650)
  feat: add 721 template stub (tari-project#3643)
  feat: add transfer method to tip002 (tari-project#3632)
  feat: add connect per site into the web extension (tari-project#3626)
  refactor: fix db structure (tari-project#3616)
  feat: add asset key manager to collectibles (tari-project#3609)
  ci: update validator-node CI for faster feedback (tari-project#3606)
  feat: add state database (tari-project#3591)
  feat: add wallet stub to collectibles app (tari-project#3589)
  feat: add onboarding flow for web extension (tari-project#3582)
  feat: compile key manager to wasm and add javascript interface (tari-project#3565)
  feat: add storage to validator node (tari-project#3551)
  fix: wallet was not able to run (tari-project#3561)
  feat: add react popup with some basic functionality (tari-project#3550)
  feat: create tari web extension application stub (tari-project#3535)
  chore: merge dev
  refactor: move conversion
  ...
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.

2 participants