Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to v3.7.4 #38

Open
wants to merge 2 commits into
base: reserveLast
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.0.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
using Neo;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework.Attributes;

namespace FlamingoSwapFactory
{
public partial class FlamingoSwapFactoryContract
{
#region Admin

#warning 检查此处的 Admin 地址是否为最新地址
[InitialValue("NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE", Neo.SmartContract.ContractParameterType.Hash160)]
static readonly UInt160 superAdmin = default;
#warning Check if the admin here is the latest!
static readonly UInt160 superAdmin = "NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE";
const string AdminKey = nameof(superAdmin);

// When this contract address is included in the transaction signature,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel;
using Neo;
using Neo.SmartContract.Framework;
using System.ComponentModel;

namespace FlamingoSwapFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Numerics;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Services;
using System.Numerics;

namespace FlamingoSwapFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using System.ComponentModel;
using FlamingoSwapFactory.Models;
using Neo;
using FlamingoSwapFactory.Models;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework.Attributes;
using System.ComponentModel;

namespace FlamingoSwapFactory
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Neo;
using Neo.SmartContract.Framework;

namespace FlamingoSwapFactory.Models
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Neo;
using Neo.SmartContract.Framework;

namespace FlamingoSwapFactory.Models
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.1.0" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
</Target>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using Neo;
using Neo.SmartContract;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
Expand All @@ -12,14 +10,11 @@ public partial class FlamingoSwapOrderBookContract
#region Admin

#warning Update the admin address if necessary
[InitialValue("NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE", ContractParameterType.Hash160)]
static readonly UInt160 superAdmin = default;
static readonly UInt160 superAdmin = "NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE";

[InitialValue("0xc0695bdb8a87a40aff33c73ff6349ccc05fa9f01", ContractParameterType.Hash160)]
static readonly UInt160 Factory = default;
static readonly UInt160 Factory = "0xc0695bdb8a87a40aff33c73ff6349ccc05fa9f01";

[InitialValue("0xd6abe115ecb75e1fa0b42f5e85934ce8c1ae2893", ContractParameterType.Hash160)]
static readonly UInt160 bNEO = default;
static readonly UInt160 bNEO = "0xd6abe115ecb75e1fa0b42f5e85934ce8c1ae2893";

static readonly uint ORDER_PER_PAGE = 1 << 8;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Neo;
using Neo.SmartContract.Framework;
using System.Numerics;

namespace FlamingoSwapOrderBook
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.0.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System.Numerics;
using System.ComponentModel;
using Neo;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
using System.Numerics;

namespace FlamingoSwapPair
{
Expand All @@ -13,11 +11,9 @@ partial class FlamingoSwapPairContract
#region Settings

//Test
[InitialValue("NVGUQ1qyL4SdSm7sVmGVkXetjEsvw2L3NT", Neo.SmartContract.ContractParameterType.Hash160)]
static readonly UInt160 superAdmin = default;
static readonly UInt160 superAdmin = "NVGUQ1qyL4SdSm7sVmGVkXetjEsvw2L3NT";

[InitialValue("0xf9c55e595b39ded1e866efcc163445a168d378d5", Neo.SmartContract.ContractParameterType.Hash160)]
static readonly UInt160 WhiteListContract = default;
static readonly UInt160 WhiteListContract = "0xf9c55e595b39ded1e866efcc163445a168d378d5";

////Main
//[InitialValue("NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE", Neo.SmartContract.ContractParameterType.Hash160)]
Expand All @@ -29,16 +25,15 @@ partial class FlamingoSwapPairContract
#region TokenAB


[DisplayName("symbol")]
[Safe]
public static string Symbol() => "FLP-fWBTC-fUSDT"; //symbol of the token

#region tokenA
[InitialValue("0x9b9f7db02c0a2d6aa5ad9be7bba843027bf5b5f2", Neo.SmartContract.ContractParameterType.Hash160)] //bENO
static readonly UInt160 TokenA = default;
#region tokenA
//bENO
static readonly UInt160 TokenA = "0x9b9f7db02c0a2d6aa5ad9be7bba843027bf5b5f2";
#endregion

[InitialValue("0xa2d5f4378c42d118ebc7e1690f9478d3e00aefa1", Neo.SmartContract.ContractParameterType.Hash160)]
static readonly UInt160 TokenB = default;
static readonly UInt160 TokenB = "0xa2d5f4378c42d118ebc7e1690f9478d3e00aefa1";


#endregion
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel;
using Neo.SmartContract.Framework;
using System.ComponentModel;
using System.Numerics;
using Neo;

namespace FlamingoSwapPair
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
using System.Numerics;
using Neo;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
using System.Numerics;

namespace FlamingoSwapPair
{
partial class FlamingoSwapPairContract
{
[Safe]
public static ulong Decimals() => 8;
[Safe]
public static BigInteger TotalSupply() => TotalSupplyStorage.Get();

[Safe]
public static BigInteger BalanceOf(UInt160 account)
{
Assert(account.IsValid, "Invalid Account");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
using Neo;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework.Attributes;

namespace FlamingoSwapPairWhiteList
{
public partial class FlamingoSwapPairWhiteList
{
#region Admin

#warning 检查此处的 Admin 地址是否为最新地址
[InitialValue("NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE", Neo.SmartContract.ContractParameterType.Hash160)]
static readonly UInt160 superAdmin = default;
#warning Please check if the admin here is the latest!
static readonly UInt160 superAdmin = "NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE";
const string AdminKey = nameof(superAdmin);


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel;
using Neo;
using Neo.SmartContract.Framework;
using System.ComponentModel;

namespace FlamingoSwapPairWhiteList
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.0.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Numerics;
using Neo;
using Neo.SmartContract.Framework;
using System.Numerics;

namespace FlamingoSwapPairWhiteList
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.0.3" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
using Neo;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Services;
using Neo.SmartContract.Framework;
using Neo.SmartContract.Framework.Native;
using Neo.SmartContract;
using Neo.SmartContract.Framework.Attributes;
using Neo.SmartContract.Framework.Services;

namespace FlamingoSwapRouter
{
public partial class FlamingoSwapRouterContract
{
#region Admin
[InitialValue("NVGUQ1qyL4SdSm7sVmGVkXetjEsvw2L3NT", ContractParameterType.Hash160)]
static readonly UInt160 superAdmin = default;

[InitialValue("0x52bf47559436d3572a9b1cb83c056dc39cb42d0d", ContractParameterType.Hash160)]
static readonly UInt160 Factory = default;
static readonly UInt160 superAdmin = "NVGUQ1qyL4SdSm7sVmGVkXetjEsvw2L3NT";
static readonly UInt160 Factory = "0x52bf47559436d3572a9b1cb83c056dc39cb42d0d";

//[InitialValue("NdDvLrbtqeCVQkaLstAwh3md8SYYwqWRaE", ContractParameterType.Hash160)]
//static readonly UInt160 superAdmin = default;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Remove="Neo.SmartContract.Framework" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>
</Project>
21 changes: 11 additions & 10 deletions Swap/flamingo-contract-swap/ProxyTemplate/ProxyTemplate.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Neo3.Compiler.CSharp.Dev" Version="3.1.0" />
<PackageReference Include="Neo.SmartContract.Framework" Version="3.1.0" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="$(neon3) $(ProjectDir)" />
</Target>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Neo.SmartContract.Framework" Version="3.7.4" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Message Text="Start NeoContract converter, Source File: $(TargetPath)" Importance="high">
</Message>
<Exec Command="nccs &quot;$(ProjectPath)&quot;" />
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.ComponentModel;
using Neo.SmartContract.Framework;
using System.ComponentModel;
using System.Numerics;
using Neo;

namespace ProxyTemplate
{
Expand Down
Loading