Version 1.6.2204 #85

MrStahlfelge · 2022-01-26T20:46:38Z

ErgoPay implementation
Portuguese and Italian translation added
Payment request URI scheme changed to ergo:
Spanish translation improved
Appkit upgraded to 4.0.6
Small bug fixes and improvements

…ansactionInfo data class #79

… name/decimals when available #79

…rgoPaySigningUiLogic #79

…dFunds/ErgoPay #79

…w things … (#81) * Fixed a sentence that didnt fit properly + translated the new things added * Remove untranslatable, run convertIos Co-authored-by: Benjamin Schulte <[email protected]>

* Android * Fixed the word "única" + changed "tx" to "transação" since the abbreviation doesn't make sense in PT * Portuguese activated for and converted to iOS Co-authored-by: Benjamin Schulte <[email protected]>

…equest differs from signing addresses, received no reducedTx but message #79

…ltiple addresses #79

…Pay URIs #79

…ness

…ount

…ing failed #79

…more, omit it

…lue displays

Ergopay reference implementation

* Italian translation * Fixed Italian translation for Android * Converted Italian for iOS Co-authored-by: Benjamin Schulte <[email protected]>

android/src/main/java/org/ergoplatform/android/transactions/ErgoPaySigningFragment.kt

android/src/main/java/org/ergoplatform/android/transactions/SubmitTransactionViewModel.kt

aslesarenko · 2022-01-27T12:32:45Z

common-jvm/src/main/java/org/ergoplatform/transactions/ColdWalletUtils.kt

-                .map { Base64Coder.decode(it.asString) }
-        } else null
+        val inputs = jsonTree.get(JSON_FIELD_INPUTS)?.asJsonArray?.toList()
+                ?.map { Base64Coder.decode(it.asString) }


Such code fragments are good candidates for encapsulation into extension methods.

What would you suggest to encapsulate here?
Unfortunately Gson is not very Kotlin-friendly anyway. Using kotlinx-serialization would make better code here. But we already have Gson pulled in, and pulling in a second JSON parser is something I want to avoid.

I keep something like this in mind
jsonTree.decodeBase64StringList(JSON_FIELD_INPUTS)

Changed it, although I am not sure as this is a very specific method

aslesarenko · 2022-01-27T12:35:28Z

common-jvm/src/main/java/org/ergoplatform/transactions/ErgoPay.kt

+
+/**
+ * EIP-0020 ErgoPaySigningRequest
+ * everything is optional, but it should have either reducedTx or message


this requirement can be checked in the constructor.

I had the wrong assumption that data classes can't hold any code, turned out it is possible to have such a check. Will add.

aslesarenko · 2022-01-27T12:36:19Z

common-jvm/src/main/java/org/ergoplatform/transactions/ErgoPay.kt

+    val message: String? = null,
+    val messageSeverity: MessageSeverity = MessageSeverity.NONE,
+    val replyToUrl: String? = null
+)


Please add documentation to all classes, methods and properties in this file.

aslesarenko · 2022-01-27T13:31:23Z

common-jvm/src/main/java/org/ergoplatform/transactions/PaymentRequest.kt

+private const val PARAM_DELIMITER = "&"
+private const val RECIPIENT_PARAM_PREFIX = "address="
+private const val AMOUNT_PARAM_PREFIX = "amount="
+private const val TOKEN_PARAM_PREFIX = "token-"


why - in the prefix?

Token prefix is token-<ErgoID>=, the - is the separator between the prefix and the actual id. (https://github.com/ergoplatform/eips/blob/master/eip-0025.md#format)

Please put this answer to the doc comment for TOKEN_PARAM_PREFIX

common-jvm/src/main/java/org/ergoplatform/transactions/TransactionInfoUtils.kt

common-jvm/src/main/java/org/ergoplatform/uilogic/transactions/ErgoPaySigningUiLogic.kt

common-jvm/src/test/java/org/ergoplatform/transactions/ErgoPayTest.kt

#79

MrStahlfelge and others added 30 commits January 12, 2022 17:54

Android send funds screen move QR code button to action bar

e427510

Android Add QR scanner to main wallet screen #79

212c5f1

Introduce ErgoPaySigningRequest and Parser from URI, introduce own Tr…

f291060

…ansactionInfo data class #79

Build TransactionInfo from ErgoPaySigningRequest #79

6cc45e3

Process ergopay QR codes on send funds screen #79

a1c704a

Ergo Pay navigate to Signing screen and show transaction info #79

00027df

ErgoPaySigningFragment show messages, TransactionInfoUtils show token…

829e33f

… name/decimals when available #79

Introduce SubmitTransactionUiLogic for shared code SendFundsUiLogic/E…

acadedb

…rgoPaySigningUiLogic #79

Introduce SubmitTransactionFragment and ViewModel for shared code Sen…

825e4b2

…dFunds/ErgoPay #79

Ergo Pay sign transaction and submit to network #79

5bffe6e

Ergo Pay add cold wallet capability #79

15e083f

Fix Spanish translation "Opciones"

42f5095

Change URI scheme ergoplatform: to ergo: due to EIP-0025 change

b33cb81

Fix PaymentRequestKtTest.kt after EIP-0025 change

c9d453e

Merge branch 'develop' into ergopay

00e8cdc

Ergo Pay integrate into Wallet Overview Screen and URI intent call #79

812fd10

Spanish: Fixed a sentence that didnt fit properly + translated the ne…

0c3b03b

…w things … (#81) * Fixed a sentence that didnt fit properly + translated the new things added * Remove untranslatable, run convertIos Co-authored-by: Benjamin Schulte <[email protected]>

Ergo Pay Fetch and parse ErgoPaySigningRequest from remote server #79

123d422

Gson JsonObject.get returns null, no need to check with JsonObject.has

4d3da7a

Add portuguese translation (#80)

94583a6

* Android * Fixed the word "única" + changed "tx" to "transação" since the abbreviation doesn't make sense in PT * Portuguese activated for and converted to iOS Co-authored-by: Benjamin Schulte <[email protected]>

Ergo Pay harden edge cases: No reducedTx and no message, address in r…

35cf5d2

…equest differs from signing addresses, received no reducedTx but message #79

Ergo Pay show message from dApp on confirmation screen #79

074696b

convertStrings automate call to assembleDebug

aed9b17

ErgoPaySigningUiLogicTest added for static Ergo Pay requests #79

f4dedd4

ErgoPaySigningUiLogicTest added tests for dynamic Ergo Pay requests #79

5aa0fe0

ErgoPaySigningUiLogicTest fixed #79

40d2036

Appkit 4.0.6 released

713c8a3

Merge branch 'develop' into ergopay

5290f18

Ergo Pay handle request with address place holder #79

6329163

Ergo Pay handle request with address place holder for wallets with mu…

26add5f

…ltiple addresses #79

MrStahlfelge and others added 19 commits January 21, 2022 16:33

ErgoPaySigningFragment add label for current wallet and address #79

b18464e

ErgovPay reply to dApp when replyTo URL is set #79

dd19203

Ergo Pay new strings converted to ios #79

5876c6e

ErgoPay iOS implementation introduce ErgoPaySigningViewController #79

16c7b24

ErgoPay iOS implementation ErgoPaySigningViewController improve UI #79

1db8397

ErgoPay iOS implementation scan QR from wallet overview, support Ergo…

a687e9e

…Pay URIs #79

ErgoPay iOS implementation small fixes #79

dc0e954

iOS unconfirmed balance was still not always shown due to UIKit weird…

c10d528

…ness

Android add BigDecimal support to MoneyTextView and use it for ErgoAm…

2bccce9

…ount

ErgoPay p2pk placeholder might be URL encoded on some platforms #79

dcd5941

Android add missing error logging

cc6afe4

ErgoPay (and cold wallet) improve error message when transaction sign…

588e9af

…ing failed #79

Information on how to translate

794928e

Ergo Explorer does not accept request payment links with amount 0 any…

b387f8d

…more, omit it

Merge branch 'develop' into ergopay

b2962ad

Android add BigDecimal support to MoneyTextView => fix broken fiat va…

9fa9141

…lue displays

Merge pull request #84 from ergoplatform/ergopay

239fdf8

Ergopay reference implementation

Italian translation 2 (#83)

98885b6

* Italian translation * Fixed Italian translation for Android * Converted Italian for iOS Co-authored-by: Benjamin Schulte <[email protected]>

Build 1.6.2204

95aa8f9

MrStahlfelge requested a review from aslesarenko January 26, 2022 20:47

aslesarenko requested changes Jan 27, 2022

View reviewed changes

MrStahlfelge added 3 commits January 27, 2022 21:17

ErgoPay address feedback from code review, roll back wrong debug minify

c5fc6a8

#79

Italian translation review

2ec390c

ErgoPay address feedback from code review #79

6d33336

aslesarenko approved these changes Jan 28, 2022

View reviewed changes

MrStahlfelge merged commit c0fc2f0 into master Jan 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Version 1.6.2204 #85

Version 1.6.2204 #85

MrStahlfelge commented Jan 26, 2022

aslesarenko Jan 27, 2022

MrStahlfelge Jan 27, 2022

aslesarenko Jan 28, 2022

MrStahlfelge Jan 28, 2022

aslesarenko Jan 27, 2022

MrStahlfelge Jan 27, 2022

aslesarenko Jan 27, 2022

aslesarenko Jan 27, 2022

MrStahlfelge Jan 27, 2022

aslesarenko Jan 28, 2022

Version 1.6.2204 #85

Version 1.6.2204 #85

Conversation

MrStahlfelge commented Jan 26, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment