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

Fix SmartContract History #596

Merged
merged 12 commits into from
Jul 12, 2021
Merged

Conversation

quantumagi
Copy link
Contributor

No description provided.

@quantumagi quantumagi marked this pull request as draft June 28, 2021 08:59
@quantumagi quantumagi marked this pull request as ready for review June 29, 2021 09:36
@quantumagi quantumagi requested a review from fassadlr June 29, 2021 09:36
t.SpendTxTime as TimeStamp,
IFNULL(p.SendValue, 0) AS Amount,
t.Fee,
p.SpendScriptPubKey as Address,
Copy link
Contributor

Choose a reason for hiding this comment

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

Just double checking this... The controller method receives a address and not the ScriptPubKey representation of it. Should we "convert" the address we filter against to the script pub key here (or earlier) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That is the SendToScriptPubKey (according to the first query of the UNION ALL, which takes precedence in the naming of columns) and its converted here:
image

However, I am assuming that address filtering is for fine-grained access into the Wallet->Account->Address hierarchy, so I think in that case we would be using the HDTransactionData's Address field to compare against?

image

Copy link
Contributor

@fassadlr fassadlr left a comment

Choose a reason for hiding this comment

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

Looks @quantumagi, please test thoroughly before we approve/merge.

@fassadlr fassadlr merged commit d44db55 into stratisproject:master Jul 12, 2021
fassadlr pushed a commit that referenced this pull request Jul 12, 2021
* Fix SmartContract History

* Update GetHistory

* Update GetHistory

* Update GetHistory

* Update query

* Update query

* Fix column name

* Add address filter to wallet service

* Fix query

* Refactor

* Use SC ScriptAddressReader

* Refactor
fassadlr added a commit that referenced this pull request Jul 13, 2021
* Bump Nuget versions

* Validate cross-chain deposit target (#561)

* Validate cross-chain transaction target

* Add more changes

* Change validation network

* Refactor

* Add ValidateCrossChainTransferAddress method

* Rename method

* Add some comments

* Update tests

* Add validation to SmartContractTransactionService

* Add minimum

* Fix spelling

* Fix message

* Update CirrusAddressValidationNetwork

* Add comments

* Refactor

* Remove whitespace

* Test for federation

* Move OpReturnDataReader to Stratis.Bitcoin

* Add reference

* Add Ethereum address check to InterFluxOpReturnEncoder (#601)

* Bump version to 1.0.9.1

* [Interflux] Explicitly specify Enum values for DestinationChain (#602)

* Explicitly specify Enum values for DestinationChain

* Fix order

* [InterFlux] Only allow ETH Interflux conversions (#608)

* Only allow ETH Interflux conversions

* Update src/Stratis.Bitcoin.Features.Wallet/Controllers/WalletController.cs

Co-authored-by: zeptin <zeptin@gmail.com>

Co-authored-by: zeptin <zeptin@gmail.com>

* Add Ethereum address check to InterFluxOpReturnEncoder (#601)

* Support legacy ETH conversion OP_RETURNs (#615)

* Fix SmartContract History (#596)

* Fix SmartContract History

* Update GetHistory

* Update GetHistory

* Update GetHistory

* Update query

* Update query

* Fix column name

* Add address filter to wallet service

* Fix query

* Refactor

* Use SC ScriptAddressReader

* Refactor

Co-authored-by: quantumagi <someguy.fromafrica@gmail.com>
Co-authored-by: zeptin <zeptin@gmail.com>
fassadlr added a commit that referenced this pull request Jul 23, 2021
* Bump Nuget versions

* Validate cross-chain deposit target (#561)

* Validate cross-chain transaction target

* Add more changes

* Change validation network

* Refactor

* Add ValidateCrossChainTransferAddress method

* Rename method

* Add some comments

* Update tests

* Add validation to SmartContractTransactionService

* Add minimum

* Fix spelling

* Fix message

* Update CirrusAddressValidationNetwork

* Add comments

* Refactor

* Remove whitespace

* Test for federation

* Move OpReturnDataReader to Stratis.Bitcoin

* Add reference

* Add Ethereum address check to InterFluxOpReturnEncoder (#601)

* Bump version to 1.0.9.1

* [Interflux] Explicitly specify Enum values for DestinationChain (#602)

* Explicitly specify Enum values for DestinationChain

* Fix order

* [InterFlux] Only allow ETH Interflux conversions (#608)

* Only allow ETH Interflux conversions

* Update src/Stratis.Bitcoin.Features.Wallet/Controllers/WalletController.cs

Co-authored-by: zeptin <zeptin@gmail.com>

Co-authored-by: zeptin <zeptin@gmail.com>

* Add Ethereum address check to InterFluxOpReturnEncoder (#601)

* Support legacy ETH conversion OP_RETURNs (#615)

* Fix SmartContract History (#596)

* Fix SmartContract History

* Update GetHistory

* Update GetHistory

* Update GetHistory

* Update query

* Update query

* Fix column name

* Add address filter to wallet service

* Fix query

* Refactor

* Use SC ScriptAddressReader

* Refactor

* Update network check points (#619)

* Update network check points

* Fix tests

* Only reserve UTXOs once the transaction has been built successfully. (#618)

* Update StraxTest.cs (#630)

* Update launch script (#638)

* Remove Password Check and GETH Check

* Signed Script

* Contract dynamic swagger endpoint (#527)

Co-authored-by: quantumagi <someguy.fromafrica@gmail.com>
Co-authored-by: zeptin <zeptin@gmail.com>
Co-authored-by: StratisIain <32906542+StratisIain@users.noreply.github.com>
Co-authored-by: Rowan de Haas <rowandh@users.noreply.github.com>
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.

None yet

2 participants