Skip to content

Commit 1f135fd

Browse files
ecp42240xFirekeeper
ecp4224
and
0xFirekeeper
authored
Upgrade MetaMask SDK to 2.1.0 (#207)
Co-authored-by: 0xFirekeeper <[email protected]>
1 parent 61d0a57 commit 1f135fd

File tree

20 files changed

+401
-446
lines changed

20 files changed

+401
-446
lines changed

‎Assets/Thirdweb/Core/Plugins/MetaMask.NEthereum/MetaMaskClient.cs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ public MetaMaskClient(MetaMaskWallet metaMask)
1818
{
1919
this._metaMask = metaMask;
2020
}
21-
21+
2222
private static readonly Random rng = new Random();
23-
private static readonly DateTime UnixEpoch =
24-
new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
23+
private static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
2524

2625
public static long GenerateRpcId()
2726
{
@@ -38,18 +37,26 @@ protected override async Task<RpcResponseMessage> SendAsync(RpcRequestMessage me
3837
var arrayParameters = message.RawParameters as object[];
3938
var rawParameters = message.RawParameters;
4039

41-
var rpcRequestMessage = mapParameters != null
42-
? new RpcRequestMessage(id, message.Method, mapParameters)
43-
: arrayParameters != null
44-
? new RpcRequestMessage(id, message.Method, arrayParameters)
45-
: new RpcRequestMessage(id, message.Method, rawParameters);
46-
47-
var response = await _metaMask.Request(new MetaMaskEthereumRequest()
40+
var rpcRequestMessage =
41+
mapParameters != null
42+
? new RpcRequestMessage(id, message.Method, mapParameters)
43+
: arrayParameters != null
44+
? new RpcRequestMessage(id, message.Method, arrayParameters)
45+
: new RpcRequestMessage(id, message.Method, rawParameters);
46+
47+
var response = await _metaMask.Request(
48+
new MetaMaskEthereumRequest()
49+
{
50+
Id = rpcRequestMessage.Id.ToString(),
51+
Method = rpcRequestMessage.Method,
52+
Parameters = rpcRequestMessage.RawParameters
53+
}
54+
);
55+
56+
if (response == null || string.IsNullOrEmpty(response.ToString()))
4857
{
49-
Id = rpcRequestMessage.Id.ToString(),
50-
Method = rpcRequestMessage.Method,
51-
Parameters = rpcRequestMessage.RawParameters
52-
});
58+
return new RpcResponseMessage(rpcRequestMessage.Id, result: new JObject());
59+
}
5360

5461
try
5562
{
@@ -72,4 +79,4 @@ protected override Task<RpcResponseMessage[]> SendAsync(RpcRequestMessage[] requ
7279
return Task.WhenAll(requests.Select(r => SendAsync(r)));
7380
}
7481
}
75-
}
82+
}

‎Assets/Thirdweb/Core/Plugins/MetaMask/Editor/MetaMaskDependencies.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</repositories>
4141
</androidPackage>
4242
</androidPackages>
43-
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
43+
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
4444
<iosPods>
4545
<!-- Global set of sources to search for Cocoapods.
4646
These sources will be searched for all Cocoapods specified by
@@ -79,4 +79,4 @@
7979
Subspecs to include for the pod.
8080
-->
8181
</iosPods>
82-
</dependencies>
82+
</dependencies>

‎Assets/Thirdweb/Core/Plugins/MetaMask/Installer/Packages/main.unitypackage

9.85 KB
Binary file not shown.

‎Assets/Thirdweb/Core/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/netstandard2.0/evm.net.dll

2.5 KB
Binary file not shown.

‎Assets/Thirdweb/Core/Plugins/MetaMask/Plugins/Libraries/evm.net/Runtime/netstandard2.1/evm.net.dll

2.5 KB
Binary file not shown.

‎Assets/Thirdweb/Core/Plugins/MetaMask/Resources/MetaMask/Prefabs/UI/OTP Panel.prefab

