Merge pull request #90 from kryptokrauts/dev

Release of v2.1.0

Author: mitch-lbw

.env

@@ -1,4 +1,4 @@
 AETERNITY_TAG=v5.0.1
 SOPHIA_COMPILER_TAG=v4.0.0
-AETERNAL_TAG=latest
+AETERNAL_TAG=0.11.1
 NGINX_TAG=1.13.8

api/swagger_aeternal.yml

@@ -221,7 +221,7 @@ paths:
           description: ''
           headers: {}
           schema:
-            type: object
+            $ref: '#/definitions/ActiveNames'
   "/names/{name}":
     get:
       description: Search for a name
@@ -240,7 +240,7 @@ paths:
           description: ''
           headers: {}
           schema:
-            type: object
+            $ref: '#/definitions/ActiveNames'
   "/names/active":
     get:
       description: Get a list of all the active names
@@ -271,7 +271,7 @@ paths:
           description: ''
           headers: {}
           schema:
-            type: object
+            $ref: '#/definitions/ActiveNames'
   "/names/auctions/active":
     get:
       description: Get a list of all the active name auctions
@@ -314,7 +314,7 @@ paths:
           description: ''
           headers: {}
           schema:
-            $ref: '#/definitions/ActiveAuctions'
+            $ref: '#/definitions/ActiveNameAuctions'
   "/names/auctions/active/count":
     get:
       description: Get a count of all the active name auctions
@@ -357,7 +357,7 @@ paths:
           description: ''
           headers: {}
           schema:
-            type: object
+            $ref: '#/definitions/ActiveNameAuctionsCount'
   "/names/auctions/bids/account/{account}":
     get:
       description: Get bids made by a given account
@@ -737,12 +737,48 @@ definitions:
   UInt:
     type: integer
     minimum: 0
+  EncodedHash:
+    # Base58Check encoded 32-byte hash (key block hash, micro block hash,
+    # root hash, etc)
+    # pattern: "^(kh|mh|bf|bx|bs|th)_[1-9A-HJ-NP-Za-km-z]*$"
+    description: 'Base58Check encoded tagged hash'
+    type: string
   EncodedPubkey:
     # Base58Check encoded 32-byte pubkey (account, contract, oracle, etc)
     # pattern: "^(ak|ok|ct|ch|pp)_[1-9A-HJ-NP-Za-km-z]*$"
     description: 'Base58Check encoded tagged pubkey'
     type: string
-  ActiveAuction:
+  EncodedValue:
+    # Base58Check encoded 32/64-byte value (signature, oracle query id, etc)
+    # pattern: "^(oq|sg|cm|st|nm)_[1-9A-HJ-NP-Za-km-z]*$"
+    description: 'Base58Check encoded tagged value'
+    type: string
+  EncodedByteArray:
+    # Base64Check encoded byte array
+    # pattern: "^(cb|tx|ck|cv|ba|ov|or|pi|ss|cs)_[0-9A-Za-z+/=]*$"
+    description: 'Base64Check encoded tagged byte array'
+    type: string
+  NamePointer:
+    type: object
+    properties:
+      key:
+        type: string
+      id:
+        $ref: '#/definitions/EncodedPubkey'
+    required:
+      - key
+      - id
+  ActiveNameAuctionsCount:
+    type: object
+    properties:
+      count:
+        $ref: '#/definitions/UInt'
+      result:
+        type: string
+    required:
+      - count
+      - result
+  ActiveNameAuction:
     type: object
     properties:
       name:
@@ -753,7 +789,44 @@ definitions:
         $ref: '#/definitions/UInt'
       winning_bidder:
         $ref: '#/definitions/EncodedPubkey'
-  ActiveAuctions:
+    required:
+      - name
+      - expiration
+      - winning_bid
+      - winning_bidder
+  ActiveNameAuctions:
+    type: array
+    items:
+      $ref: '#/definitions/ActiveNameAuction'
+  ActiveName:
+    type: object
+    properties:
+      name:
+        type: string
+      name_hash:
+        $ref: '#/definitions/EncodedValue'
+      tx_hash:
+        $ref: '#/definitions/EncodedHash'
+      created_at_height:
+        $ref: '#/definitions/UInt'
+      auction_end_height:
+        $ref: '#/definitions/UInt'
+      owner:
+        $ref: '#/definitions/EncodedPubkey'
+      expires_at:
+        $ref: '#/definitions/UInt'
+      pointers:
+        type: array
+        items:
+          $ref: '#/definitions/NamePointer'
+    required:
+      - name
+      - name_hash
+      - tx_hash
+      - created_at_height
+      - owner
+      - pointers
+  ActiveNames:
     type: array
     items:
-      $ref: '#/definitions/ActiveAuction'
+      $ref: '#/definitions/ActiveName'

docker-compose.yml

