EIP-0031 babel fees#204

Merged

aslesarenko merged 19 commits intodevelopfrom

eip-31-babelfees

Nov 10, 2022

Member

MrStahlfelge commented Nov 1, 2022

This adds babel fee support to appkit

ergoplatform/eips#54

MrStahlfelge added 5 commits

November 2, 2022 14:31


          EIP-31 Basic implementation of data classes and transaction to create…

44218b4

… fee box


          EIP-0031 add BabelFeeOperations.cancelBabelFeeContract

c8a613a


          EIP-0031 Add BabelFeeOperations#getBabelFeeTransactionBuilder

448ff3d


          EIP-0031 BabelFeeOperations#findBabelFeeBox

d440b20


          Fix Java 8 compile

fd5ac70

MrStahlfelge force-pushed the eip-31-babelfees branch from 8aeb0d5 to fd5ac70 Compare

November 2, 2022 13:35

MrStahlfelge changed the title ~~EIP-0031~~ EIP-0031 babel fees

MrStahlfelge marked this pull request as ready for review

November 3, 2022 09:29

MrStahlfelge requested a review from aslesarenko

November 3, 2022 09:29

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxContract.java

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxContract.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxContract.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxContract.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxBuilder.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxBuilder.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

aslesarenko requested changes

View reviewed changes

Member

aslesarenko left a comment

Please see comments.

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeBoxState.java Outdated


          eip-31-babelfees: typo fixes

daa5610

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeOperations.java

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeOperations.java Outdated

aslesarenko reviewed

View reviewed changes

lib-api/src/main/java/org/ergoplatform/appkit/babelfee/BabelFeeOperations.java Outdated

aslesarenko reviewed

View reviewed changes

appkit/src/test/scala/org/ergoplatform/appkit/BabelFeeSpec.scala Outdated


          eip-31-babelfees: some formatting fixes

61b6657

aslesarenko reviewed

View reviewed changes

appkit/src/test/scala/org/ergoplatform/appkit/BabelFeeSpec.scala Outdated

MrStahlfelge and others added 5 commits

November 3, 2022 19:32


          EIP-0031 use ErgoTreeSerializer.DefaultSerializer.substituteConstants…

5102a52

…, remove contract as ergotree is now in EIP


          Improve exception message

31f229f

Co-authored-by: Alexander Slesarenko <aslesarenko@users.noreply.github.com>


          EIP-0031 test for findBabelFeeBox, documentation changes, improve Bab…

77b7096

…elFeeOperations#findBabelFeeBox


          Merge branch 'transactionbuilder-addmethods' into eip-31-babelfees

6610b7f


          EIP-0031 use new methods from #205

933f8a7

MrStahlfelge marked this pull request as draft

November 5, 2022 10:59

MrStahlfelge added 2 commits

November 5, 2022 14:25


          EIP-0031 use ErgoTreeTemplate

93f2eb7


          Merge remote-tracking branch 'origin/develop' into eip-31-babelfees

c2c965a

MrStahlfelge marked this pull request as ready for review

November 7, 2022 14:14

aslesarenko reviewed

View reviewed changes

common/src/main/java/org/ergoplatform/appkit/ErgoTreeTemplate.java Outdated

aslesarenko reviewed

View reviewed changes

common/src/main/java/org/ergoplatform/appkit/ErgoTreeTemplate.java

aslesarenko and others added 5 commits

November 7, 2022 19:26


          transactionbuilder-addmethods: correct implementation of ErgoTreeTemp…

15fee58

…late


          transactionbuilder-addmethods: tests for ErgoTreeTemplate

fe3f0fd


          Added BabelFeeOperations.findBabelFeeBox parameter to search through …

9ec3f36

…all boxes, fixed errors regading ErgoTreeTemplate


          Linked to EIP version from PR

e4400fc


          eip-31-babelfees: fix box loading + formatting

93faed4

aslesarenko approved these changes

View reviewed changes

aslesarenko merged commit bad1163 into develop

aslesarenko deleted the eip-31-babelfees branch

November 10, 2022 18:35

aslesarenko mentioned this pull request

Release v5.0.0 (with Sigma v5.0.2 and ergo-wallet v5.0.2) #208

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet