Merge branch 'master' into mode-system

neo-project · May 25, 2022 · a89a910 · a89a910
2 parents d0c0f30 + 5565c98
commit a89a910
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 50 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,9 +1,6 @@
 name: .NET Core Test
 
-on:
-  push:
-    branches: [master, develop]
-  pull_request:
+on: pull_request
 
 env:
   DOTNET_VERSION: 6.0.x

diff --git a/neo-cli/CLI/MainService.Node.cs b/neo-cli/CLI/MainService.Node.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2021 The Neo Project.
+// Copyright (C) 2016-2022 The Neo Project.
 // 
 // The neo-cli is free software distributed under the MIT software 
 // license, see the accompanying file LICENSE in the main directory of
@@ -87,7 +87,7 @@ private void OnShowStateCommand()
                     foreach (RemoteNode node in LocalNode.GetRemoteNodes().OrderByDescending(u => u.LastBlockIndex).Take(Console.WindowHeight - 2).ToArray())
                     {
                         ConsoleHelper.Info("  ip: ",
-                            $"{ node.Remote.Address,-15}\t",
+                            $"{node.Remote.Address,-15}\t",
                             "port: ",
                             $"{node.Remote.Port,-5}\t",
                             "listen: ",

diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2021 The Neo Project.
+// Copyright (C) 2016-2022 The Neo Project.
 // 
 // The neo-cli is free software distributed under the MIT software 
 // license, see the accompanying file LICENSE in the main directory of
@@ -23,8 +23,6 @@
 using Neo.VM;
 using Neo.VM.Types;
 using Neo.Wallets;
-using Neo.Wallets.NEP6;
-using Neo.Wallets.SQLite;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -129,28 +127,21 @@ public override void RunConsole()
 
         public void CreateWallet(string path, string password, bool createDefaultAccount = true)
         {
-            switch (Path.GetExtension(path))
-            {
-                case ".db3":
-                    CurrentWallet = UserWallet.Create(path, password, NeoSystem.Settings);
-                    break;
-                case ".json":
-                    CurrentWallet = new NEP6Wallet(path, NeoSystem.Settings);
-                    ((NEP6Wallet)CurrentWallet).Unlock(password);
-                    break;
-                default:
-                    ConsoleHelper.Warning("Wallet files in that format are not supported, please use a .json or .db3 file extension.");
-                    return;
+            Wallet wallet = Wallet.Create(null, path, password, NeoSystem.Settings);
+            if (wallet == null)
+            {
+                ConsoleHelper.Warning("Wallet files in that format are not supported, please use a .json or .db3 file extension.");
+                return;
             }
             if (createDefaultAccount)
             {
-                WalletAccount account = CurrentWallet.CreateAccount();
+                WalletAccount account = wallet.CreateAccount();
                 ConsoleHelper.Info("   Address: ", account.Address);
                 ConsoleHelper.Info("    Pubkey: ", account.GetKey().PublicKey.EncodePoint(true).ToHexString());
                 ConsoleHelper.Info("ScriptHash: ", $"{account.ScriptHash}");
             }
-            if (CurrentWallet is NEP6Wallet wallet)
-                wallet.Save();
+            wallet.Save();
+            CurrentWallet = wallet;
         }
 
         private IEnumerable<Block> GetBlocks(Stream stream, bool read_start = false)
@@ -248,10 +239,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
                 throw new ArgumentException(nameof(nefFilePath));
             }
 
-            using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Utility.StrictUTF8, false))
-            {
-                nef = stream.ReadSerializable<NefFile>();
-            }
+            nef = File.ReadAllBytes(nefFilePath).AsSerializable<NefFile>();
 
             ContractParameter dataParameter = null;
             if (data is not null)
@@ -317,10 +305,7 @@ private byte[] LoadUpdateScript(UInt160 scriptHash, string nefFilePath, string m
                 throw new ArgumentException(nameof(nefFilePath));
             }
 
-            using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Utility.StrictUTF8, false))
-            {
-                nef = stream.ReadSerializable<NefFile>();
-            }
+            nef = File.ReadAllBytes(nefFilePath).AsSerializable<NefFile>();
 
             ContractParameter dataParameter = null;
             if (data is not null)
@@ -379,22 +364,7 @@ public void OpenWallet(string path, string password)
                 throw new FileNotFoundException();
             }
 
-            switch (Path.GetExtension(path).ToLowerInvariant())
-            {
-                case ".db3":
-                    {
-                        CurrentWallet = UserWallet.Open(path, password, NeoSystem.Settings);
-                        break;
-                    }
-                case ".json":
-                    {
-                        NEP6Wallet nep6wallet = new NEP6Wallet(path, NeoSystem.Settings);
-                        nep6wallet.Unlock(password);
-                        CurrentWallet = nep6wallet;
-                        break;
-                    }
-                default: throw new NotSupportedException();
-            }
+            CurrentWallet = Wallet.Open(path, password, NeoSystem.Settings) ?? throw new NotSupportedException();
         }
 
         public async void Start(string[] args)
@@ -580,7 +550,7 @@ private void SendTransaction(byte[] script, UInt160 account = null, long gas = T
             try
             {
                 Transaction tx = CurrentWallet.MakeTransaction(snapshot, script, account, signers, maxGas: gas);
-                ConsoleHelper.Info("Invoking script with: ", $"'{tx.Script.ToBase64String()}'");
+                ConsoleHelper.Info("Invoking script with: ", $"'{Convert.ToBase64String(tx.Script)}'");
 
                 using (ApplicationEngine engine = ApplicationEngine.Run(tx.Script, snapshot, container: tx, settings: NeoSystem.Settings, gas: gas))
                 {

diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj
@@ -30,7 +30,7 @@
 </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.2.1" />
+    <PackageReference Include="Neo" Version="3.2.1-CI01355" />
   </ItemGroup>
 
   <ItemGroup>