conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using AElf.Kernel.Managers;
=======
>>>>>>>
<<<<<<<
private readonly IBinaryMerkleTreeManager _binaryMerkleTreeManager;
=======
>>>>>>>
private readonly IBinaryMerkleTreeManager _binaryMerkleTreeManager; |
<<<<<<<
if(!chainContext.StateCache.TryGetValue(path, out var byteArray))
throw new SmartContractFindRegistrationException("failed to find registration from zero contract");
=======
if(chainContext.StateCache == null || !chainContext.StateCache.TryGetValue(path, out... |
<<<<<<<
var blockValidationResult = await _blockValidationService.ValidateBlockAsync(block, await GetChainContextAsync());
Logger.LogInformation($"Block validation result {block} - {blockValidationResult}");
=======
var blockValidationResult = await _blockValidationService.Validate... |
<<<<<<<
=======
using NLog;
>>>>>>>
<<<<<<<
public byte[] SmartContractZeroCode
{
get
{
byte[] code = File.ReadAllBytes(Path.GetFullPath(Path.GetFullPath(Path.Combine(_options.DllDir, _options.ZeroContractDll))));
return code;
}
... |
<<<<<<<
using System;
using System.Threading.Tasks;
=======
using System.Threading.Tasks;
>>>>>>>
using System.Threading.Tasks;
<<<<<<<
public PoTC(ILogger logger,
IMiner miner,
ITxPoolService txPoolService,
IP2P p2p)
=======
public PoTC(IMiner miner, ITxPoolS... |
<<<<<<<
private readonly Func<List<Transaction>, ILogger, List<Transaction>> _generatedByMeCrossChain =
(list, logger) =>
{
var toRemove = new List<Transaction>();
toRemove.AddRange(list.FindAll(tx => tx.From != Address.LoadHex(NodeConfig.Instance.NodeAcc... |
<<<<<<<
protected Block(IHash<IBlock> preBlockHash)
=======
public Block(Hash preBlockHash)
>>>>>>>
protected Block(Hash preBlockHash) |
<<<<<<<
await ApproveBalanceAsync(lockedTokenAmount);
var otherChainId = ChainHelpers.GetChainId(5);
=======
await ApproveBalance(lockedTokenAmount);
var sideChainCreationRequest = CreateSideChainCreationRequest(1, lockedTokenAmount, ByteString.Empty);
var r... |
<<<<<<<
using Google.Protobuf.WellKnownTypes;
=======
using Microsoft.Extensions.DependencyInjection;
>>>>>>>
using Google.Protobuf.WellKnownTypes;
using Microsoft.Extensions.DependencyInjection; |
<<<<<<<
private const int VotersCount = 2;
=======
private const int VotersCount = 10;
>>>>>>>
private const int VotersCount = 10;
<<<<<<<
public DividendsTest(MockSetup mock)
=======
public DividendsTest(MockSetup mock, SimpleExecutingService simpleExecutingService)
>... |
<<<<<<<
Task RemovePeerAsync(string pubkey);
=======
void RemovePeer(string pubkey);
Task<bool> CheckEndpointAvailableAsync(DnsEndPoint endpoint);
>>>>>>>
Task<bool> CheckEndpointAvailableAsync(DnsEndPoint endpoint);
Task RemovePeerAsync(string pubkey); |
<<<<<<<
block = _kernelTestHelper.GenerateBlock(9, Hash.FromString("test"), null,
new Dictionary<string, ByteString>
{{ConsensusConstants.ConsensusExtraDataKey, ByteString.CopyFromUtf8("extra data")}});
=======
block = _kernelTestHelper.GenerateBlock(9, Hash... |
<<<<<<<
Linker.Link(LinkType.AbsoluteAddress, PatchType.I4, multibootHeader, (int)stream.Position, Linker.EntryPoint, 0);
=======
Linker.Link(LinkType.AbsoluteAddress, PatchType.I4, multibootHeader, (int)stream.Position, 0, entryPoint, 0);
>>>>>>>
Linker.Link(LinkType.AbsoluteAddress, PatchType.I4, multiboo... |
<<<<<<<
private const int GetNodesTimeout = 500;
=======
private const int UpdateHandshakeTimeout = 400;
>>>>>>>
private const int GetNodesTimeout = 500;
private const int UpdateHandshakeTimeout = 400; |
<<<<<<<
using AElf.Cryptography;
=======
>>>>>>>
using AElf.Cryptography;
<<<<<<<
=======
using Moq;
>>>>>>>
using Moq; |
<<<<<<<
var callList = new SystemContractDeploymentInput.Types.SystemTransactionMethodCallList();
callList.Add(nameof(TokenContract.InitializeTokenContract), new IntializeTokenContractInput
=======
var tokenContractCallList = new SystemTransactionMethodCallList();
token... |
<<<<<<<
using AElf.Configuration.Config.Chain;
using AElf.Kernel.Extensions;
=======
>>>>>>>
using AElf.Kernel.Extensions; |
<<<<<<<
p1.Setup(p => p.GetBlockByHashAsync(It.Is<Hash>(h => h == Hash.FromString("bHash1"))))
.Returns<Hash>(h => Task.FromResult(new BlockWithTransactions()));
=======
p1.Setup(p => p.RequestBlockAsync(It.Is<Hash>(h => h == Hash.FromString("bHash1"))))... |
<<<<<<<
Logger.LogTrace($"Before filter:");
foreach (var tx in sysTxs)
{
Logger.LogTrace($"{tx.GetHash()} - {tx.MethodName}");
}
=======
>>>>>>>
<<<<<<<
Logger.LogTrace($"... |
<<<<<<<
=======
Cts = new CancellationTokenSource();
>>>>>>>
<<<<<<<
readyTxs = tuple.Item2;
var distanceToTimeSlot = (double)ConsensusConfig.Instance.DPoSMiningInterval;
if (block.Header.Index > 2)
{
... |
<<<<<<<
context.Services.AddTransient<ISystemTransactionRecognizer, DonateTransactionRecognizer>();
context.Services.AddTransient<ITransactionValidationProvider, TxHubEntryPermissionValidationProvider>();
context.Services.AddTransient<ITransactionValidationProvider, TransactionMethod... |
<<<<<<<
using AElf.Node.EventMessages;
using Easy.MessageHub;
=======
using AElf.Common;
using Easy.MessageHub;
>>>>>>>
using AElf.Node.EventMessages;
using Easy.MessageHub;
<<<<<<<
private readonly IBlockExecutionService _blockExecutionService;
=======
private readonly TxHub _txHub;
>>>>>>>
... |
<<<<<<<
private bool IsMining { get; set; }
private ECKeyPair NodeKeyPair => Node.NodeKeyPair;
=======
public IDisposable ConsensusDisposable { get; set; }
private readonly IWorldStateDictator _worldStateDictator;
>>>>>>>
private bool IsMining { get; set; }
<<<<<<<
... |
<<<<<<<
peer = await _peerDialer.DialPeerAsync(ipAddress);
Logger.LogWarning($"Dialed peer: in {peer.InboundSessionId.ToHex()}, out {peer.OutboundSessionId.ToHex()}.");
=======
peer = await _peerDialer.DialPeerAsync(endpoint);
>>>>>>>
peer = await _peer... |
<<<<<<<
using System.Threading;
using AElf.Sdk.CSharp;
=======
using AElf.CSharp.Core;
>>>>>>>
using System.Threading;
using AElf.Sdk.CSharp;
using AElf.CSharp.Core; |
<<<<<<<
var existing = State.TokenInfos[input.Symbol];
Assert(existing == null && !string.IsNullOrEmpty(input.Symbol),
$"Token already exists. Symbol: {input.Symbol}");
=======
>>>>>>>
<<<<<<<
IsBurnable = input.IsBurnable,
IsTransferDisabled =... |
<<<<<<<
using Org.BouncyCastle.Asn1.X9;
using AElf.Miner.Rpc.Exceptions;
=======
using AElf.Miner.Rpc.Exceptions;
>>>>>>>
using Org.BouncyCastle.Asn1.X9;
using AElf.Miner.Rpc.Exceptions;
<<<<<<<
Transaction genTx= await GenerateTransactionWithParentChainBlockInfo(parentChainBlockInfo);
... |
<<<<<<<
context.Services.SetConfiguration(Configuration);
Configure<ChainOptions>(option =>
{
option.ChainId = ChainHelpers.ConvertBase58ToChainId(Configuration["ChainId"]);
option.IsMainChain = Convert.ToBoolean(Configuration["IsMainChain"]);
... |
<<<<<<<
=======
// TODO: We can merge some Ids.
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
public SingletonState<Hash> RewardHash { get; set; }
public SingletonState<Hash> BasicRewardHash { get; set; }
public SingletonState<Hash> VotesWeightRewardHash ... |
<<<<<<<
using System;
=======
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using AElf.Common;
using AElf.Database;
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.Infrastructure;
>>>>>>>
using System;
<<<<<<<
=======
using AElf.TestBase;
using Google.Protobuf.WellKnow... |
<<<<<<<
public SmartContractService(ISmartContractManager smartContractManager, ISmartContractRunnerFactory smartContractRunnerFactory, IStateManager stateManager,
=======
public SmartContractService(ISmartContractManager smartContractManager, ISmartContractRunnerContainer smartContractRunnerContainer... |
<<<<<<<
_transactionManager = new TransactionManager(_dataStore);
_transactionReceiptManager = new TransactionReceiptManager(_database);
_smartContractManager = new SmartContractManager(_dataStore);
_transactionResultManager = new TransactionResultManager(_dataStore);
... |
<<<<<<<
=======
using System.Threading;
using AElf.ChainController.EventMessages;
>>>>>>>
using System.Threading;
using AElf.ChainController.EventMessages;
<<<<<<<
_logger?.Trace($"[NodeState] Entering State {_fsm.CurrentState.ToString()}");
MessageHub.Instance.Publish(new EnteringState(_fsm... |
<<<<<<<
=======
private Hash _blockHash;
partial void OnConstruction()
{
Bloom = ByteString.CopyFrom(new Bloom().Data);
}
>>>>>>>
private Hash _blockHash; |
<<<<<<<
using AElf.Configuration.Config.Chain;
using AElf.Crosschain.Client;
using AElf.Crosschain.Exceptions;
=======
>>>>>>>
using AElf.Configuration.Config.Chain;
using AElf.Crosschain.Client;
using AElf.Crosschain.Exceptions;
<<<<<<<
using AElf.Kernel.Types.Common;
using AElf.Kernel.Types.Transaction;
=======
... |
<<<<<<<
CancellationToken cancellationToken, Hash disambiguationHash = null,
TransactionType transactionType = TransactionType.ContractTransaction,
bool skipFee = false)
=======
CancellationToken cancellationToken, DateTime currentBlockTime, Hash disambiguationHash = nu... |
<<<<<<<
await _worldStateDictator.SetWorldStateAsync(lastBlockHash);
_logger?.Log(LogLevel.Debug, "End Set WS..");
var ws = await _worldStateDictator.GetWorldStateAsync(lastBlockHash);
_logger?.Log(LogLevel.Debug, "End Get Ws");
=======
await _w... |
<<<<<<<
using Microsoft.IdentityModel.Protocols;
using Volo.Abp;
=======
>>>>>>>
<<<<<<<
var cultureInfo = new CultureInfo(_configuration["DefaultCulture"]);
//var cultureInfo = new CultureInfo("en-US");
CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
... |
<<<<<<<
Hash TransactionId { get; }
=======
int ChainId { get; }
// TODO: Remove Transaction
Transaction Transaction { get; }
Hash TransactionId { get; }
>>>>>>>
Hash TransactionId { get; }
int ChainId { get; }
// TODO: Remove Transaction
Tr... |
<<<<<<<
typeof(GrpcCrossChainAElfModule),
=======
//TODO: should move to OSAElfModule
>>>>>>>
typeof(GrpcCrossChainAElfModule),
//TODO: should move to OSAElfModule |
<<<<<<<
builder.RegisterType<BlockValidationService>().As<IBlockValidationService>().SingleInstance();
builder.RegisterType<ChainContextService>().As<IChainContextService>().SingleInstance();
builder.RegisterType<ChainService>().As<IChainService>().SingleInstance();
build... |
<<<<<<<
nodeConfig.IsChainCreator = confParser.NewChain;
var runner = new SmartContractRunner("../AElf.SDK.CSharp/bin/Debug/netstandard2.0/");
=======
var runner = new SmartContractRunner(confParser.RunnerConfig);
>>>>>>>
nodeConfig.IsChai... |
<<<<<<<
private const int FinalizeConnectTimeout = 500;
=======
private const int GetNodesTimeout = 500;
>>>>>>>
private const int GetNodesTimeout = 500;
private const int FinalizeConnectTimeout = 500;
<<<<<<<
public async Task<FinalizeConnectReply> FinalizeConnectAsync(Han... |
<<<<<<<
@lock = DPoSTxLock;
transactions = _dPoStxs;
=======
return await DPoSTxLock.WriteLock(() => AddDPoSTransaction(tx));
>>>>>>>
return await DPoSTxLock.WriteLock(() => AddDPoSTransaction(tx));
<<<<<<<
var res = pool.EnQueueTx(tx);... |
<<<<<<<
if (ChainConfig.Instance.ChainId != GlobalConfig.DefaultChainId)
{
var minersOfTerm1 = await GetMiners(CalculateKey(1));
if (minersOfTerm1 != null && minersOfTerm1.MainchainLatestTermNumber != 0)
{
termNumber = minersOfT... |
<<<<<<<
typeof(CSharpRuntimeAElfModule),
typeof(DatabaseAElfModule)
=======
typeof(CSharpRuntimeAElfModule2),
typeof(DatabaseAElfModule),
typeof(KernelAElfModule)
>>>>>>>
typeof(CSharpRuntimeAElfModule),
typeof(DatabaseAElfModule),
typeof(KernelAElfModu... |
<<<<<<<
if (!IpEndPointHelper.TryParse(NetworkTestConstants.FakeIpEndpoint, out var peerEnpdoint))
=======
if (!IpEndpointHelper.TryParse(NetworkTestConstants.FakeIpEndpoint, out var peerEndpoint))
>>>>>>>
if (!IpEndPointHelper.TryParse(NetworkTestConstants.FakeIpEndpoint, out var... |
<<<<<<<
context.SetInstruction(CPUx86.Instruction.PopInstruction, ebx);
=======
// Pop callee's EIP that has been used for instruction handling
ctx.SetInstruction(CPUx86.Instruction.PopInstruction, ebx);
>>>>>>>
// Pop callee's EIP that has been used for instruction handling
context.SetInstru... |
<<<<<<<
using AElf.Types;
=======
using AElf.Sdk.CSharp;
>>>>>>>
using AElf.Types;
<<<<<<<
protected DateTime BlockchainStartTime => DateTime.Parse("2019-01-01 00:00:00.000").ToUniversalTime();
protected byte[] TokenContractCoe => Codes.Single(kv => kv.Key.Contains("MultiToken")).Value;
pro... |
<<<<<<<
=======
using AElf.Contracts.Consensus.AEDPoS;
using AElf.Contracts.Genesis;
>>>>>>>
using AElf.Contracts.Consensus.AEDPoS;
<<<<<<<
internal Acs4.ACS4Container.ACS4ReferenceState ConsensusContract {get; set; }
internal Acs0.ACS0Container.ACS0ReferenceState BasicContractZero { get; set; }... |
<<<<<<<
using AElf.Miner.EventMessages;
using AElf.Miner.Rpc.Client;
using AElf.Miner.TxMemPool;
using Easy.MessageHub;
=======
>>>>>>>
using AElf.Miner.EventMessages;
using AElf.Miner.TxMemPool;
using Easy.MessageHub;
<<<<<<<
public BlockExecutor(IChainService chainService, IExecutingService executingServi... |
<<<<<<<
var client = await _grpcCrossChainClientProvider.TryGetClient(remoteChainId);
Assert.NotNull(client);
=======
var client = await _grpcCrossChainClientProvider.GetClientAsync(remoteChainId);
Assert.True(client.RemoteChainId == remoteChainId);
Assert.T... |
<<<<<<<
using AElf.Miner.Miner;
using AElf.Runtime.CSharp;
using AElf.SmartContract;
=======
using AElf.Miner.Rpc.Server;
>>>>>>>
using AElf.Runtime.CSharp;
using AElf.SmartContract;
<<<<<<<
using AElf.Configuration.Config.Chain;
using AElf.Crosschain.Grpc.Client;
using AElf.Crosschain.Grpc.Server;
using AElf.Cross... |
<<<<<<<
long lockedTokenAmount = 10;
var sideChainCreationRequest = CreateSideChainCreationRequest(1, lockedTokenAmount, ByteString.Empty);
var txResult = await ExecuteContractWithMiningAsync(CrossChainContractAddress, nameof(CrossChainContract.RequestChainCreation),
... |
<<<<<<<
using AElf.Kernel.Manager.Interfaces;
using AElf.Kernel.EventMessages;
=======
using AElf.Kernel.Managers;
using AElf.Kernel.Storages;
using AElf.Kernel.Types.Transaction;
>>>>>>>
using AElf.Kernel.EventMessages;
using AElf.Kernel.Managers;
using AElf.Kernel.Storages;
using AElf.Kernel.Types.Transaction; |
<<<<<<<
using AElf.Contracts.Association;
=======
using AElf.Contracts.Configuration;
>>>>>>>
using AElf.Contracts.Association;
using AElf.Contracts.Configuration; |
<<<<<<<
=======
using AElf.Miner.Rpc.Client;
using AElf.Miner.Rpc.Server;
>>>>>>>
<<<<<<<
minerConfig.ChainId = new Hash()
{
Value = ByteString.CopyFrom(ChainConfig.Instance.ChainId.DecodeBase58())
};
builder.RegisterModule(new CrosschainAutofacModule(... |
<<<<<<<
using AElf.Kernel.TxMemPool;
=======
using AElf.Kernel.Storages;
>>>>>>>
using AElf.Kernel.TxMemPool;
using AElf.Kernel.Storages; |
<<<<<<<
.AddSingleton<IBlocksExecutionSucceededLogEventProcessor, IrreversibleBlockHeightUnacceptableLogEventProcessor>();
context.Services.AddSingleton<IBlocksExecutionSucceededLogEventProcessor, SecretSharingInformationLogEventProcessor>();
context.Services.AddSingleton<ICharg... |
<<<<<<<
using AElf.ChainControllerImpl.TxMemPool;
=======
using AElf.Execution;
using AElf.Execution.Scheduling;
>>>>>>>
using AElf.ChainControllerImpl.TxMemPool;
using AElf.Execution;
using AElf.Execution.Scheduling; |
<<<<<<<
private readonly EconomicOptions _economicOptions;
=======
private readonly TokenInitialOptions _tokenInitialOptions;
private readonly ContractOptions _contractOptions;
>>>>>>>
private readonly EconomicOptions _economicOptions;
private readonly ContractOptions _contrac... |
<<<<<<<
=======
void InformRollback(ulong targetHeight, ulong currentHeight);
bool IsFull();
>>>>>>>
bool IsFull(); |
<<<<<<<
using AElf.Miner.Miner;
=======
using AElf.Execution.Scheduling;
>>>>>>>
using AElf.Miner.Miner;
using AElf.Execution.Scheduling; |
<<<<<<<
using System;
using System.Threading.Tasks;
using AElf.Network.Data;
=======
using System.Threading.Tasks;
using AElf.Network;
>>>>>>>
using System;
using System.Threading.Tasks;
using AElf.Network.Data;
using System.Threading.Tasks;
using AElf.Network;
<<<<<<<
[JsonRpcMethod("add_peer", "addres... |
<<<<<<<
if (tx.RefBlockNumber > chain.LongestChainHeight + NetworkConstants.DefaultMinBlockGapBeforeSync)
return;
=======
if (tx.RefBlockNumber > chain.LongestChainHeight + NetworkConstants.DefaultInitialSyncOffset)
return new VoidReply();
... |
<<<<<<<
public IEnumerable<FileDescriptor> GetFileDescriptors()
{
var descriptor = Descriptors.Last();
return GetSelfAndDependency(descriptor.File);
}
=======
public Hash ContractHash { get; set; }
>>>>>>>
public IEnumerable<FileDescriptor> GetFileDe... |
<<<<<<<
var auditor = new ContractAuditor();
auditor.Audit(code, new RequiredAcsDto
=======
var auditor = new CSharpContractAuditor(null, null);
auditor.Audit(code, new RequiredAcs
>>>>>>>
var auditor = new ContractAuditor();
auditor.Audit(code,... |
<<<<<<<
=======
public IContainer ApplicationContainer { get; private set; }
>>>>>>>
<<<<<<<
services.AddSwaggerGen(c =>
{
c.SwaggerDoc("v1", new Info { Title = "AElf API", Version = "v1" });
});
... |
<<<<<<<
Logger=NullLogger<MockSetup>.Instance;
_dataStore = dataStore;
_stateStore = stateStore;
_smartContractManager = new SmartContractManager(_dataStore);
_transactionManager = new TransactionManager(_dataStore);
_transactionTraceM... |
<<<<<<<
public MockSetup(IStateManager stateManager, IChainCreationService chainCreationService,
IChainContextService chainContextService,
IFunctionMetadataService functionMetadataService, ISmartContractRunnerFactory smartContractRunnerFactory
, ISmartContractManager smartCon... |
<<<<<<<
using Microsoft.Extensions.DependencyInjection;
=======
using AElf.WebApp.Application.Chain.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
>>>>>>>
using AElf.WebApp.Application.Chain.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
<<<<<<<
public override void Configu... |
<<<<<<<
[Fact]
public async Task SetSymbolsToPayTxSizeFee_With_Invalid_Weight_Test()
=======
[Fact(DisplayName = "[MultiToken] validate the input")]
public async Task SetSymbolsToPayTxSizeFee_With_Invalid_Input_Test()
>>>>>>>
[Fact]
public async Task SetSymb... |
<<<<<<<
using AElf.Common.Extensions;
using AElf.Kernel.Manager.Interfaces;
using AElf.Kernel.SmartContract;
using AElf.Kernel.Storage.Interfaces;
=======
using AElf.Kernel.Storages;
>>>>>>>
using AElf.Kernel.Manager.Interfaces;
using AElf.Kernel.SmartContract;
<<<<<<<
=======
#pragma warning disable CS0169,CS0... |
<<<<<<<
internal DividendPoolContractContainer.DividendPoolContractReferenceState DividendPoolContract{ get; set; }
=======
internal AEDPoSContractContainer.AEDPoSContractReferenceState ConsensusContract { get; set; }
>>>>>>>
internal AEDPoSContractContainer.AEDPoSContractReferenceState Conse... |
<<<<<<<
using System;
using System.Collections.Generic;
=======
using System;
>>>>>>>
using System;
using System.Collections.Generic;
<<<<<<<
=======
>>>>>>>
<<<<<<<
public void EnqueueBlock_ShouldExecuteCallback_Test()
=======
public void EnqueueBlock_ShouldExecuteCallback(... |
<<<<<<<
using AElf.Kernel.Blockchain.Infrastructure;
using AElf.Kernel.ChainController;
using AElf.Kernel.Infrastructure;
using AElf.Kernel.SmartContract;
using AElf.Kernel.SmartContractExecution.Infrastructure;
using AElf.Kernel.TransactionPool;
=======
using AElf.Kernel.Services;
using AElf.Kernel.Storages;
>>>>>>... |
<<<<<<<
context.Services.AddSingleton(typeof(ContractEventDiscoveryService<>));
=======
context.Services
.AddSingleton<IConstrainedTransactionValidationProvider,
ConstrainedAEDPoSTransactionValidationProvider>();
>>>>>>>
context.Services
... |
<<<<<<<
using System.Collections.Generic;
using System.Text;
=======
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
>>>>>>>
using System.Collections.Generic;
using System.Text;
<<<<<<<
private Akka.Configuration.Config InitActorConfig(string content)
{
... |
<<<<<<<
using AElf.Common;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
=======
using NLog;
>>>>>>>
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
<<<<<<<
var txs = new List<Transaction>();
for (var i = currentHeig... |
<<<<<<<
public const long MiningRewardPerBlock = 12500000;
=======
public const int MinMinersCount = 9;
>>>>>>>
public const long MiningRewardPerBlock = 12500000;
public const int MinMinersCount = 9; |
<<<<<<<
using System.Collections.Generic;
using AElf.Contracts.CrossChain;
=======
>>>>>>>
using AElf.Contracts.CrossChain; |
<<<<<<<
public ILogger<MinersManager> Logger { get; set; }
private static Hash Key => Hash.FromRawBytes(GlobalConfig.AElfDPoSMinersString.CalculateHash());
=======
private readonly ILogger _logger = LogManager.GetLogger(nameof(MinersManager));
>>>>>>>
public ILogger<MinersManager> L... |
<<<<<<<
=======
// public static void AddGenesisSmartContract<T>(this List<GenesisSmartContractDto> genesisSmartContracts,
// Hash name = null, SystemContractDeploymentInput.Types.SystemTransactionMethodCallList systemTransactionMethodCallList = null)
// {
// // TODO: Chan... |
<<<<<<<
var result = await filter.ValidateBlockAsync(block, context);
if (result != BlockValidationResult.Success)
Logger.LogWarning($"Result of {filter.GetType().Name}: {result} - {block.BlockHashToHex}");
=======
var result = await filter.ValidateB... |
<<<<<<<
cancellableReturnSets =
await _executingService.ExecuteAsync(blockHeader, cancellable, cancellationToken, false,
returnSetCollection.ToBlockStateSet());
returnSetCollection.AddRange(cancellableReturnSets);
=======
canc... |
<<<<<<<
=======
public async Task InitialConsensus_WithException()
{
TesterManager.InitialTesters();
//Incorrect round number at beginning.
var input = new Round
{
RoundNumber = 2
};
var transactionResult = await ... |
<<<<<<<
//local calling graph in template map of template must be topological, so ignore the callGraph
Template.TryGetLocalCallingGraph(classTemplate, out var callGraph, out var topologicRes);
foreach (var localFuncName in topologicRes.Reverse())
... |
<<<<<<<
using AElf.OS.Network.Grpc.Extensions;
using AElf.OS.Network.Grpc.Helpers;
=======
using AElf.OS.Network.Protocol;
using AElf.OS.Network.Protocol.Types;
>>>>>>>
using AElf.OS.Network.Grpc.Extensions;
using AElf.OS.Network.Grpc.Helpers;
using AElf.OS.Network.Protocol;
using AElf.OS.Network.Protocol.Types;
<<... |
<<<<<<<
private const int BlockRequestTimeout = 300;
private const int BlocksRequestTimeout = 500;
=======
private const int BlockRequestTimeout = 500;
private const int BlocksRequestTimeout = 800;
>>>>>>>
private const int BlockRequestTimeout = 500;
private const int... |
<<<<<<<
using AElf.Standards.ACS2;
using AElf.Contracts.Parliament;
using AElf.Contracts.Profit;
using AElf.Contracts.Referendum;
using AElf.Contracts.TestContract.BasicFunction;
using AElf.Contracts.TestKit;
=======
>>>>>>>
using AElf.Standards.ACS2;
using AElf.Contracts.Parliament;
using AElf.Contracts.Profit;
usi... |
<<<<<<<
public MappedState<string, TokenAmounts> TransactionFees { get; set; }
public SingletonState<Round> RoundBeforeLatestExecution { get; set; }
=======
public MappedState<string, MethodFees> TransactionFees { get; set; }
>>>>>>>
public MappedState<string, MethodFees> Transaction... |
<<<<<<<
using AElf.OS.Network.Protocol;
using AElf.Types;
=======
using AElf.OS.Network.Infrastructure;
>>>>>>>
using AElf.OS.Network.Protocol;
using AElf.Types;
using AElf.OS.Network.Infrastructure; |
<<<<<<<
_router.Tell(new JobExecutionRequest(reqId, req.ChainId, req.Transactions, Self, _router,
req.DisambiguationHash, req.TransactionType, req.SkipFee));
=======
_router.Tell(new JobExecutionRequest(reqId, req.ChainId, req.Transactions, req.CurrentBl... |
<<<<<<<
var consensusAddress = ContractHelpers.GetConsensusContractAddress(ChainId);
Logger.LogDebug($"DPoS contract address = {consensusAddress.GetFormatted()}");
=======
var consensusContractAddress = ContractHelpers.GetConsensusContractAddress(ChainId);
_logger?.Debu... |
<<<<<<<
using AElf.SmartContract.Proposal;
=======
using AElf.Synchronization.BlockSynchronization;
>>>>>>>
using AElf.SmartContract.Proposal;
using AElf.Synchronization.BlockSynchronization;
<<<<<<<
response["block_number"] = txResult.BlockNumber;
response["block_hash"] = tx... |
<<<<<<<
public MockSetup(IStateStore stateStore, IChainCreationService chainCreationService,
IDataStore dataStore, IChainContextService chainContextService,
IFunctionMetadataService functionMetadataService, ISmartContractRunnerContainer smartContractRunnerContainer,
IChainSer... |
<<<<<<<
using AElf.Kernel.SmartContract;
=======
using AElf.Kernel.Consensus.AEDPoS;
using AElf.Kernel.Consensus.AEDPoS.Application;
using AElf.Kernel.Consensus.Application;
>>>>>>>
using AElf.Kernel.SmartContract;
using AElf.Kernel.Consensus.AEDPoS.Application;
using AElf.Kernel.Consensus.Application;
<<<<<<<
... |
<<<<<<<
private TokenContractContainer.TokenContractStub _tokenContractStub;
private Address _testContractAddress;
private TestContract.ContractContainer.ContractStub _testContractStub;
private ECKeyPair DefaultSenderKeyPair => SampleECKeyPairs.KeyPairs[0];
=======
private Toke... |
<<<<<<<
using AElf.Contracts.MultiToken;
=======
using AElf.Contracts.Genesis;
using AElf.Contracts.MultiToken.Messages;
using AElf.Contracts.TestBase;
>>>>>>>
using AElf.Contracts.MultiToken;
using AElf.Contracts.TestBase; |
<<<<<<<
ISmartContractExecutiveService smartContractExecutiveService,
ITransactionInclusivenessProvider transactionInclusivenessProvider,
ITransactionBlockIndexService transactionBlockIndexService)
=======
ITransactionBlockIndexService transactionBlockIndexService,
... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.