Merge pull request #94 from ngdenterprise/neoxp-update

Update `neoxp` to RC3 build and misc. bug fixes

Author: djnicholson

CHANGELOG.md

@@ -10,6 +10,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 - C# sample contract now provides scaffolding for a ContractUpdate method
 - Fixed an issue where hashes were shown in an unintuitive byte order in some contexts
+- Updated Neo Express to latest RC3 build
+- Allow asset transfers to arbitrary wallets
 
 ## [2.1.45] - 2021-05-18
 

package.json

@@ -321,7 +321,7 @@
   },
   "scripts": {
     "bundle-nxp": "npm run bundle-nxp-download && npm run bundle-nxp-extract",
-    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.32-preview/Neo.Express.2.0.32-preview.nupkg\" -O deps/nxp/nxp.nupkg",
+    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.35-preview/Neo.Express.2.0.35-preview.nupkg\" -O deps/nxp/nxp.nupkg",
     "bundle-nxp-extract": "cd deps/nxp && extract-zip nxp.nupkg",
     "compile": "npm run compile-ext && npm run compile-panel",
     "compile-ext": "webpack --config src/extension/webpack.config.js --mode development",

src/extension/autoComplete.ts

@@ -233,21 +233,19 @@ export default class AutoComplete {
         for (const contractName of Object.keys(deployedContracts)) {
           const deployedContract = deployedContracts[contractName];
           const contractHash = deployedContract.hash;
-          const contractHashReversed = reverseBytes(contractHash);
-          if (!this.cachedManifests[contractHashReversed]) {
-            this.cachedManifests[contractHashReversed] =
-              await NeoExpressIo.contractGet(
-                this.neoExpress,
-                connection.blockchainIdentifier,
-                contractHash
-              );
+          if (!this.cachedManifests[contractHash]) {
+            this.cachedManifests[contractHash] = await NeoExpressIo.contractGet(
+              this.neoExpress,
+              connection.blockchainIdentifier,
+              contractHash
+            );
           }
           const manifest = this.cachedManifests[contractHash];
           if (manifest) {
-            newData.contractManifests[contractHashReversed] = manifest;
+            newData.contractManifests[contractHash] = manifest;
             newData.contractManifests[contractName] = manifest;
           }
-          newData.contractNames[contractHashReversed] = contractName;
+          newData.contractNames[contractHash] = contractName;
         }
       } catch (e) {
         Log.warn(

src/extension/commands/neoExpressCommands.ts

@@ -100,10 +100,11 @@ export default class NeoExpressCommands {
     );
     NeoExpressCommands.showResult(output);
     if (!output.isError) {
-      const blockchainIdentifier = await BlockchainIdentifier.fromNeoExpressConfig(
-        context.extensionPath,
-        configSavePath
-      );
+      const blockchainIdentifier =
+        await BlockchainIdentifier.fromNeoExpressConfig(
+          context.extensionPath,
+          configSavePath
+        );
       if (blockchainIdentifier) {
         await neoExpressInstanceManager.run(blockchainsTreeDataProvider, {
           blockchainIdentifier,
@@ -326,12 +327,17 @@ export default class NeoExpressCommands {
       return;
     }
     let receiver = commandArguments?.receiver;
+    const CUSTOM_ADDRESS = "(enter an address manually)";
     if (!receiver || walletNames.indexOf(receiver) === -1) {
       receiver = await IoHelpers.multipleChoice(
         `Transfer ${amount} ${asset} from '${sender}' to...`,
-        ...walletNames
+        ...walletNames,
+        CUSTOM_ADDRESS
       );
     }
+    if (receiver === CUSTOM_ADDRESS) {
+      receiver = await IoHelpers.enterString("Enter the recipients address");
+    }
     if (!receiver) {
       return;
     }

src/panel/components/tracker/ScriptToken.tsx

@@ -25,17 +25,18 @@ export default function ScriptToken({
     for (const contractHash of contractHashes) {
       const name = autoCompleteData.contractNames[contractHash] || "contract";
       const contractHashRaw = contractHash.replace(/^0x/g, "").toLowerCase();
-      if (token === contractHashRaw) {
-        return (
+      if (reverseBytes(token) === contractHashRaw) {
+        return [
           <span title={`Contract:\n ${contractHashRaw}\n  (${name})`}>
             <strong>
               {contractHashRaw.substring(0, 4)}..
               {contractHashRaw.substring(contractHashRaw.length - 4)} (
             </strong>
             <i>{name}</i>
             <strong>)</strong>
-          </span>
-        );
+          </span>,
+          reverseBytes(token),
+        ];
       }
     }
 
@@ -45,7 +46,7 @@ export default function ScriptToken({
           reverseBytes(token)
         );
         if (address.startsWith("N")) {
-          return (
+          return [
             <>
               <strong title={token}>
                 {token.substring(0, 4)}..
@@ -56,8 +57,9 @@ export default function ScriptToken({
                 addressNames={autoCompleteData.addressNames}
                 onClick={selectAddress}
               />
-            </>
-          );
+            </>,
+            token,
+          ];
         }
       } catch {}
     }
@@ -75,7 +77,7 @@ export default function ScriptToken({
           printableAscii = printableAscii && c >= 32 && c <= 126;
         }
         if (printableAscii) {
-          return (
+          return [
             <span title={`Detected text:\n0x${token} =\n"${asText}"`}>
               <strong>
                 {" "}
@@ -91,8 +93,9 @@ export default function ScriptToken({
               </strong>
               <i>{asText}</i>
               <strong>")</strong>
-            </span>
-          );
+            </span>,
+            token,
+          ];
         }
       }
     } catch {}
@@ -102,9 +105,9 @@ export default function ScriptToken({
       if (
         !!token.match(/^([a-f0-9][a-f0-9])+$/i) &&
         !isNaN(numericalValue) &&
-        numericalValue < Math.pow(2, 32)
+        numericalValue < Math.pow(2, 64)
       ) {
-        return (
+        return [
           <span title={`0x${token} = ${numericalValue}`}>
             <strong>
               {" "}
@@ -120,16 +123,16 @@ export default function ScriptToken({
             </strong>
             <i>{numericalValue}</i>
             <strong>)</strong>
-          </span>
-        );
+          </span>,
+          token,
+        ];
       }
     } catch {}
 
-    return null;
+    return [null, token];
   };
 
-  const unabbreviated = token;
-  let innerElement = getAbbreviatedElement();
+  let [innerElement, unabbreviated] = getAbbreviatedElement();
   const isAbbreviated = innerElement !== null;
   innerElement = innerElement || <>{token}</>;
   return (