-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: interaction with some smart contract functions is broken in WebGL #19
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4783361
Fix byte array arguments not working in WebGL
skibitsky 324894a
Fix broken interaction with Solidity functions that return bool in WebGL
skibitsky 8f28543
Fix AccountController causing issues on WebGL
skibitsky fadfce9
Upgrade `@web3modal/cdn` to v5.0.11
skibitsky 3921a9a
Remove tx receipt polling on native
skibitsky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
Packages/com.walletconnect.web3modal/Runtime/Utils/ByteArrayJsonConverter.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| using System; | ||
| using Newtonsoft.Json; | ||
| using WalletConnectSharp.Common.Utils; | ||
|
|
||
| namespace WalletConnect.Web3Modal.Utils | ||
| { | ||
| /// <summary> | ||
| /// Converts byte array to hex string and vice versa. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// The default behavior of Newtonsoft.Json is to convert byte arrays to base64 strings. | ||
| /// </remarks> | ||
| public class ByteArrayJsonConverter : JsonConverter | ||
| { | ||
| public override bool CanConvert(Type objectType) | ||
| { | ||
| return objectType == typeof(byte[]); | ||
| } | ||
|
|
||
| public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) | ||
| { | ||
| if (reader.TokenType == JsonToken.Null) | ||
| return null; | ||
|
|
||
| if (reader.TokenType == JsonToken.String) | ||
| { | ||
| var hexString = (string)reader.Value; | ||
| return hexString.HexToByteArray(); | ||
| } | ||
|
|
||
| throw new JsonSerializationException("Expected byte array object value"); | ||
| } | ||
|
|
||
| public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) | ||
| { | ||
| if (value == null) | ||
| { | ||
| writer.WriteNull(); | ||
| return; | ||
| } | ||
|
|
||
| var byteArray = (byte[])value; | ||
| var hexString = byteArray.ToHex(true); | ||
|
|
||
| writer.WriteValue(hexString); | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
Packages/com.walletconnect.web3modal/Runtime/Utils/ByteArrayJsonConverter.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these features not supported on WebGL?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These event handler update ENS name, avatar, and account balance in native Unity UI. In WebGL
@web3modal/wagmitakes care of that, so these handler were just making duplicate requests to the blockchain api.