From 6be40827f9333abe836af0d76c202d80b05cf56c Mon Sep 17 00:00:00 2001 From: Christopher Schuchardt Date: Sun, 12 Nov 2023 11:26:11 -0500 Subject: [PATCH 1/2] Revert "Inconsistent account naming (#305)" This reverts commit de55d4f17fa7c17b13014f4652a8d447dd3005ef. --- .gitignore | 1 - src/neoxp/Extensions/ExpressNodeExtensions.cs | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 54badaf5..224edd53 100644 --- a/.gitignore +++ b/.gitignore @@ -419,4 +419,3 @@ src/neoxp/default.neo-express src/trace/*.neo-trace src/worknet/default.neo-worknet src/worknet/data/* -/src/neoxp/Properties/launchSettings.json diff --git a/src/neoxp/Extensions/ExpressNodeExtensions.cs b/src/neoxp/Extensions/ExpressNodeExtensions.cs index 917a4149..2468d368 100644 --- a/src/neoxp/Extensions/ExpressNodeExtensions.cs +++ b/src/neoxp/Extensions/ExpressNodeExtensions.cs @@ -152,11 +152,10 @@ public static async Task GetContractParameterParserAsyn public static async Task> TryGetAccountHashAsync(this IExpressNode expressNode, ExpressChain chain, string name) { - if (name.StartsWith('@')) + if (name.StartsWith('#')) { - name = name[1..]; var contracts = await expressNode.ListContractsAsync().ConfigureAwait(false); - if (TryGetContractHash(contracts, name, out var contractHash)) + if (TryGetContractHash(contracts, name.Substring(1), out var contractHash)) { return contractHash; } From b073d934fc4437f82934d60eff052fb8b897cc77 Mon Sep 17 00:00:00 2001 From: Christopher Schuchardt Date: Sun, 12 Nov 2023 12:35:23 -0500 Subject: [PATCH 2/2] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 224edd53..3acd2bde 100644 --- a/.gitignore +++ b/.gitignore @@ -419,3 +419,4 @@ src/neoxp/default.neo-express src/trace/*.neo-trace src/worknet/default.neo-worknet src/worknet/data/* +src/neoxp/Properties/launchSettings.json