Smart contracts refactor

Author: Relfos

Phantasma.API/NexusAPI.cs

@@ -7,7 +7,6 @@
 using Phantasma.Cryptography;
 using Phantasma.Numerics;
 using Phantasma.Core;
-using Phantasma.Contracts.Native;
 using Phantasma.Blockchain.Contracts;
 using Phantasma.VM;
 using Phantasma.Storage;
@@ -1604,7 +1603,7 @@ public IAPIResult GetABI([APIParameter("Chain address or name where the market i
                 return new ErrorResult { error = "Contract not found" };
             }
 
-            var contract = this.Nexus.GetContractByName(Nexus.RootStorage, contractName);
+            var contract = this.Nexus.GetContractByName(contractName);
             return FillABI(contractName, contract.ABI);
         }
 

Phantasma.Blockchain/Chain.cs

@@ -16,8 +16,6 @@
 using Phantasma.Domain;
 using Phantasma.Core.Utils;
 using Phantasma.Core.Performance;
-using Phantasma.Contracts;
-using Phantasma.Contracts.Native;
 
 namespace Phantasma.Blockchain
 {
@@ -64,7 +62,7 @@ public IContract[] GetContracts(StorageContext storage)
         {
             var contractList = new StorageList(GetContractListKey(), storage);
             var addresses = contractList.All<Address>();
-            return addresses.Select(x => Nexus.GetContractByAddress(Nexus.RootStorage, x)).ToArray();
+            return addresses.Select(x => Nexus.GetContractByAddress(x)).ToArray();
         }
 
         public override string ToString()
@@ -424,14 +422,13 @@ internal ExecutionContext GetContractContext(StorageContext storage, SmartContra
                 throw new ChainException($"contract {contract.Name} not deployed on {Name} chain");
             }
 
-            // TODO this needs to suport non-native contexts too..
-            var context = new NativeExecutionContext(contract);
+            var context = contract.CreateContext();
             return context;
         }
 
         public VMObject InvokeContract(StorageContext storage, string contractName, string methodName, Timestamp time, params object[] args)
         {
-            var contract = Nexus.GetContractByName(storage, contractName);
+            var contract = Nexus.GetContractByName(contractName);
             Throw.IfNull(contract, nameof(contract));
 
             var script = ScriptUtils.BeginScript().CallContract(contractName, methodName, args).EndScript();
@@ -574,7 +571,7 @@ public bool IsContractDeployed(StorageContext storage, Address contractAddress)
             return storage.Has(key);
         }
 
-        private bool DeployContractScript(StorageContext storage, Address contractAddress, byte[] script)
+        public bool DeployContractScript(StorageContext storage, Address contractAddress, byte[] script)
         {
             var key = GetContractDeploymentKey(contractAddress);
             if (storage.Has(key))
@@ -590,23 +587,22 @@ private bool DeployContractScript(StorageContext storage, Address contractAddres
             return true;
         }
 
-        public bool DeployNativeContract(StorageContext storage, Address contractAddress)
+        public SmartContract GetContractByName(StorageContext storage, string name)
         {
-            var contract = Nexus.GetContractByAddress(storage, contractAddress);
-            if (contract == null)
+            if (Nexus.IsNativeContract(name))
             {
-                return false;
+                return Nexus.GetContractByName(name);
             }
 
-            DeployContractScript(storage, contractAddress, new byte[] { (byte)Opcode.RET });
-            return true;
-        }
+            var address = SmartContract.GetAddressForName(name);
+            var key = GetContractDeploymentKey(address);
+            if (!storage.Has(key))
+            {
+                return null;
+            }
 
-        public bool DeployContract(StorageContext storage, byte[] script)
-        {
-            var contractAddress = Address.FromHash(script);
-            DeployContractScript(storage, contractAddress, script);
-            return true;
+            var script = storage.Get(key);
+            return new CustomContract(name, script);
         }
         #endregion
 

Phantasma.Contracts/Native/AccountContract.cs Phantasma.Blockchain/Contracts/AccountContract.cs

@@ -3,7 +3,7 @@
 using Phantasma.Numerics;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public sealed class AccountContract : NativeContract
     {

Phantasma.Contracts/Native/BlockContract.cs Phantasma.Blockchain/Contracts/BlockContract.cs

@@ -4,7 +4,7 @@
 using Phantasma.Storage;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public sealed class BlockContract: NativeContract
     {

Phantasma.Contracts/Native/ConsensusContract.cs Phantasma.Blockchain/Contracts/ConsensusContract.cs

@@ -6,7 +6,7 @@
 using Phantasma.Storage;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public enum ConsensusMode
     {

Phantasma.Contracts/Native/ExchangeContract.cs Phantasma.Blockchain/Contracts/ExchangeContract.cs

@@ -5,12 +5,12 @@
 using Phantasma.Numerics;
 using Phantasma.Storage.Context;
 using System;
-using static Phantasma.Contracts.Native.ExchangeOrderSide;
-using static Phantasma.Contracts.Native.ExchangeOrderType;
+using static Phantasma.Blockchain.Contracts.ExchangeOrderSide;
+using static Phantasma.Blockchain.Contracts.ExchangeOrderType;
 using Phantasma.Domain;
 using System.Linq;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public enum ExchangeOrderSide
     {

Phantasma.Contracts/Native/FriendContract.cs Phantasma.Blockchain/Contracts/FriendContract.cs

@@ -2,7 +2,7 @@
 using Phantasma.Domain;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public sealed class FriendsContract : NativeContract
     {

Phantasma.Contracts/Native/GasContract.cs Phantasma.Blockchain/Contracts/GasContract.cs

@@ -5,7 +5,7 @@
 using Phantasma.Storage.Context;
 using Phantasma.Core.Performance;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public struct GasLoanEntry
     {
@@ -29,20 +29,18 @@ public sealed class GasContract : NativeContract
         internal StorageMap _allowanceMap; //<Address, BigInteger>
         internal StorageMap _allowanceTargets; //<Address, Address>
 
-        public void Initialize(Address from)
-        {
-            Runtime.Expect(from == Runtime.GenesisAddress, "must be genesis address");
-            Runtime.Expect(Runtime.IsWitness(from), "invalid witness");
-            _lastInflation = Runtime.Time;
-        }
-
         public void AllowGas(Address from, Address target, BigInteger price, BigInteger limit)
         {
             if (Runtime.IsReadOnlyMode())
             {
                 return;
             }
 
+            if (_lastInflation == 0)
+            {
+                _lastInflation = Runtime.Time;
+            }
+
             Runtime.Expect(from.IsUser, "must be a user address");
             Runtime.Expect(Runtime.IsWitness(from), "invalid witness");
             Runtime.Expect(target.IsSystem, "destination must be system address");

Phantasma.Contracts/Native/GovernanceContract.cs Phantasma.Blockchain/Contracts/GovernanceContract.cs

@@ -3,7 +3,7 @@
 using Phantasma.Storage;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public enum ConstraintKind
     {

Phantasma.Contracts/Native/InteropContract.cs Phantasma.Blockchain/Contracts/InteropContract.cs

@@ -5,7 +5,7 @@
 using Phantasma.Storage.Context;
 using System.Linq;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public enum InteropTransferStatus
     {

Phantasma.Contracts/Native/MailContract.cs Phantasma.Blockchain/Contracts/MailContract.cs

@@ -3,7 +3,7 @@
 using Phantasma.Domain;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Extra
+namespace Phantasma.Blockchain.Contracts
 {
     public struct Mail
     {

Phantasma.Contracts/Native/MarketContract.cs Phantasma.Blockchain/Contracts/MarketContract.cs

@@ -5,7 +5,7 @@
 using Phantasma.Storage.Context;
 using System;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public struct MarketEventData
     {

Phantasma.Contracts/Native/PrivacyContract.cs Phantasma.Blockchain/Contracts/PrivacyContract.cs

@@ -5,7 +5,7 @@
 using Phantasma.Numerics;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     internal struct PrivacyQueue
     {

Phantasma.Contracts/Native/RankingContract.cs Phantasma.Blockchain/Contracts/RankingContract.cs

@@ -3,7 +3,7 @@
 using Phantasma.Numerics;
 using Phantasma.Storage.Context;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public sealed class RankingContract : NativeContract
     {

Phantasma.Contracts/Native/RelayContract.cs Phantasma.Blockchain/Contracts/RelayContract.cs

@@ -12,7 +12,7 @@
 using Phantasma.Storage.Context;
 using Phantasma.Storage.Utils;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public struct RelayMessage : ISerializable
     {

Phantasma.Contracts/Native/SaleContract.cs Phantasma.Blockchain/Contracts/SaleContract.cs

@@ -1,6 +1,6 @@
 using Phantasma.Domain;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public sealed class SaleContract : NativeContract
     {

Phantasma.Contracts/Native/StakeContract.cs Phantasma.Blockchain/Contracts/StakeContract.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using Phantasma.Domain;
 
-namespace Phantasma.Contracts.Native
+namespace Phantasma.Blockchain.Contracts
 {
     public struct EnergyStake
     {