Merge pull request #75 from phantasma-io/development

Merge development to Master
phantasma-io-archive · Apr 6, 2023 · a96684f · a96684f
2 parents 3a0b7bb + 075a2e6
commit a96684f
Show file tree

Hide file tree

Showing 21 changed files with 3,964 additions and 391 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ Assets/Editor Default Resources/crosstales
 Assets/Plugins/crosstales
 
 .idea
+_builds/
diff --git a/Assets/Main.unity b/Assets/Main.unity
@@ -249,6 +249,7 @@ GameObject:
   - component: {fileID: 600298862}
   - component: {fileID: 600298863}
   - component: {fileID: 600298864}
+  - component: {fileID: 600298865}
   m_Layer: 0
   m_Name: Managers
   m_TagString: Untagged
@@ -363,6 +364,26 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   PluginName: com.phantasma.poltergeistmodule.MainActivity
+--- !u!114 &600298865
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 600298856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20d4aa1ca1bcd47ccb9527b384dbb25c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  githubOwner: phantasma-io
+  githubRepo: Poltergeist
+  currentVersion: 2.8.3
+  updatePanel: {fileID: 0}
+  backgroundTexture: {fileID: 2800000, guid: dca09f75ddb311c46a47911502c7cd1d, type: 3}
+  updateText: {fileID: 0}
+  updateButtonText: {fileID: 0}
+  updateAvailable: 0
 --- !u!1 &1470060600
 GameObject:
   m_ObjectHideFlags: 0
@@ -491,6 +512,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit

diff --git a/Assets/Phantasma/Phantasma.Business/src/Blockchain/Contracts.meta b/Assets/Phantasma/Phantasma.Business/src/Blockchain/Contracts.meta
diff --git a/Assets/Phantasma/Phantasma.Core/src/Domain/Transaction.cs b/Assets/Phantasma/Phantasma.Core/src/Domain/Transaction.cs
@@ -13,7 +13,7 @@ public sealed class Transaction : ITransaction, ISerializable
     {
         public readonly static Transaction Null = null;
 
-        public static readonly int DefaultGasLimit = 9999;
+        public static readonly int DefaultGasLimit = 10000;
 
         public byte[] Script { get; private set; }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,4 @@ Assets/Editor Default Resources/crosstales
		Assets/Plugins/crosstales

		.idea
		_builds/