Merge pull request #53 from loomnetwork/sdk-update

SDK Update

Author: enlight

UnityProject/Assets/AssetStoreTools/Editor/AssetStoreToolsExtra.dll.meta

@@ -1,5 +1,5 @@
-#if !NET_4_6
- #error Loom SDK requires .NET 4.6. Please go to Build Settings -> Player Settings -> Configuration and set Scripting Runtime Version to .NET 4.6
+#if !NET_4_6 && !NET_STANDARD_2_0
+ #error Loom SDK requires .NET 4.x. Please go to Build Settings -> Player Settings -> Configuration and set Scripting Runtime Version to .NET 4.x Equivalent
 #endif
 
 using UnityEditor;

UnityProject/Assets/LoomSDK/Plugins/Loom.BouncyCastle.Crypto.dll

@@ -4,11 +4,12 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using Loom.Client.Internal;
 using UnityEngine;
 
 namespace Loom.Client.Internal
 {
- internal abstract class BaseRpcClient : IRpcClient, ILogProducer
+ public abstract class BaseRpcClient : IRpcClient, ILogProducer
  {
  private ILogger logger = NullLogger.Instance;
  private RpcConnectionState? lastConnectionState;
@@ -18,11 +19,14 @@ internal abstract class BaseRpcClient : IRpcClient, ILogProducer
  /// <summary>
  /// Logger to be used for logging, defaults to <see cref="NullLogger"/>.
  /// </summary>
- public virtual ILogger Logger {
- get {
+ public virtual ILogger Logger
+ {
+ get
+ {
  return this.logger;
  }
- set {
+ set
+ {
  if (value == null)
  {
  value = NullLogger.Instance;
@@ -58,27 +62,51 @@ protected void NotifyConnectionStateChanged()
  ConnectionStateChanged?.Invoke(this, state);
  }
 
- protected void AssertIsConnected() {
+ protected void HandleJsonRpcResponseError(JsonRpcResponse partialMsg)
+ {
+ if (partialMsg.Error.Data.EndsWith("Tx already exists in cache"))
+ {
+ throw new TxAlreadyExistsInCacheException(int.Parse(partialMsg.Error.Code), partialMsg.Error.Data);
+ }
+
+ throw new RpcClientException(
+ String.Format(
+ "JSON-RPC Error {0} ({1}): {2}",
+ partialMsg.Error.Code,
+ partialMsg.Error.Message,
+ partialMsg.Error.Data
+ ),
+ long.Parse(partialMsg.Error.Code),
+ this
+ );
+ }
+
+ protected void AssertIsConnected()
+ {
  RpcConnectionState connectionState = this.ConnectionState;
  if (connectionState == RpcConnectionState.Connected)
  return;
- 
+
  throw new RpcClientException(
  $"Client must be in {nameof(RpcConnectionState.Connected)} state, " +
- $"current state is {connectionState}");
+ $"current state is {connectionState}",
+ 1,
+ this
+ );
  }
 
- protected void AssertNotAlreadyConnectedOrConnecting() {
+ protected void AssertNotAlreadyConnectedOrConnecting()
+ {
  RpcConnectionState connectionState = this.ConnectionState;
 
  if (connectionState == RpcConnectionState.Connecting)
  {
- throw new RpcClientException("An attempt to connect while in process of connecting");
+ throw new RpcClientException("An attempt to connect while in process of connecting", 1, this);
  }
 
  if (connectionState == RpcConnectionState.Connected)
  {
- throw new RpcClientException("An attempt to connect when already connected");
+ throw new RpcClientException("An attempt to connect when already connected", 1, this);
  }
  }