Lines changed: 161 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GameObject:
1212
- component: {fileID: 2753398359487877976}
1313
- component: {fileID: 606823305735616010}
1414
- component: {fileID: 3273917818847182916}
15+
- component: {fileID: 4519065099083792754}
1516
- component: {fileID: 892906291545261737}
1617
m_Layer: 5
1718
m_Name: Disconnect Button
@@ -34,7 +35,9 @@ RectTransform:
3435
m_Children:
3536
- {fileID: 1738390782584415588}
3637
- {fileID: 4295949972570702562}
38+
- {fileID: 7631325021668220155}
3739
m_Father: {fileID: 4751590749222510982}
40+
m_RootOrder: 2
3841
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3942
m_AnchorMin: {x: 0.5, y: 0.5}
4043
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -136,6 +139,33 @@ MonoBehaviour:
136139
m_StringArgument:
137140
m_BoolArgument: 0
138141
m_CallState: 2
142+
--- !u!114 &4519065099083792754
143+
MonoBehaviour:
144+
m_ObjectHideFlags: 0
145+
m_CorrespondingSourceObject: {fileID: 0}
146+
m_PrefabInstance: {fileID: 0}
147+
m_PrefabAsset: {fileID: 0}
148+
m_GameObject: {fileID: 1183405676231325757}
149+
m_Enabled: 0
150+
m_EditorHideFlags: 0
151+
m_Script: {fileID: 11500000, guid: 718bb0aa974f2ad4ab6fb3474f3bd9b7, type: 3}
152+
m_Name:
153+
m_EditorClassIdentifier:
154+
NormalColor: {r: 0.011764707, g: 0.4901961, b: 0.83921576, a: 1}
155+
HoverColor: {r: 0.08235294, g: 0.39607847, b: 0.75294125, a: 1}
156+
ClickColor: {r: 0.011764707, g: 0.4901961, b: 0.83921576, a: 1}
157+
targetScale: 1.05
158+
timeToLerp: 0.25
159+
reverseValue: 0.95
160+
particle:
161+
- {fileID: 7631325021668220153}
162+
- {fileID: 4792671844479702506}
163+
buttonState: 0
164+
hoverSound: {fileID: 8300000, guid: 56f8946d86006ba42b3c4a329f310ed8, type: 3}
165+
clickSound: {fileID: 8300000, guid: 46cbfe6d75667c442b635e14528f8b17, type: 3}
166+
clickSoundNegative: {fileID: 8300000, guid: 91663e26f21345346ab496d6dde8b530, type: 3}
167+
DisableAnimation: 1
168+
DisableStartAnimation: 1
139169
--- !u!82 &892906291545261737
140170
AudioSource:
141171
m_ObjectHideFlags: 0
@@ -263,6 +293,7 @@ RectTransform:
263293
m_ConstrainProportionsScale: 0
264294
m_Children: []
265295
m_Father: {fileID: 5777876816244660639}
296+
m_RootOrder: 0
266297
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180}
267298
m_AnchorMin: {x: 0.5, y: 0.5}
268299
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -338,6 +369,7 @@ RectTransform:
338369
m_ConstrainProportionsScale: 0
339370
m_Children: []
340371
m_Father: {fileID: 856985863518395958}
372+
m_RootOrder: 0
341373
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
342374
m_AnchorMin: {x: 0.5, y: 0.5}
343375
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -413,6 +445,7 @@ RectTransform:
413445
m_ConstrainProportionsScale: 0
414446
m_Children: []
415447
m_Father: {fileID: 411431599298750533}
448+
m_RootOrder: 3
416449
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
417450
m_AnchorMin: {x: 0.5, y: 0.5}
418451
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -488,6 +521,7 @@ RectTransform:
488521
m_ConstrainProportionsScale: 0
489522
m_Children: []
490523
m_Father: {fileID: 411431599298750533}
524+
m_RootOrder: 2
491525
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
492526
m_AnchorMin: {x: 0.5, y: 0.5}
493527
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -622,6 +656,7 @@ RectTransform:
622656
- {fileID: 6018523544108943553}
623657
- {fileID: 8734063940264174270}
624658
m_Father: {fileID: 4751590749222510982}
659+
m_RootOrder: 3
625660
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
626661
m_AnchorMin: {x: 0.5, y: 0.5}
627662
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -659,6 +694,7 @@ RectTransform:
659694
m_ConstrainProportionsScale: 0
660695
m_Children: []
661696
m_Father: {fileID: 411431599298750533}
697+
m_RootOrder: 1
662698
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
663699
m_AnchorMin: {x: 0.5, y: 0.5}
664700
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -734,6 +770,7 @@ RectTransform:
734770
m_ConstrainProportionsScale: 0
735771
m_Children: []
736772
m_Father: {fileID: 4751590749222510982}
773+
m_RootOrder: 1
737774
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
738775
m_AnchorMin: {x: 0.5, y: 0.5}
739776
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -809,6 +846,7 @@ RectTransform:
809846
- {fileID: 8423982654817606664}
810847
- {fileID: 6747737215282434016}
811848
m_Father: {fileID: 4751590749222510982}
849+
m_RootOrder: 0
812850
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
813851
m_AnchorMin: {x: 0.5, y: 0.5}
814852
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -838,7 +876,6 @@ Transform:
838876
m_PrefabInstance: {fileID: 0}
839877
m_PrefabAsset: {fileID: 0}
840878
m_GameObject: {fileID: 6021340919975947382}
841-
serializedVersion: 2
842879
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
843880
m_LocalPosition: {x: 65.55328, y: 26.37143, z: -7.7266245}
844881
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -849,6 +886,7 @@ Transform:
849886
- {fileID: 5073039476282446024}
850887
- {fileID: 6015860287890676222}
851888
m_Father: {fileID: 4751590749222510982}
889+
m_RootOrder: 4
852890
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
853891
--- !u!1 &6086993058777616867
854892
GameObject:
@@ -881,6 +919,7 @@ RectTransform:
881919
m_ConstrainProportionsScale: 0
882920
m_Children: []
883921
m_Father: {fileID: 5489269269375405834}
922+
m_RootOrder: 1
884923
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
885924
m_AnchorMin: {x: 0.5, y: 0.5}
886925
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1020,6 +1059,7 @@ RectTransform:
10201059
- {fileID: 5489269269375405834}
10211060
- {fileID: 411431599298750533}
10221061
m_Father: {fileID: 0}
1062+
m_RootOrder: 0
10231063
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10241064
m_AnchorMin: {x: 0.5, y: 0.5}
10251065
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1084,6 +1124,7 @@ RectTransform:
10841124
m_ConstrainProportionsScale: 0
10851125
m_Children: []
10861126
m_Father: {fileID: 5489269269375405834}
1127+
m_RootOrder: 0
10871128
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10881129
m_AnchorMin: {x: 0.5, y: 0.5}
10891130
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1218,6 +1259,7 @@ RectTransform:
12181259
m_ConstrainProportionsScale: 0
12191260
m_Children: []
12201261
m_Father: {fileID: 411431599298750533}
1262+
m_RootOrder: 0
12211263
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12221264
m_AnchorMin: {x: 0.5, y: 0.5}
12231265
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1352,6 +1394,7 @@ RectTransform:
13521394
m_ConstrainProportionsScale: 0
13531395
m_Children: []
13541396
m_Father: {fileID: 5777876816244660639}
1397+
m_RootOrder: 1
13551398
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13561399
m_AnchorMin: {x: 0.5, y: 0.5}
13571400
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1427,6 +1470,7 @@ RectTransform:
14271470
m_ConstrainProportionsScale: 0
14281471
m_Children: []
14291472
m_Father: {fileID: 856985863518395958}
1473+
m_RootOrder: 1
14301474
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14311475
m_AnchorMin: {x: 0, y: 0}
14321476
m_AnchorMax: {x: 1, y: 1}
@@ -1530,3 +1574,119 @@ MonoBehaviour:
15301574
m_hasFontAssetChanged: 0
15311575
m_baseMaterial: {fileID: 0}
15321576
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
1577+
--- !u!1001 &1650063118572614679
1578+
PrefabInstance:
1579+
m_ObjectHideFlags: 0
1580+
serializedVersion: 2
1581+
m_Modification:
1582+
m_TransformParent: {fileID: 856985863518395958}
1583+
m_Modifications:
1584+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1585+
propertyPath: m_Pivot.x
1586+
value: 0.5
1587+
objectReference: {fileID: 0}
1588+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1589+
propertyPath: m_Pivot.y
1590+
value: 0.5
1591+
objectReference: {fileID: 0}
1592+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1593+
propertyPath: m_RootOrder
1594+
value: 2
1595+
objectReference: {fileID: 0}
1596+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1597+
propertyPath: m_AnchorMax.x
1598+
value: 0.5
1599+
objectReference: {fileID: 0}
1600+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1601+
propertyPath: m_AnchorMax.y
1602+
value: 0.5
1603+
objectReference: {fileID: 0}
1604+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1605+
propertyPath: m_AnchorMin.x
1606+
value: 0.5
1607+
objectReference: {fileID: 0}
1608+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1609+
propertyPath: m_AnchorMin.y
1610+
value: 0.5
1611+
objectReference: {fileID: 0}
1612+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1613+
propertyPath: m_SizeDelta.x
1614+
value: 100
1615+
objectReference: {fileID: 0}
1616+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1617+
propertyPath: m_SizeDelta.y
1618+
value: 100
1619+
objectReference: {fileID: 0}
1620+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1621+
propertyPath: m_LocalPosition.x
1622+
value: 0
1623+
objectReference: {fileID: 0}
1624+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1625+
propertyPath: m_LocalPosition.y
1626+
value: 0
1627+
objectReference: {fileID: 0}
1628+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1629+
propertyPath: m_LocalPosition.z
1630+
value: 63
1631+
objectReference: {fileID: 0}
1632+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1633+
propertyPath: m_LocalRotation.w
1634+
value: 1
1635+
objectReference: {fileID: 0}
1636+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1637+
propertyPath: m_LocalRotation.x
1638+
value: -0
1639+
objectReference: {fileID: 0}
1640+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1641+
propertyPath: m_LocalRotation.y
1642+
value: -0
1643+
objectReference: {fileID: 0}
1644+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1645+
propertyPath: m_LocalRotation.z
1646+
value: -0
1647+
objectReference: {fileID: 0}
1648+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1649+
propertyPath: m_AnchoredPosition.x
1650+
value: 0
1651+
objectReference: {fileID: 0}
1652+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1653+
propertyPath: m_AnchoredPosition.y
1654+
value: -19
1655+
objectReference: {fileID: 0}
1656+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1657+
propertyPath: m_LocalEulerAnglesHint.x
1658+
value: -90
1659+
objectReference: {fileID: 0}
1660+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1661+
propertyPath: m_LocalEulerAnglesHint.y
1662+
value: 0
1663+
objectReference: {fileID: 0}
1664+
- target: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1665+
propertyPath: m_LocalEulerAnglesHint.z
1666+
value: 0
1667+
objectReference: {fileID: 0}
1668+
- target: {fileID: 9151835634102167789, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1669+
propertyPath: m_Name
1670+
value: Click Particle
1671+
objectReference: {fileID: 0}
1672+
- target: {fileID: 9151835634102167790, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1673+
propertyPath: prewarm
1674+
value: 0
1675+
objectReference: {fileID: 0}
1676+
m_RemovedComponents: []
1677+
m_SourcePrefab: {fileID: 100100000, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1678+
--- !u!198 &4792671844479702506 stripped
1679+
ParticleSystem:
1680+
m_CorrespondingSourceObject: {fileID: 6081211963499930109, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1681+
m_PrefabInstance: {fileID: 1650063118572614679}
1682+
m_PrefabAsset: {fileID: 0}
1683+
--- !u!198 &7631325021668220153 stripped
1684+
ParticleSystem:
1685+
m_CorrespondingSourceObject: {fileID: 9151835634102167790, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1686+
m_PrefabInstance: {fileID: 1650063118572614679}
1687+
m_PrefabAsset: {fileID: 0}
1688+
--- !u!224 &7631325021668220155 stripped
1689+
RectTransform:
1690+
m_CorrespondingSourceObject: {fileID: 9151835634102167788, guid: 3dbebb147d43521499331681b6981bdd, type: 3}
1691+
m_PrefabInstance: {fileID: 1650063118572614679}
1692+
m_PrefabAsset: {fileID: 0}

‎Assets/Thirdweb/Core/Plugins/MetaMask/Resources/MetaMask/Transports/UnityUI.asset

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 20df40b080d9d4749ba22a363ec31ab8, type: 3}
1313
m_Name: UnityUI
1414
m_EditorClassIdentifier:
15-
spawnCanvas: 0
15+
userAgent: UnityUGUITransport/1.0.0
16+
_useDeeplink: 1
17+
spawnCanvas: 1
1618
metaMaskCanvas: {fileID: 6439922646294248678, guid: 9e03dfd5b166cc246ae7bbe9c62d6baf, type: 3}
17-
useUniversalLinks: 0

‎Assets/Thirdweb/Core/Plugins/MetaMask/Runtime/netstandard2.0/MetaMask.SDK.dll

7.5 KB
Binary file not shown.

‎Assets/Thirdweb/Core/Plugins/MetaMask/Runtime/netstandard2.1/MetaMask.SDK.dll

7.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)