From 0b910a12be4d3778a931caf6214cdaf1750e24f5 Mon Sep 17 00:00:00 2001 From: Neilson K-S Date: Wed, 16 Aug 2023 09:58:38 -0700 Subject: [PATCH] fix: WebGLTemplate into correct folder and old metamask references --- Assets/MetamaskController.cs | 35 ++++++++++-------- Assets/WebGLTemplates.meta | 8 ++++ Assets/WebGLTemplates/Nethereum.meta | 8 ++++ Assets/WebGLTemplates/Nethereum/Build.meta | 8 ++++ .../Nethereum}/Build/WebGl.data.br | Bin .../Nethereum/Build/WebGl.data.br.meta | 7 ++++ .../Nethereum}/Build/WebGl.framework.js.br | Bin .../Build/WebGl.framework.js.br.meta | 7 ++++ .../Nethereum}/Build/WebGl.loader.js | 0 .../Nethereum/Build/WebGl.loader.js.meta | 7 ++++ .../Nethereum}/Build/WebGl.wasm.br | Bin .../Nethereum/Build/WebGl.wasm.br.meta | 7 ++++ .../Nethereum/TemplateData.meta | 8 ++++ .../Nethereum}/TemplateData/favicon.ico | Bin .../Nethereum/TemplateData/favicon.ico.meta | 7 ++++ .../TemplateData/fullscreen-button.png | Bin .../TemplateData/fullscreen-button.png.meta | 7 ++++ .../TemplateData/progress-bar-empty-dark.png | Bin .../progress-bar-empty-dark.png.meta | 7 ++++ .../TemplateData/progress-bar-empty-light.png | Bin .../progress-bar-empty-light.png.meta | 7 ++++ .../TemplateData/progress-bar-full-dark.png | Bin .../progress-bar-full-dark.png.meta | 7 ++++ .../TemplateData/progress-bar-full-light.png | Bin .../progress-bar-full-light.png.meta | 7 ++++ .../Nethereum}/TemplateData/style.css | 0 .../Nethereum/TemplateData/style.css.meta | 7 ++++ .../TemplateData/unity-logo-dark.png | Bin .../TemplateData/unity-logo-dark.png.meta | 7 ++++ .../TemplateData/unity-logo-light.png | Bin .../TemplateData/unity-logo-light.png.meta | 7 ++++ .../Nethereum}/TemplateData/webgl-logo.png | Bin .../TemplateData/webgl-logo.png.meta | 7 ++++ .../WebGLTemplates/Nethereum}/index.html | 0 .../WebGLTemplates/Nethereum/index.html.meta | 7 ++++ 35 files changed, 156 insertions(+), 16 deletions(-) create mode 100644 Assets/WebGLTemplates.meta create mode 100644 Assets/WebGLTemplates/Nethereum.meta create mode 100644 Assets/WebGLTemplates/Nethereum/Build.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/Build/WebGl.data.br (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/Build/WebGl.framework.js.br (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/Build/WebGl.loader.js (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/Build/WebGl.wasm.br (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br.meta create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/favicon.ico (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/fullscreen-button.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/progress-bar-empty-dark.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/progress-bar-empty-light.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/progress-bar-full-dark.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/progress-bar-full-light.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/style.css (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/style.css.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/unity-logo-dark.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/unity-logo-light.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/TemplateData/webgl-logo.png (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png.meta rename {WebGl => Assets/WebGLTemplates/Nethereum}/index.html (100%) create mode 100644 Assets/WebGLTemplates/Nethereum/index.html.meta diff --git a/Assets/MetamaskController.cs b/Assets/MetamaskController.cs index 1c8a11d..ce7f150 100644 --- a/Assets/MetamaskController.cs +++ b/Assets/MetamaskController.cs @@ -181,31 +181,34 @@ private IEnumerator GetDeploymentSmartContractAddressFromReceipt(string transact private void MetamaskConnectButton_Clicked() { + Debug.Log("Connect"); _lblError.visible = false; -#if !DEBUG - if (MetamaskInterop.IsMetamaskAvailable()) + + Debug.Log("Connect Run"); + + if (MetamaskWebglInterop.IsMetamaskAvailable()) { - MetamaskInterop.EnableEthereum(gameObject.name, nameof(EthereumEnabled), nameof(DisplayError)); + MetamaskWebglInterop.EnableEthereum(gameObject.name, nameof(EthereumEnabled), nameof(DisplayError)); } else { DisplayError("Metamask is not available, please install it"); } -#endif + } public void EthereumEnabled(string addressSelected) { -#if !DEBUG + if (!_isMetamaskInitialised) { - MetamaskInterop.EthereumInit(gameObject.name, nameof(NewAccountSelected), nameof(ChainChanged)); - MetamaskInterop.GetChainId(gameObject.name, nameof(ChainChanged), nameof(DisplayError)); + MetamaskWebglInterop.EthereumInit(gameObject.name, nameof(NewAccountSelected), nameof(ChainChanged)); + MetamaskWebglInterop.GetChainId(gameObject.name, nameof(ChainChanged), nameof(DisplayError)); _isMetamaskInitialised = true; } NewAccountSelected(addressSelected); -#endif + } public void ChainChanged(string chainId) @@ -250,17 +253,17 @@ private IEnumerator GetBlockNumber() public IUnityRpcRequestClientFactory GetUnityRpcRequestClientFactory() { -#if !DEBUG - if (MetamaskInterop.IsMetamaskAvailable()) + + if (MetamaskWebglInterop.IsMetamaskAvailable()) { - return new MetamaskRequestRpcClientFactory(_selectedAccountAddress, null, 1000); + return new MetamaskWebglCoroutineRequestRpcClientFactory(_selectedAccountAddress, null, 1000); } else { DisplayError("Metamask is not available, please install it"); return null; } -#endif + _selectedAccountAddress = "0x12890D2cce102216644c59daE5baed380d84830c"; return new UnityWebRequestRpcClientFactory("http://localhost:8545"); } @@ -268,17 +271,17 @@ public IUnityRpcRequestClientFactory GetUnityRpcRequestClientFactory() public IContractTransactionUnityRequest GetContractTransactionUnityRequest() { -#if !DEBUG - if (MetamaskInterop.IsMetamaskAvailable()) + + if (MetamaskWebglInterop.IsMetamaskAvailable()) { - return new MetamaskTransactionUnityRequest(_selectedAccountAddress, GetUnityRpcRequestClientFactory()); + return new MetamaskTransactionCoroutineUnityRequest (_selectedAccountAddress, GetUnityRpcRequestClientFactory()); } else { DisplayError("Metamask is not available, please install it"); return null; } -#endif + _selectedAccountAddress = "0x12890D2cce102216644c59daE5baed380d84830c"; return new TransactionSignedUnityRequest("http://localhost:8545", "0xb5b1870957d373ef0eeffecc6e4812c0fd08f554b37b233526acc331bf1544f7", 444444444500); } diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta new file mode 100644 index 0000000..ab95958 --- /dev/null +++ b/Assets/WebGLTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ae5cdc43f7f126449efe7949d947595 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/Nethereum.meta b/Assets/WebGLTemplates/Nethereum.meta new file mode 100644 index 0000000..13a735a --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64c8b85e021aad94e9a262f9efadb844 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/Nethereum/Build.meta b/Assets/WebGLTemplates/Nethereum/Build.meta new file mode 100644 index 0000000..dbaaf61 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/Build.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8ef382579706fe4ebc7d2396b9d809d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/Build/WebGl.data.br b/Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br similarity index 100% rename from WebGl/Build/WebGl.data.br rename to Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br diff --git a/Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br.meta b/Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br.meta new file mode 100644 index 0000000..494177b --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/Build/WebGl.data.br.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6009847490b2d24f9e4640f699615f2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/Build/WebGl.framework.js.br b/Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br similarity index 100% rename from WebGl/Build/WebGl.framework.js.br rename to Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br diff --git a/Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br.meta b/Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br.meta new file mode 100644 index 0000000..7b35be1 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/Build/WebGl.framework.js.br.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 64075c1461940544899874877e481191 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/Build/WebGl.loader.js b/Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js similarity index 100% rename from WebGl/Build/WebGl.loader.js rename to Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js diff --git a/Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js.meta b/Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js.meta new file mode 100644 index 0000000..11bcbc2 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/Build/WebGl.loader.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc909763f7765684986b1f0ca0939cd4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/Build/WebGl.wasm.br b/Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br similarity index 100% rename from WebGl/Build/WebGl.wasm.br rename to Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br diff --git a/Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br.meta b/Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br.meta new file mode 100644 index 0000000..990dd99 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/Build/WebGl.wasm.br.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a1d88e56add58b64b80bf5378f0877c3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData.meta b/Assets/WebGLTemplates/Nethereum/TemplateData.meta new file mode 100644 index 0000000..97efcf2 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75cd5d43e2d455e4085f615dc0f0a9ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/favicon.ico b/Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico similarity index 100% rename from WebGl/TemplateData/favicon.ico rename to Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico.meta new file mode 100644 index 0000000..1eaaeb6 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/favicon.ico.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5702b48eba4acdd4f93fc5261427949c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/fullscreen-button.png b/Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png similarity index 100% rename from WebGl/TemplateData/fullscreen-button.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png.meta new file mode 100644 index 0000000..0142d8c --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/fullscreen-button.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1a3da2dcef924a24ca1568e06ee97779 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/progress-bar-empty-dark.png b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png similarity index 100% rename from WebGl/TemplateData/progress-bar-empty-dark.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png.meta new file mode 100644 index 0000000..bea16bd --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-dark.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e636e8a056ef18c4e8bb6652ea5dbca5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/progress-bar-empty-light.png b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png similarity index 100% rename from WebGl/TemplateData/progress-bar-empty-light.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png.meta new file mode 100644 index 0000000..e4442db --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-empty-light.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b972978af09c4b84bb3119cc0d13cccd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/progress-bar-full-dark.png b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png similarity index 100% rename from WebGl/TemplateData/progress-bar-full-dark.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png.meta new file mode 100644 index 0000000..7971e89 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-dark.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 256d34bce157ca54cad9a49183e352dc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/progress-bar-full-light.png b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png similarity index 100% rename from WebGl/TemplateData/progress-bar-full-light.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png.meta new file mode 100644 index 0000000..e649be3 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/progress-bar-full-light.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a87c8eb5c0bccc8449a9a3068b6fb9bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/style.css b/Assets/WebGLTemplates/Nethereum/TemplateData/style.css similarity index 100% rename from WebGl/TemplateData/style.css rename to Assets/WebGLTemplates/Nethereum/TemplateData/style.css diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/style.css.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/style.css.meta new file mode 100644 index 0000000..7383313 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/style.css.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 26dd642de0e8c8346b8f8da047ecc5d9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/unity-logo-dark.png b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png similarity index 100% rename from WebGl/TemplateData/unity-logo-dark.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png.meta new file mode 100644 index 0000000..25aef74 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-dark.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ffdee9f39bcc4d4418c37cc619fb6b3e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/unity-logo-light.png b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png similarity index 100% rename from WebGl/TemplateData/unity-logo-light.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png.meta new file mode 100644 index 0000000..8e7e285 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/unity-logo-light.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e4402264457a1a849b9039771e6be8b0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/TemplateData/webgl-logo.png b/Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png similarity index 100% rename from WebGl/TemplateData/webgl-logo.png rename to Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png diff --git a/Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png.meta b/Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png.meta new file mode 100644 index 0000000..8fb37e4 --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/TemplateData/webgl-logo.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27598d71c00edc140ba8613c2776feda +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/WebGl/index.html b/Assets/WebGLTemplates/Nethereum/index.html similarity index 100% rename from WebGl/index.html rename to Assets/WebGLTemplates/Nethereum/index.html diff --git a/Assets/WebGLTemplates/Nethereum/index.html.meta b/Assets/WebGLTemplates/Nethereum/index.html.meta new file mode 100644 index 0000000..b171c9d --- /dev/null +++ b/Assets/WebGLTemplates/Nethereum/index.html.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab3a71f84cecb0f44a70f3ff517bf801 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: