Merge dev branch and resolve conflicts.

.gitignore

@@ -302,4 +302,14 @@ coverage*.xml
 scripts/patcher/*
 
 tools
-.dotnet
+.dotnet
+!.idea/
+.idea/.idea.AElf/.idea/contentModel.xml
+.idea/.idea.AElf/.idea/encodings.xml
+.idea/.idea.AElf/.idea/indexLayout.xml
+.idea/.idea.AElf/.idea/misc.xml
+.idea/.idea.AElf/.idea/modules.xml
+.idea/.idea.AElf/.idea/projectSettingsUpdater.xml
+.idea/.idea.AElf/.idea/vcs.xml
+.idea/.idea.AElf/.idea/workspace.xml
+.idea/.idea.AElf/riderModule.iml

.readthedocs.yml

@@ -0,0 +1,25 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation with sphinx
+sphinx:
+  builder: html
+  configuration: docs-sphinx/conf.py
+  fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs-sphinx/requirements.txt
+
+
+
+

AElf.Contract.Tools.targets → AElf.ContractTools.targets

@@ -3,12 +3,12 @@
     <PropertyGroup>
         <ProtoBaseDir>..\..\protobuf</ProtoBaseDir>
         <PatcherDir>..\..\scripts\patcher</PatcherDir>
-        <PatcherProjectName>AElf.Contracts.Deployer</PatcherProjectName>
+        <PatcherProjectName>AElf.ContractDeployer</PatcherProjectName>
     </PropertyGroup>
 
     <ItemGroup>
         <None Include="$(ProtoBaseDir)\aelf\*">
-            <Link>Protobuf/Proto/aelf/*</Link>
+            <Link>Protobuf\Proto\aelf/*</Link>
         </None>
     </ItemGroup>
 
@@ -32,6 +32,7 @@
             </PropertyGroup>
         </Otherwise>
     </Choose>
+
     <Target Name="GenerateProtobufCode" BeforeTargets="BeforeBuild;GetTargetPath">
         <PropertyGroup>
             <LocalProtobufDir>$(ProjectDir)/Protobuf</LocalProtobufDir>
@@ -41,13 +42,21 @@
             <LocalProtobufDir>$(ProjectDir)/Protobuf</LocalProtobufDir>
             <GenerateCommonMessageCommand>protoc --proto_path=../../protobuf --csharp_out=$(LocalProtobufDir)/Generated --csharp_opt=file_extension=.g.cs</GenerateCommonMessageCommand>
         </PropertyGroup>
+        <PropertyGroup>
+            <IsContract Condition="'@(ContractCode)' != ''">true</IsContract>
+        </PropertyGroup>
+
+        <ItemGroup>
+            <Compile Remove="Protobuf/Generated/*.cs"/>
+        </ItemGroup>
+        <RemoveDir Directories="Protobuf\Generated"/>
 
-        <RemoveDir Directories="Protobuf\Generated" />
-
         <MakeDir Condition="@(ContractInternal) != '' Or @(CommonMessage) != '' Or @(ContractBase) != '' Or @(ContractCode) != '' Or @(ContractReference) != '' Or @(ContractStub) != '' Or @(ContractMessage) != ''" Directories="$(LocalProtobufDir)/Generated"/>
         <Exec Condition="@(ContractInternal) != ''" Command="$(GenerateContractInternalCommand) %(Identity)"/>
         <Exec Condition="@(CommonMessage) != ''" Command="$(GenerateCommonMessageCommand) %(Identity)"/>
-        <Exec Condition="@(ContractBase) != ''" Command="$(GenerateContractBaseCommand) %(Identity)"/>
+        <Exec Condition="@(ContractBase) != '' And $(IsContract) != '' AND '$(IsContract)' " Command="$(GenerateContractBaseCommand) %(Identity) "/>
+        <Exec Condition="@(ContractBase) != '' And %(ContractBase.PublicAccessibility) == 'true'" Command="$(GenerateContractBaseCommand) %(Identity) "/>
+        <Exec Condition="@(ContractBase) != '' And $(IsContract) == '' And %(ContractBase.PublicAccessibility) != 'true'" Command="$(GenerateContractBaseCommand) %(Identity) internal_access"/>
         <Exec Condition="@(ContractCode) != ''" Command="$(GenerateContractCodeCommand) %(Identity)"/>
         <Exec Condition="@(ContractReference) != ''" Command="$(GenerateContractReferenceCommand)  %(Identity)"/>
         <Exec Condition="@(ContractStub) != ''" Command="$(GenerateContractStubCommand) %(Identity)"/>
@@ -57,9 +66,14 @@
             <Compile Include="Protobuf/Generated/*.cs"/>
         </ItemGroup>
     </Target>
+
     <!-- Build patcher before building the contract -->
     <Target Name="PatcherBuild" BeforeTargets="BeforeBuild">
-        <MSBuild Condition="'$(IsContract)' != '' AND '$(IsContract)'" 
+        <PropertyGroup>
+            <IsContract Condition="'@(ContractCode)' != ''">true</IsContract>
+            <IsSystemContract Condition="'@(ContractCode)' != '' And %(ContractCode.SystemContract) != '' And %(ContractCode.SystemContract)">true</IsSystemContract>
+        </PropertyGroup>
+        <MSBuild Condition="'$(IsContract)' != '' AND '$(IsContract)'"
                  Projects="$(ProjectDir)/../../src/$(PatcherProjectName)/$(PatcherProjectName).csproj"/>
     </Target>
     <!-- Patch the contract dll after building the contract -->
@@ -69,11 +83,13 @@
             <CmdPatchOverwrite Condition="'$(PatchOverwrite)' != '' AND '$(PatchOverwrite)'">-w </CmdPatchOverwrite>
             <CmdSkipAudit></CmdSkipAudit>
             <CmdSkipAudit Condition="'$(SkipAudit)' != '' AND '$(SkipAudit)'">-s </CmdSkipAudit>
+            <CmdTreatAsSystemContract></CmdTreatAsSystemContract>
+            <CmdTreatAsSystemContract Condition="'$(IsSystemContract)' != '' AND '$(IsSystemContract)'">-t </CmdTreatAsSystemContract>
         </PropertyGroup>
-        <Exec WorkingDirectory = "$(PatcherDir)"
-              Command="dotnet $(PatcherProjectName).dll $(CmdPatchOverwrite)$(CmdSkipAudit)-p $(TargetDir)$(TargetName).dll"
+        <Exec WorkingDirectory="$(PatcherDir)"
+              Command="dotnet $(PatcherProjectName).dll $(CmdPatchOverwrite)$(CmdSkipAudit)$(CmdTreatAsSystemContract)-p $(TargetDir)$(TargetName).dll"
               ConsoleToMSBuild="true">
-            <Output TaskParameter="ConsoleOutput" ItemName="PatchContractCodeOutput" />
+            <Output TaskParameter="ConsoleOutput" ItemName="PatchContractCodeOutput"/>
         </Exec>
         <Message Text="$(PatchContractCodeOutput)"/>
     </Target>
@@ -84,17 +100,17 @@
         </PropertyGroup>
         <Copy SourceFiles="$(TargetDir)$(TargetName).dll"
               DestinationFolder="$(LauncherTargetDir)"
-              SkipUnchangedFiles="true" />
+              SkipUnchangedFiles="true"/>
         <Copy Condition="Exists('$(TargetDir)$(TargetName).dll.patched')"
-              SourceFiles="$(TargetDir)$(TargetName).dll.patched" 
+              SourceFiles="$(TargetDir)$(TargetName).dll.patched"
               DestinationFolder="../../test/patched"
-              SkipUnchangedFiles="true" />
+              SkipUnchangedFiles="true"/>
     </Target>
     <!-- Copy patched contract dll after publish to include in publish directory -->
     <Target Name="CopyPatchedContractCodeToPublish" AfterTargets="Publish">
-        <Copy Condition="'$(IsContract)' != '' AND '$(IsContract)' AND Exists('$(TargetDir)$(TargetName).dll.patched')" 
-              SourceFiles="$(TargetDir)$(TargetName).dll.patched" 
+        <Copy Condition="'$(IsContract)' != '' AND '$(IsContract)' AND Exists('$(TargetDir)$(TargetName).dll.patched')"
+              SourceFiles="$(TargetDir)$(TargetName).dll.patched"
               DestinationFiles="$(PublishDir)/$(TargetName).dll"
-              SkipUnchangedFiles="true" />
+              SkipUnchangedFiles="true"/>
     </Target>
 </Project>