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

Rebase Main to Dev #160

Merged
merged 32 commits into from
Mar 1, 2024
Merged

Rebase Main to Dev #160

merged 32 commits into from
Mar 1, 2024

Conversation

Nelbert442
Copy link
Contributor

Description

Rebase main to dev in an effort to bring up to speed all the changes that have been merged.

Type of change

Please select the right one.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • This will require a HardFork to be enabled

Which part is impacted ?

  • Wallet
  • Daemon
  • Miner
  • Explorer
  • Simulator
  • Misc (documentation, comments, text...)

Checklist:

  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

License

Im am contributing & releasing the code under DERO Research License (which can be found here).

Slixe and others added 30 commits March 4, 2023 21:08
@Slixe
implement gettxkey wallet function
3c942c4
@8lecramm
anti TX spam
c3c39bb
@8lecramm
Update chain_sync.go
b0d6ac6
@8lecramm
Wallet token support
e3665f0
@8lecramm
Wallet token support
f4cde2e
@Slixe
add pull request template
68364ff
@Slixe
improve pull request template
93d5df0
@CaptainDero
Pull Request Template
1fb11c9
@omahs
Fix: typos (deroproject#114)
765b2db
@Slixe
add misc, explorer, simulator in PR template (deroproject#126)
a62e81b 
* add misc, explorer, simulator in PR template

* explain branch process in template
@Slixe
update README.md & Start.md (deroproject#127)
a56da91
@CaptainDero
Merge branch 'get-tx-key' of https://github.com/Slixe/derohe into Sli…
7ada4df 
…xe-get-tx-key
@CaptainDero
Merge branch 'Slixe-get-tx-key' into main
87609a9
@CaptainDero
Merge branch 'anti-spam' of https://github.com/8lecramm/derohe into 8…
5c246f6 
…lecramm-anti-spam
@CaptainDero
Merge branch '8lecramm-anti-spam' into main
d94bf77
@CaptainDero
Merge branch 'wallet-token-support' of https://github.com/8lecramm/de…
d9c1a22 
…rohe into 8lecramm-wallet-token-support
@CaptainDero
Merge branch '8lecramm-wallet-token-support' into main
0951e98
@CaptainDero
RingSize Sanity Check Fix by Slixe
b9c5fa7
@Slixe
prevent leaking path in invalid change set request, verify valid order (
1a535ae 
deroproject#130)
@Slixe
fix --generate-new-wallet and support --wallet-file (deroproject#136)
d9225df
@Slixe
search TXID in all tokens history
1ef0586
@Slixe
returns SCID in which it got found
2872624
@Slixe
update
510070b
@CaptainDero
Merge pull request deroproject#140 from Slixe/fix-transfer-by-txid
a398738 
search TXID in all tokens history
@Slixe
improve changeSet topo verification (deroproject#137)
9f6e365 
* missing variable assignation

* add comments, better verification
@Slixe
support asset selection in integrated address (deroproject#138)
c0d3a94 
* support asset selection in integrated address

* show all balances available

* clean balance cache on rescan, lock

* better display, error

* support selected SCID integrated address creation
@Slixe
fix rpc payload sender real position (deroproject#147)
3824e67
@8lecramm
Fix broken fastsync (deroproject#149)
3298d4a
@Slixe
fix legacy code invalid error (deroproject#151)
cb1c2d5
@CaptainDero
Delete Readme.md
a5a0e6a
Nelbert442 and others added 2 commits February 29, 2024 00:29
@Nelbert442
Walletapi Connect Logic Updates For More Prefixes And Parameter Inputs (
e9df120 
deroproject#158)

* * walletapi Connect() function expansion

* * handle http, https, ws, wss, and base addr

* * logic ordering

* * add a few comments

* * updating explorer Connect() func to handle prefixes
@Nelbert442
* deroproject#158 - comment removed golint and reverted
715d9c5
@DankFC DankFC merged commit 3fd1af9 into deroproject:dev Mar 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Nelbert442 @secretnamebasis @DankFC @Slixe @8lecramm @CaptainDero @omahs