[#9] Pass signer account and sender address to support export txn for…

… read-only account
bloxbean · Mar 10, 2021 · 677b912 · 677b912
1 parent bb783a7
commit 677b912
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 79 deletions.
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/AssetCreateAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/AssetCreateAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.assets.service.AssetCacheService;
 import com.bloxbean.algodea.idea.assets.ui.AssetConfigurationDialog;
 import com.bloxbean.algodea.idea.core.action.BaseTxnAction;
@@ -62,10 +63,11 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             IdeaUtil.showNotification(project, getTitle(), "error getting asset creation parameters", NotificationType.ERROR, null);
         }
 
-        Account creatorAccount = dialog.getCreatorAddress();
-
-        if(creatorAccount == null) {
-            console.showErrorMessage("Creator account cannot be empty");
+        Account creatorAccount = dialog.getSignerAccount();
+        Address creatorAddress = dialog.getSignerAddress();
+        if (creatorAddress == null ||
+                (creatorAccount == null && RequestMode.EXPORT_UNSIGNED != dialog.getRequestMode())) {
+            console.showErrorMessage("Creator account cannot be empty or invalid mnemonic phrase.");
             IdeaUtil.showNotification(project, getTitle(), "Creator account cannot be empty", NotificationType.WARNING, null);
             return;
         }
@@ -86,7 +88,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 public void run(@NotNull ProgressIndicator indicator) {
                     console.showInfoMessage(String.format("Starting %s ...\n", getTxnCommand()));
                     try {
-                        Result<Long> result = assetTransactionService.createAsset(creatorAccount, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+                        Result<Long> result = assetTransactionService.createAsset(creatorAccount, creatorAddress, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
 
                         if(requestMode.equals(RequestMode.TRANSACTION)) {
                             if (result != null && result.getValue() != null) {

diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/BaseAssetOperationAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/BaseAssetOperationAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.assets.ui.AssetConfigurationDialog;
 import com.bloxbean.algodea.idea.core.action.BaseTxnAction;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
@@ -60,10 +61,11 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             IdeaUtil.showNotification(project, getTitle(), "error getting asset modification parameters", NotificationType.ERROR, null);
         }
 
-        Account senderAccount = dialog.getCreatorAddress(); //creator here is manager
-
-        if(senderAccount == null) {
-            console.showErrorMessage("Sender account cannot be empty");
+        Account signerAccount = dialog.getSignerAccount(); //creator here is manager
+        Address senderAddress = dialog.getSignerAddress();
+        if (senderAddress == null ||
+                (signerAccount == null && RequestMode.EXPORT_UNSIGNED != dialog.getRequestMode())) {
+            console.showErrorMessage("Sender account cannot be empty or invalid mnemonic phrase.");
             IdeaUtil.showNotification(project, getTitle(), "Sender account cannot be empty", NotificationType.WARNING, null);
             return;
         }
@@ -84,7 +86,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 public void run(@NotNull ProgressIndicator indicator) {
                     console.showInfoMessage(String.format("Starting %s ...\n", getTxnCommand()));
                     try {
-                        Result result = invokeAssetOperation(assetTransactionService, senderAccount, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+                        Result result = invokeAssetOperation(assetTransactionService, signerAccount, senderAddress, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
 
                         if(requestMode.equals(RequestMode.TRANSACTION)) {
                             if (result.isSuccessful()) {
@@ -121,6 +123,6 @@ public void run(@NotNull ProgressIndicator indicator) {
 
     protected abstract AssetActionType getActionType();
 
-    protected abstract Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender, AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters, RequestMode requestMode) throws Exception;
+    protected abstract Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender, AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters, RequestMode requestMode) throws Exception;
 
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/DestroyAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/DestroyAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -30,7 +31,7 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender, AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters, RequestMode requestMode) throws Exception {
-        return assetTransactionService.destroyAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender, AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters, RequestMode requestMode) throws Exception {
+        return assetTransactionService.destroyAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/FreezeAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/FreezeAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -30,9 +31,9 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender,
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender,
                                           AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters,
                                           RequestMode requestMode) throws Exception {
-        return assetTransactionService.freezeAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+        return assetTransactionService.freezeAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/ModifyAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/ModifyAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -28,10 +29,10 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender,
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender,
                                           AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters,
                                           RequestMode requestMode) throws Exception {
-        return assetTransactionService.modifyAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+        return assetTransactionService.modifyAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/OptInAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/OptInAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -27,9 +28,9 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender,
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender,
                                           AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters,
                                           RequestMode requestMode) throws Exception {
-        return assetTransactionService.optInAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+        return assetTransactionService.optInAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/RevokeAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/RevokeAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -30,10 +31,10 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender,
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender,
                                           AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters,
                                           RequestMode requestMode) throws Exception {
-        return assetTransactionService.revokeAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+        return assetTransactionService.revokeAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/action/UnFreezeAssetAction.java b/src/main/java/com/bloxbean/algodea/idea/assets/action/UnFreezeAssetAction.java
@@ -1,6 +1,7 @@
 package com.bloxbean.algodea.idea.assets.action;
 
 import com.algorand.algosdk.account.Account;
+import com.algorand.algosdk.crypto.Address;
 import com.bloxbean.algodea.idea.nodeint.common.RequestMode;
 import com.bloxbean.algodea.idea.nodeint.model.AssetTxnParameters;
 import com.bloxbean.algodea.idea.nodeint.model.Result;
@@ -28,9 +29,9 @@ protected String getTitle() {
     }
 
     @Override
-    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account sender,
+    protected Result invokeAssetOperation(AssetTransactionService assetTransactionService, Account signer, Address sender,
                                           AssetTxnParameters finalAssetTxnPrameters, TxnDetailsParameters txnDetailsParameters,
                                           RequestMode requestMode) throws Exception {
-        return assetTransactionService.unfreezeAsset(sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
+        return assetTransactionService.unfreezeAsset(signer, sender, finalAssetTxnPrameters, txnDetailsParameters, requestMode);
     }
 }
diff --git a/src/main/java/com/bloxbean/algodea/idea/assets/ui/AssetConfigurationDialog.java b/src/main/java/com/bloxbean/algodea/idea/assets/ui/AssetConfigurationDialog.java
@@ -345,7 +345,7 @@ private void populateWithAssetInfo(Asset asset, String assetId) {
                 }
             }
         }
-        
+
         //If freeze or unfreeze action, set freeze address
         if(AssetActionType.FREEZE.equals(actionType) || AssetActionType.UNFREEZE.equals(actionType)) {
             if (!StringUtil.isEmpty(asset.params.freeze)) {
@@ -596,10 +596,14 @@ public TransactionDtlsEntryForm getTransactionDtlsEntryForm() {
         return transactionDtlsEntryForm;
     }
 
-    public Account getCreatorAddress() {
+    public Account getSignerAccount() {
         return senderAddressInputForm.getAccount();
     }
 
+    public Address getSignerAddress() {
+        return senderAddressInputForm.getAddress();
+    }
+
     public Address getManagerAddress() {
         return managerAddressInputForm.getAddress();
     }