Refactored alias creation code

quantumchainlabs · Jun 28, 2017 · 40be6ed · 40be6ed
1 parent 74a5845
commit 40be6ed
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/distr/wavesplatform-core.js b/distr/wavesplatform-core.js
@@ -1218,6 +1218,12 @@ Decimal.config({toExpNeg: -(Currency.WAVES.precision + 1)});
             MAINNET_ADDRESS_REGEXP: /^[a-zA-Z0-9]{35}$/
         });
 
+    angular
+        .module('waves.core.constants')
+        .constant('constants.features', {
+            ALIAS_VERSION: 2
+        });
+
     angular
         .module('waves.core.constants')
         .constant('constants.ui', {
@@ -1991,21 +1997,22 @@ Decimal.config({toExpNeg: -(Currency.WAVES.precision + 1)});
 (function () {
     'use strict';
 
-    var ALIAS_VERSION = 2;
-
-    function WavesAliasRequestService (constants, utilityService, cryptoService) {
+    function AliasRequestService(txConstants, featureConstants, utilityService, cryptoService) {
         function buildSignature(bytes, sender) {
             var privateKeyBytes = cryptoService.base58.decode(sender.privateKey);
-
             return cryptoService.nonDeterministicSign(privateKeyBytes, bytes);
         }
 
         function buildCreateAliasSignatureData (alias, senderPublicKey) {
-            var typeByte = [constants.CREATE_ALIAS_TRANSACTION_TYPE];
+            var typeByte = [txConstants.CREATE_ALIAS_TRANSACTION_TYPE];
             var publicKeyBytes = utilityService.base58StringToByteArray(senderPublicKey);
 
-            var stringPartBytes = utilityService.stringToByteArrayWithSize(alias.alias);
-            var tempBytes = [].concat([ALIAS_VERSION], [utilityService.getNetworkIdByte()], stringPartBytes);
+            var tempBytes = [].concat(
+                [featureConstants.ALIAS_VERSION],
+                [utilityService.getNetworkIdByte()],
+                utilityService.stringToByteArrayWithSize(alias.alias)
+            );
+
             var aliasBytes = utilityService.byteArrayWithSize(tempBytes);
             var feeBytes = utilityService.longToByteArray(alias.fee.toCoins());
             var timestampBytes = utilityService.longToByteArray(alias.time);
@@ -2032,11 +2039,11 @@ Decimal.config({toExpNeg: -(Currency.WAVES.precision + 1)});
         };
     }
 
-    WavesAliasRequestService.$inject = ['constants.transactions', 'utilityService', 'cryptoService'];
+    AliasRequestService.$inject = ['constants.transactions', 'constants.features', 'utilityService', 'cryptoService'];
 
     angular
         .module('waves.core.services')
-        .service('aliasRequestService', WavesAliasRequestService);
+        .service('aliasRequestService', AliasRequestService);
 })();
 
 (function () {

diff --git a/distr/wavesplatform-core.min.js b/distr/wavesplatform-core.min.js
diff --git a/src/core/alias.request.service.js b/src/core/alias.request.service.js
@@ -1,21 +1,22 @@
 (function () {
     'use strict';
 
-    var ALIAS_VERSION = 2;
-
-    function WavesAliasRequestService (constants, utilityService, cryptoService) {
+    function AliasRequestService(txConstants, featureConstants, utilityService, cryptoService) {
         function buildSignature(bytes, sender) {
             var privateKeyBytes = cryptoService.base58.decode(sender.privateKey);
-
             return cryptoService.nonDeterministicSign(privateKeyBytes, bytes);
         }
 
         function buildCreateAliasSignatureData (alias, senderPublicKey) {
-            var typeByte = [constants.CREATE_ALIAS_TRANSACTION_TYPE];
+            var typeByte = [txConstants.CREATE_ALIAS_TRANSACTION_TYPE];
             var publicKeyBytes = utilityService.base58StringToByteArray(senderPublicKey);
 
-            var stringPartBytes = utilityService.stringToByteArrayWithSize(alias.alias);
-            var tempBytes = [].concat([ALIAS_VERSION], [utilityService.getNetworkIdByte()], stringPartBytes);
+            var tempBytes = [].concat(
+                [featureConstants.ALIAS_VERSION],
+                [utilityService.getNetworkIdByte()],
+                utilityService.stringToByteArrayWithSize(alias.alias)
+            );
+
             var aliasBytes = utilityService.byteArrayWithSize(tempBytes);
             var feeBytes = utilityService.longToByteArray(alias.fee.toCoins());
             var timestampBytes = utilityService.longToByteArray(alias.time);
@@ -42,9 +43,9 @@
         };
     }
 
-    WavesAliasRequestService.$inject = ['constants.transactions', 'utilityService', 'cryptoService'];
+    AliasRequestService.$inject = ['constants.transactions', 'constants.features', 'utilityService', 'cryptoService'];
 
     angular
         .module('waves.core.services')
-        .service('aliasRequestService', WavesAliasRequestService);
+        .service('aliasRequestService', AliasRequestService);
 })();
diff --git a/src/core/core.constants.js b/src/core/core.constants.js
@@ -18,6 +18,12 @@
             MAINNET_ADDRESS_REGEXP: /^[a-zA-Z0-9]{35}$/
         });
 
+    angular
+        .module('waves.core.constants')
+        .constant('constants.features', {
+            ALIAS_VERSION: 2
+        });
+
     angular
         .module('waves.core.constants')
         .constant('constants.ui', {