Skip to content

Commit 5c0cd50

Browse files
0xFirekeeper0xFirekeeper
authored
Firekeeper/native improvements (#45)
1 parent f7044fc commit 5c0cd50

File tree

6 files changed

+201
-51
lines changed

6 files changed

+201
-51
lines changed

‎Assets/Thirdweb/Core/Scripts/ThirdwebSDK.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ public class NativeSession
114114

115115
if (!Utils.IsWebGLBuild())
116116
{
117-
if (!chainOrRPC.StartsWith("https://"))
118-
throw new UnityException("Invalid RPC URL!");
119117
if (chainId == -1)
120118
throw new UnityException("Chain ID override required for native platforms!");
121119

120+
string rpc = !chainOrRPC.StartsWith("https://") ? $"https://{chainOrRPC}.rpc.thirdweb.com/339d65590ba0fa79e4c8be0af33d64eda709e13652acb02c6be63f5a1fbef9c3" : chainOrRPC;
121+
122122
nativeSession = new NativeSession();
123-
nativeSession.lastRPC = chainOrRPC;
123+
nativeSession.lastRPC = rpc;
124124
nativeSession.lastChainId = chainId;
125125
nativeSession.web3 = new Web3(nativeSession.lastRPC);
126126
}

‎Assets/Thirdweb/Examples/Prefabs/Prefab_ConnectWalletNative.prefab

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RectTransform:
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
m_AnchorMin: {x: 0, y: 0}
3737
m_AnchorMax: {x: 1, y: 1}
38-
m_AnchoredPosition: {x: 35, y: 0}
39-
m_SizeDelta: {x: -80, y: 0}
38+
m_AnchoredPosition: {x: 35.000103, y: 0}
39+
m_SizeDelta: {x: -67.0372, y: 0}
4040
m_Pivot: {x: 0.5, y: 0.5}
4141
--- !u!222 &4050659555749141618
4242
CanvasRenderer:
@@ -66,9 +66,7 @@ MonoBehaviour:
6666
m_OnCullStateChanged:
6767
m_PersistentCalls:
6868
m_Calls: []
69-
m_text: 'Device Wallet
70-
71-
(No Password)'
69+
m_text: "Device Wallet \n(No Password)"
7270
m_isRightToLeft: 0
7371
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
7472
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -111,7 +109,7 @@ MonoBehaviour:
111109
m_lineSpacingMax: 0
112110
m_paragraphSpacing: 0
113111
m_charWidthMaxAdj: 0
114-
m_enableWordWrapping: 1
112+
m_enableWordWrapping: 0
115113
m_wordWrappingRatios: 0.4
116114
m_overflowMode: 0
117115
m_linkedTextComponent: {fileID: 0}
@@ -1659,7 +1657,7 @@ MonoBehaviour:
16591657
m_OnCullStateChanged:
16601658
m_PersistentCalls:
16611659
m_Calls: []
1662-
m_Sprite: {fileID: 21300000, guid: 4a851c149a30f1e4b8088ab52b81444d, type: 3}
1660+
m_Sprite: {fileID: 21300000, guid: db8ba9cab203b1e459eceb66e03f1106, type: 3}
16631661
m_Type: 0
16641662
m_PreserveAspect: 1
16651663
m_FillCenter: 1
@@ -1915,8 +1913,8 @@ RectTransform:
19151913
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19161914
m_AnchorMin: {x: 0, y: 0}
19171915
m_AnchorMax: {x: 1, y: 1}
1918-
m_AnchoredPosition: {x: 35, y: 0}
1919-
m_SizeDelta: {x: -80, y: 0}
1916+
m_AnchoredPosition: {x: 35.000103, y: 0}
1917+
m_SizeDelta: {x: -67.0372, y: 0}
19201918
m_Pivot: {x: 0.5, y: 0.5}
19211919
--- !u!222 &7276129279747600625
19221920
CanvasRenderer:
@@ -1989,7 +1987,7 @@ MonoBehaviour:
19891987
m_lineSpacingMax: 0
19901988
m_paragraphSpacing: 0
19911989
m_charWidthMaxAdj: 0
1992-
m_enableWordWrapping: 1
1990+
m_enableWordWrapping: 0
19931991
m_wordWrappingRatios: 0.4
19941992
m_overflowMode: 0
19951993
m_linkedTextComponent: {fileID: 0}
@@ -3622,10 +3620,10 @@ MonoBehaviour:
36223620
walletButtons:
36233621
- wallet: 0
36243622
walletButton: {fileID: 8534970399124805823}
3625-
icon: {fileID: 21300000, guid: 4a851c149a30f1e4b8088ab52b81444d, type: 3}
3623+
icon: {fileID: 21300000, guid: db8ba9cab203b1e459eceb66e03f1106, type: 3}
36263624
- wallet: 1
36273625
walletButton: {fileID: 7851835104483634769}
3628-
icon: {fileID: 21300000, guid: 4a851c149a30f1e4b8088ab52b81444d, type: 3}
3626+
icon: {fileID: 21300000, guid: db8ba9cab203b1e459eceb66e03f1106, type: 3}
36293627
- wallet: 2
36303628
walletButton: {fileID: 7276129279946335584}
36313629
icon: {fileID: 21300000, guid: d5a5e5db03872be4c8c6303a906b29bd, type: 3}
@@ -4233,8 +4231,8 @@ RectTransform:
42334231
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
42344232
m_AnchorMin: {x: 0, y: 0}
42354233
m_AnchorMax: {x: 1, y: 1}
4236-
m_AnchoredPosition: {x: 35, y: 0}
4237-
m_SizeDelta: {x: -80, y: 0}
4234+
m_AnchoredPosition: {x: 35.000103, y: 0}
4235+
m_SizeDelta: {x: -67.0372, y: 0}
42384236
m_Pivot: {x: 0.5, y: 0.5}
42394237
--- !u!222 &8534970399212253025
42404238
CanvasRenderer:
@@ -4307,7 +4305,7 @@ MonoBehaviour:
43074305
m_lineSpacingMax: 0
43084306
m_paragraphSpacing: 0
43094307
m_charWidthMaxAdj: 0
4310-
m_enableWordWrapping: 1
4308+
m_enableWordWrapping: 0
43114309
m_wordWrappingRatios: 0.4
43124310
m_overflowMode: 0
43134311
m_linkedTextComponent: {fileID: 0}
@@ -4399,7 +4397,7 @@ MonoBehaviour:
43994397
m_OnCullStateChanged:
44004398
m_PersistentCalls:
44014399
m_Calls: []
4402-
m_Sprite: {fileID: 21300000, guid: 4a851c149a30f1e4b8088ab52b81444d, type: 3}
4400+
m_Sprite: {fileID: 21300000, guid: db8ba9cab203b1e459eceb66e03f1106, type: 3}
44034401
m_Type: 0
44044402
m_PreserveAspect: 1
44054403
m_FillCenter: 1

‎Assets/Thirdweb/Examples/Scenes/Scene_Prefabs.unity

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,10 @@ PrefabInstance:
654654
propertyPath: m_AnchorMax.y
655655
value: 0
656656
objectReference: {fileID: 0}
657+
- target: {fileID: 7216536800389251089, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
658+
propertyPath: m_AnchorMin.y
659+
value: 0
660+
objectReference: {fileID: 0}
657661
- target: {fileID: 7568917606152558407, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
658662
propertyPath: m_AnchorMax.y
659663
value: 0
@@ -920,7 +924,7 @@ PrefabInstance:
920924
objectReference: {fileID: 0}
921925
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
922926
propertyPath: m_Pivot.x
923-
value: 0.5
927+
value: 1
924928
objectReference: {fileID: 0}
925929
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
926930
propertyPath: m_Pivot.y
@@ -948,7 +952,7 @@ PrefabInstance:
948952
objectReference: {fileID: 0}
949953
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
950954
propertyPath: m_SizeDelta.x
951-
value: -870
955+
value: -820
952956
objectReference: {fileID: 0}
953957
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
954958
propertyPath: m_SizeDelta.y
@@ -984,11 +988,11 @@ PrefabInstance:
984988
objectReference: {fileID: 0}
985989
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
986990
propertyPath: m_AnchoredPosition.x
987-
value: 385
991+
value: -50
988992
objectReference: {fileID: 0}
989993
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
990994
propertyPath: m_AnchoredPosition.y
991-
value: -50
995+
value: -50.000015
992996
objectReference: {fileID: 0}
993997
- target: {fileID: 7702873693426126306, guid: 487e6840fccf4594ca24581d2b3e9d25, type: 3}
994998
propertyPath: m_LocalEulerAnglesHint.x
@@ -1291,7 +1295,7 @@ PrefabInstance:
12911295
objectReference: {fileID: 0}
12921296
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
12931297
propertyPath: m_Pivot.x
1294-
value: 0.5
1298+
value: 0
12951299
objectReference: {fileID: 0}
12961300
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
12971301
propertyPath: m_Pivot.y
@@ -1303,15 +1307,15 @@ PrefabInstance:
13031307
objectReference: {fileID: 0}
13041308
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13051309
propertyPath: m_AnchorMax.x
1306-
value: 0.5
1310+
value: 0
13071311
objectReference: {fileID: 0}
13081312
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13091313
propertyPath: m_AnchorMax.y
13101314
value: 1
13111315
objectReference: {fileID: 0}
13121316
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13131317
propertyPath: m_AnchorMin.x
1314-
value: 0.5
1318+
value: 0
13151319
objectReference: {fileID: 0}
13161320
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13171321
propertyPath: m_AnchorMin.y
@@ -1355,7 +1359,7 @@ PrefabInstance:
13551359
objectReference: {fileID: 0}
13561360
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13571361
propertyPath: m_AnchoredPosition.x
1358-
value: -735
1362+
value: 100
13591363
objectReference: {fileID: 0}
13601364
- target: {fileID: 7919151508908569201, guid: cabcef503d640254cabd5c380286bd9f, type: 3}
13611365
propertyPath: m_AnchoredPosition.y
@@ -1550,7 +1554,7 @@ PrefabInstance:
15501554
objectReference: {fileID: 0}
15511555
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15521556
propertyPath: m_Pivot.x
1553-
value: 0.5
1557+
value: 0
15541558
objectReference: {fileID: 0}
15551559
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15561560
propertyPath: m_Pivot.y
@@ -1562,15 +1566,15 @@ PrefabInstance:
15621566
objectReference: {fileID: 0}
15631567
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15641568
propertyPath: m_AnchorMax.x
1565-
value: 0.5
1569+
value: 0
15661570
objectReference: {fileID: 0}
15671571
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15681572
propertyPath: m_AnchorMax.y
15691573
value: 1
15701574
objectReference: {fileID: 0}
15711575
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15721576
propertyPath: m_AnchorMin.x
1573-
value: 0.5
1577+
value: 0
15741578
objectReference: {fileID: 0}
15751579
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
15761580
propertyPath: m_AnchorMin.y
@@ -1614,7 +1618,7 @@ PrefabInstance:
16141618
objectReference: {fileID: 0}
16151619
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
16161620
propertyPath: m_AnchoredPosition.x
1617-
value: -385
1621+
value: 450
16181622
objectReference: {fileID: 0}
16191623
- target: {fileID: 2964296963209109307, guid: e42e20bd4381cd942b5a4fcc5a80d4de, type: 3}
16201624
propertyPath: m_AnchoredPosition.y
@@ -2164,7 +2168,7 @@ PrefabInstance:
21642168
objectReference: {fileID: 0}
21652169
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21662170
propertyPath: m_Pivot.x
2167-
value: 0.5
2171+
value: 0
21682172
objectReference: {fileID: 0}
21692173
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21702174
propertyPath: m_Pivot.y
@@ -2176,15 +2180,15 @@ PrefabInstance:
21762180
objectReference: {fileID: 0}
21772181
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21782182
propertyPath: m_AnchorMax.x
2179-
value: 0.5
2183+
value: 0
21802184
objectReference: {fileID: 0}
21812185
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21822186
propertyPath: m_AnchorMax.y
21832187
value: 1
21842188
objectReference: {fileID: 0}
21852189
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21862190
propertyPath: m_AnchorMin.x
2187-
value: 0.5
2191+
value: 0
21882192
objectReference: {fileID: 0}
21892193
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
21902194
propertyPath: m_AnchorMin.y
@@ -2228,7 +2232,7 @@ PrefabInstance:
22282232
objectReference: {fileID: 0}
22292233
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
22302234
propertyPath: m_AnchoredPosition.x
2231-
value: -735
2235+
value: 100
22322236
objectReference: {fileID: 0}
22332237
- target: {fileID: 7176507137203527478, guid: dc1099fb7ffd06945bf7a3e7c257487b, type: 3}
22342238
propertyPath: m_AnchoredPosition.y
@@ -2280,14 +2284,6 @@ PrefabInstance:
22802284
m_Modification:
22812285
m_TransformParent: {fileID: 0}
22822286
m_Modifications:
2283-
- target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
2284-
propertyPath: relayerUrl
2285-
value: https://api.defender.openzeppelin.com/autotasks/7d795312-855d-4f02-900a-30c1dde211cb/runs/webhook/76da2beb-fbb1-4082-bbb8-d4429dedee81/E33wsMacq1ZDCQVHPTZVo
2286-
objectReference: {fileID: 0}
2287-
- target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
2288-
propertyPath: relayerForwarderAddress
2289-
value: 0x5001A14CA6163143316a7C614e30e6041033Ac20
2290-
objectReference: {fileID: 0}
22912287
- target: {fileID: 4404896360829706405, guid: 379ed01658d62a14484f953196ff19db, type: 3}
22922288
propertyPath: m_RootOrder
22932289
value: 3
@@ -2626,7 +2622,7 @@ PrefabInstance:
26262622
objectReference: {fileID: 0}
26272623
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26282624
propertyPath: m_Pivot.x
2629-
value: 0.5
2625+
value: 0
26302626
objectReference: {fileID: 0}
26312627
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26322628
propertyPath: m_Pivot.y
@@ -2638,15 +2634,15 @@ PrefabInstance:
26382634
objectReference: {fileID: 0}
26392635
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26402636
propertyPath: m_AnchorMax.x
2641-
value: 0.5
2637+
value: 0
26422638
objectReference: {fileID: 0}
26432639
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26442640
propertyPath: m_AnchorMax.y
26452641
value: 1
26462642
objectReference: {fileID: 0}
26472643
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26482644
propertyPath: m_AnchorMin.x
2649-
value: 0.5
2645+
value: 0
26502646
objectReference: {fileID: 0}
26512647
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26522648
propertyPath: m_AnchorMin.y
@@ -2690,7 +2686,7 @@ PrefabInstance:
26902686
objectReference: {fileID: 0}
26912687
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26922688
propertyPath: m_AnchoredPosition.x
2693-
value: -385
2689+
value: 450
26942690
objectReference: {fileID: 0}
26952691
- target: {fileID: 5516585226494414210, guid: 62e49a61f3b8faa488f48c2ac4becc7f, type: 3}
26962692
propertyPath: m_AnchoredPosition.y

‎Assets/Thirdweb/Examples/Scripts/Prefabs/ThirdwebManager.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ public class ThirdwebManager : MonoBehaviour
5252
public string relayerUrl = null;
5353
public string relayerForwarderAddress = null;
5454

55-
private string API_KEY = "339d65590ba0fa79e4c8be0af33d64eda709e13652acb02c6be63f5a1fbef9c3";
56-
5755
public ThirdwebSDK SDK;
5856

5957
public static ThirdwebManager Instance;
@@ -90,7 +88,6 @@ private void Awake()
9088
throw new UnityException("RPC overrides must start with https:// !");
9189
}
9290

93-
string rpc = string.IsNullOrEmpty(currentChain.rpcOverride) ? $"https://{currentChain.identifier}.rpc.thirdweb.com/{API_KEY}" : currentChain.rpcOverride;
9491
int chainId = int.Parse(currentChain.chainId);
9592

9693
ThirdwebSDK.Options options = new ThirdwebSDK.Options();
@@ -106,6 +103,6 @@ private void Awake()
106103
};
107104
}
108105

109-
SDK = new ThirdwebSDK(rpc, chainId, options);
106+
SDK = new ThirdwebSDK(currentChain.identifier, chainId, options);
110107
}
111108
}

‎Assets/Thirdweb/Examples/Sprites/UI/thirdweb-logo.png

107 KB
Loading

0 commit comments

Comments
 (0)