Merge pull request #80 from phantasma-io/development

Development
phantasma-io-archive · May 5, 2023 · 956f3b1 · 956f3b1
2 parents a96684f + fea5190
commit 956f3b1
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 23 deletions.
diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml
@@ -0,0 +1,18 @@
+name: Acquire activation file
+on:
+  workflow_dispatch: {}
+jobs:
+  activation:
+    name: Request manual activation file 🔑
+    runs-on: ubuntu-latest
+    steps:
+      # Request manual activation file
+      - name: Request manual activation file
+        id: getManualLicenseFile
+        uses: game-ci/unity-request-activation-file@v2
+      # Upload artifact (Unity_v20XX.X.XXXX.alf)
+      - name: Expose as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
+          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
diff --git a/Assets/Phantasma/Phantasma.Core/src/Domain/WalletLink.cs b/Assets/Phantasma/Phantasma.Core/src/Domain/WalletLink.cs
@@ -37,6 +37,7 @@ public struct Balance : IAPIResult
             public string symbol;
             public string value;
             public int decimals;
+            public string[] ids;
         }
 
         public struct File: IAPIResult
@@ -132,7 +133,7 @@ private Connection ValidateRequest(string[] args)
 
         protected abstract void Authorize(string dapp, string token, int version, Action<bool, string> callback);
 
-        protected abstract void GetAccount(string platform, Action<Account, string> callback);
+        protected abstract void GetAccount(string platform, int version, Action<Account, string> callback);
 
         protected abstract void GetPeer(Action<string> callback);
 
@@ -259,7 +260,7 @@ private void HandleGetAccount(string[] args, Connection connection, int id, Acti
                 platform = "phantasma";
             }
 
-            GetAccount(platform, (account, error) => {
+            GetAccount(platform, connection.Version, (account, error) => {
                 if (error == null)
                 {
                     success = true;

diff --git a/Assets/Scripts/Wallet/AccountManager.cs b/Assets/Scripts/Wallet/AccountManager.cs
@@ -3602,7 +3602,7 @@ internal void SettleSwap(string sourcePlatform, string destPlatform, string symb
                     // We swap some tokens into KCAL
                     script = ScriptUtils.BeginScript()
                         .CallContract("interop", "SettleTransaction", transcodedAddress, PlatformKind.Ethereum.ToString().ToLower(), PlatformKind.Ethereum.ToString().ToLower(), ethTxHash)
-                        .CallContract("swap", "SwapFee", transcodedAddress, symbol, UnitConversion.ToBigInteger(0.1m, DomainSettings.FuelTokenDecimals))
+                        .CallContract("swap", "SwapFee", transcodedAddress, symbol, UnitConversion.ToBigInteger(1m, DomainSettings.FuelTokenDecimals))
                         .AllowGas(transcodedAddress, Address.Null, phaGasPrice, phaGasLimit)
                         .TransferBalance(symbol, transcodedAddress, phantasmaKeys.Address)
                         .SpendGas(transcodedAddress)
@@ -3653,7 +3653,7 @@ internal void SettleSwap(string sourcePlatform, string destPlatform, string symb
                     // We swap some tokens into KCAL
                     script = ScriptUtils.BeginScript()
                         .CallContract("interop", "SettleTransaction", transcodedAddress, PlatformKind.BSC.ToString().ToLower(), PlatformKind.BSC.ToString().ToLower(), ethTxHash)
-                        .CallContract("swap", "SwapFee", transcodedAddress, symbol, UnitConversion.ToBigInteger(0.1m, DomainSettings.FuelTokenDecimals))
+                        .CallContract("swap", "SwapFee", transcodedAddress, symbol, UnitConversion.ToBigInteger(1m, DomainSettings.FuelTokenDecimals))
                         .AllowGas(address, Address.Null, accountManager.Settings.feePrice, accountManager.Settings.feeLimit)
                         .TransferBalance(symbol, transcodedAddress, phantasmaKeys.Address)
                         .SpendGas(address)

diff --git a/Assets/Scripts/Wallet/WalletConnector.cs b/Assets/Scripts/Wallet/WalletConnector.cs
@@ -103,7 +103,7 @@ private void GetAddressesForTransaction(string subject, int id, Action<Address[]
 
         }
 
-        protected override void GetAccount(string platform, Action<Account, string> callback)
+        protected override void GetAccount(string platform, int version, Action<Account, string> callback)
         {
             var targetPlatform = RequestPlatform(platform);
             if (targetPlatform == PlatformKind.None)
@@ -124,31 +124,45 @@ protected override void GetAccount(string platform, Action<Account, string> call
 
             var state = accountManager.CurrentState;
 
-            if (state != null)
+            if (state == null)
             {
+                callback(new Account(), "not logged in, devs should implement this case!");
+                return;
+            }
+
+            IEnumerable<Balance> balances;
 
-                var balances = state.balances.Select(x => new Balance()
+            if (version >= 3)
+            {
+                balances = state.balances.Select(x => new Balance()
                 {
                     symbol = x.Symbol,
                     value = UnitConversion.ToBigInteger(x.Available, x.Decimals).ToString(),
                     decimals = x.Decimals,
+                    ids = x.Ids
                 });
-
-                callback(new Account()
-                {                    
-                    name = account.name,
-                    alias = account.name,
-                    address = AccountManager.Instance.MainState.address,
-                    balances = balances.ToArray(),
-                    avatar = state.avatarData,
-                    platform = platform,
-                    external = targetPlatform != PlatformKind.Phantasma ? state.address : ""
-                }, null);
-
-                return;
             }
+            else
+            {
+                balances = state.balances.Select(x => new Balance()
+                {
+                    symbol = x.Symbol,
+                    value = UnitConversion.ToBigInteger(x.Available, x.Decimals).ToString(),
+                    decimals = x.Decimals
+                });
+            }
+
+            callback(new Account()
+            {                    
+                name = account.name,
+                alias = account.name,
+                address = AccountManager.Instance.MainState.address,
+                balances = balances.ToArray(),
+                avatar = state.avatarData,
+                platform = platform,
+                external = targetPlatform != PlatformKind.Phantasma ? state.address : ""
+            }, null);
 
-            callback(new Account(), "not logged in, devs should implement this case!");
         }
 
         protected override void GetPeer(Action<string> callback)

diff --git a/Assets/Scripts/Wallet/WalletGUI.cs b/Assets/Scripts/Wallet/WalletGUI.cs
@@ -5516,7 +5516,7 @@ private void RequestFee(string swapSymbol, string feeSymbol, decimal min, Action
                                  var sb = new ScriptBuilder();
                                  if (feeSymbol == "KCAL")
                                  {
-                                     sb.CallContract("swap", "SwapFee", source, swapSymbol, UnitConversion.ToBigInteger(1m, decimalsSwap));
+                                     sb.CallContract("swap", "SwapFee", source, swapSymbol, UnitConversion.ToBigInteger(1m, decimals));
                                  }
                                  else
                                  {

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.8.5
+  bundleVersion: 2.8.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0