@@ -24,11 +24,11 @@ services:
       - "3080:3080"
 
   aeternal:
-    image: aeternity/aepp-middleware:${AETERNAL_TAG}
+    image: aeternity/aeternal:${AETERNAL_TAG}
     ports:
       - "8080:80"
       - "3020:3020"
-    entrypoint: ./docker/wait-for-it.sh node:3013 -- ./aepp-middleware -p -s -w
+    entrypoint: ./docker/wait-for-it.sh node:3013 -- ./aeternal -p -s -w
     environment:
       - NODE_URL=node:3013
       - AESOPHIA_URL=compiler:3080

docs/changelog.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [v2.1.0](https://github.com/kryptokrauts/aepp-sdk-java/releases/tag/v2.1.0)
+
+This release ships some fixes and enhancements. Additionally we renamed some attributes and model-classes. If you already used [v2.0.0](https://github.com/kryptokrauts/aepp-sdk-java/releases/tag/v2.0.0) it might be needed to fix these changes.
+
+### Refactoring
+- [#86](../../../issues/86) add "payable" attribute to AccountResult-model
+
+### Fixes
+- [#85](../../../issues/85) AeternalService: fix case-sensitive comparison of domains
+- [#88](../../../issues/88) replace Optional.orElse with Optional.orElseGet in the AccountServiceImpl
+
+### Enhancements
+- [#84](../../../issues/84) add missing ÆNS related AeternalService functionalities
+   - we added the possibility to query for active names
+   and search for a name (which allows to receive e.g. the owner of a name)
+- [#87](../../../issues/87) add support to receive byteCode for given contractId
+
 ## [v2.0.0](https://github.com/kryptokrauts/aepp-sdk-java/releases/tag/v2.0.0)
 
 ### Breaking changes and new features

gradle.properties

@@ -1,4 +1,4 @@
 organization=kryptokrauts
 group=com.kryptokrauts
 name=aepp-sdk-java
-version=2.0.0-SNAPSHOT
+version=2.1.0-SNAPSHOT

src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/AeternalServiceTest.java

@@ -1,8 +1,8 @@
 package com.kryptokrauts.aeternity.generated.api;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.kryptokrauts.aeternity.sdk.service.aeternal.domain.ActiveNameAuctionsResult;
 import io.vertx.ext.unit.TestContext;
-import java.util.Optional;
 import org.junit.Test;
 
 public class AeternalServiceTest extends BaseTest {
@@ -12,7 +12,7 @@ public void testStatus(TestContext context) {
     this.executeTest(
         context,
         t -> {
-          Object result = this.aeternityServiceNative.aeternal.blockingGetStatus();
+          Object result = this.aeternityServiceNative.aeternal.blockingGetMdwStatus();
           try {
             _logger.info("aeternal status: {}", objectMapper.writeValueAsString(result));
           } catch (JsonProcessingException e) {
@@ -26,18 +26,9 @@ public void testActiveAuctions(TestContext context) {
     this.executeTest(
         context,
         t -> {
-          Object result =
-              this.aeternityServiceNative.aeternal.blockingGetNameAuctionsActive(
-                  Optional.empty(),
-                  Optional.empty(),
-                  Optional.empty(),
-                  Optional.empty(),
-                  Optional.empty());
-          try {
-            _logger.info("active auctions: {}", objectMapper.writeValueAsString(result));
-          } catch (JsonProcessingException e) {
-            context.fail(e);
-          }
+          ActiveNameAuctionsResult result =
+              this.aeternityServiceNative.aeternal.blockingGetActiveNameAuctions();
+          _logger.info("active auctions: {}", result);
         });
   }
 }

src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/PaymentSplitterContractTest.java

@@ -132,11 +132,12 @@ public void a_deployPaymentSplitterTest(TestContext context) throws Throwable {
             DryRunTransactionResult dryRunResult = dryRunResults.getResults().get(0);
             context.assertEquals("ok", dryRunResult.getResult());
 
-            contractCreate
-                .toBuilder()
-                .gas(dryRunResult.getContractCallObject().getGasUsed())
-                .gasPrice(dryRunResult.getContractCallObject().getGasPrice())
-                .build();
+            contractCreate =
+                contractCreate
+                    .toBuilder()
+                    .gas(dryRunResult.getContractCallObject().getGasUsed())
+                    .gasPrice(dryRunResult.getContractCallObject().getGasPrice())
+                    .build();
 
             PostTransactionResult result =
                 aeternityServiceNative.transactions.blockingPostTransaction(contractCreate);
@@ -268,6 +269,110 @@ public void b_callPayAndSplitMethodTest(TestContext context) throws Throwable {
         });
   }
 
+  @Test
+  public void c_callGetTotalAmountSplitted(TestContext context) throws Throwable {
+    this.executeTest(
+        context,
+        t -> {
+          try {
+            BigDecimal paymentValue = UnitConversionUtil.toAettos("0", Unit.AE);
+            String calldata =
+                aeternityServiceNative.compiler.blockingEncodeCalldata(
+                    paymentSplitterSource, "getTotalAmountSplitted", null);
+            _logger.info("Contract ID: " + localDeployedContractId);
+
+            DryRunTransactionResults dryRunResults =
+                this.aeternityServiceNative.transactions.blockingDryRunTransactions(
+                    DryRunRequest.builder()
+                        .build()
+                        .account(
+                            DryRunAccountModel.builder()
+                                .publicKey(baseKeyPair.getPublicKey())
+                                .build())
+                        .transactionInputItem(
+                            ContractCallTransactionModel.builder()
+                                .callData(calldata)
+                                .gas(BigInteger.valueOf(1579000))
+                                .contractId(localDeployedContractId)
+                                .gasPrice(BigInteger.valueOf(BaseConstants.MINIMAL_GAS_PRICE))
+                                .amount(paymentValue.toBigInteger())
+                                .nonce(getNextBaseKeypairNonce())
+                                .callerId(baseKeyPair.getPublicKey())
+                                .ttl(ZERO)
+                                .virtualMachine(targetVM)
+                                .build()));
+
+            _logger.info("callContractAfterDryRunOnLocalNode: " + dryRunResults.toString());
+            context.assertEquals(1, dryRunResults.getResults().size());
+            DryRunTransactionResult dryRunResult = dryRunResults.getResults().get(0);
+            context.assertEquals("ok", dryRunResult.getResult());
+
+            Object decodedValue =
+                decodeCallResult(
+                    paymentSplitterSource,
+                    "getTotalAmountSplitted",
+                    dryRunResult.getContractCallObject().getReturnType(),
+                    dryRunResult.getContractCallObject().getReturnValue());
+
+            System.out.println(decodedValue);
+          } catch (Throwable e) {
+            context.fail(e);
+          }
+        });
+  }
+
+  @Test
+  public void d_callGetOwner(TestContext context) throws Throwable {
+    this.executeTest(
+        context,
+        t -> {
+          try {
+            BigDecimal paymentValue = UnitConversionUtil.toAettos("0", Unit.AE);
+            String calldata =
+                aeternityServiceNative.compiler.blockingEncodeCalldata(
+                    paymentSplitterSource, "getOwner", null);
+            _logger.info("Contract ID: " + localDeployedContractId);
+
+            DryRunTransactionResults dryRunResults =
+                this.aeternityServiceNative.transactions.blockingDryRunTransactions(
+                    DryRunRequest.builder()
+                        .build()
+                        .account(
+                            DryRunAccountModel.builder()
+                                .publicKey(baseKeyPair.getPublicKey())
+                                .build())
+                        .transactionInputItem(
+                            ContractCallTransactionModel.builder()
+                                .callData(calldata)
+                                .gas(BigInteger.valueOf(1579000))
+                                .contractId(localDeployedContractId)
+                                .gasPrice(BigInteger.valueOf(BaseConstants.MINIMAL_GAS_PRICE))
+                                .amount(paymentValue.toBigInteger())
+                                .nonce(getNextBaseKeypairNonce())
+                                .callerId(baseKeyPair.getPublicKey())
+                                .ttl(ZERO)
+                                .virtualMachine(targetVM)
+                                .build()));
+
+            _logger.info("callContractAfterDryRunOnLocalNode: " + dryRunResults.toString());
+            context.assertEquals(1, dryRunResults.getResults().size());
+            DryRunTransactionResult dryRunResult = dryRunResults.getResults().get(0);
+            context.assertEquals("ok", dryRunResult.getResult());
+
+            Object decodedValue =
+                decodeCallResult(
+                    paymentSplitterSource,
+                    "getOwner",
+                    dryRunResult.getContractCallObject().getReturnType(),
+                    dryRunResult.getContractCallObject().getReturnValue());
+
+            System.out.println(decodedValue);
+          } catch (Throwable e) {
+            context.fail(e);
+          }
+        });
+  }
+
   protected String createUnsignedContractCallTx(
       String callerId,
       BigInteger nonce,

src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/TestConstants.java

@@ -9,6 +9,8 @@ public interface TestConstants {
   String testnetAccountPrivateKey =
       "a7a695f999b1872acb13d5b63a830a8ee060ba688a478a08c6e65dfad8a01cd70bb4ed7927f97b51e1bcb5e1340d12335b2a2b12c8bc5221d63c4bcb39d41e61";
 
+  String aeternalTestnetURL = "https://testnet.aeternal.io/";
+
   String testnetURL = "https://sdk-testnet.aepps.com";
 
   String testContractSourceCode = "contract Identity =\n  entrypoint main(z : int) = z";