conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
=======
using Google.Protobuf;
using Google.Protobuf.WellKnownTypes;
>>>>>>>
using Google.Protobuf;
<<<<<<<
return _fakeIndexedCrossChainBlockData.TryGetValue(height, out var crossChainBlockData)
? crossChainBlockData
: null;
}
=======
if (me... |
<<<<<<<
Hash Hash { get;}
=======
Int32 Version { get; set; }
Hash MerkleTreeRootOfTransactions { get; set; }
>>>>>>>
Hash Hash { get;}
Int32 Version { get; set; }
Hash MerkleTreeRootOfTransactions { get; set; } |
<<<<<<<
using AElf.Common.Extensions;
=======
using AElf.ChainController.TxMemPool;
>>>>>>>
using AElf.Common.Extensions;
using AElf.ChainController.TxMemPool; |
<<<<<<<
=======
private static ulong _firstTermChangedRoundNumber;
>>>>>>>
private static ulong _firstTermChangedRoundNumber;
<<<<<<<
=======
if (ChainConfig.Instance.ChainId == GlobalConfig.DefaultChainId)
{
await _miner... |
<<<<<<<
=======
/// <summary>
/// First step of the connect/auth process. Used to initiate a connection. The provided payload should be the
/// clients authentication information. When receiving this call, protocol dictates you send the client your auth
/// information. The response sa... |
<<<<<<<
using AElf.Kernel.SmartContractExecution.Application;
=======
using AElf.Kernel.SmartContract.Application;
using AElf.Kernel.SmartContractExecution.Application;
>>>>>>>
using AElf.Kernel.SmartContractExecution.Application;
using AElf.Kernel.SmartContract.Application;
using AElf.Kernel.SmartContractExecution.... |
<<<<<<<
private static Address CrossChainContractAddress => ContractHelpers.GetCrossChainContractAddress(ChainId);
private static Address AuthorizationContractAddress => ContractHelpers.GetAuthorizationContractAddress(ChainId);
private static Address ResourceContractAddress => Contract... |
<<<<<<<
using AElf.Kernel.Account.Application;
using AElf.Kernel.Infrastructure;
using AElf.Miner.Rpc;
=======
using AElf.Kernel.Storages;
>>>>>>>
using AElf.Kernel.Account.Application;
using AElf.Kernel.Infrastructure; |
<<<<<<<
=======
private readonly ECKeyPair _keyPair = NodeConfig.Instance.ECKeyPair;
>>>>>>>
<<<<<<<
=======
private readonly int _timeoutMilliseconds = ConsensusConfig.Instance.DPoSMiningInterval / 4 * 3;
private readonly ILogger _logger;
private readonly ClientManager _clientMana... |
<<<<<<<
public ulong GetSideChainHeight(int chainId)
=======
public long GetSideChainHeight(string chainId)
>>>>>>>
public long GetSideChainHeight(int chainId)
<<<<<<<
Assert(parentChainId == blockInfo.Root.ParentChainId, "Wrong parent chain id.");
ulong paren... |
<<<<<<<
#if WINDOWS_UAP
this.definitions.Add(new ExampleDefinition() { Name = "Video Effect", Control = typeof(BasicVideoEffectExample) });
#endif
=======
this.definitions.Add(new ExampleDefinition() { Name = "Control Transforms", Control = typeof(ControlTransforms) });
>>>>>>>
th... |
<<<<<<<
=======
MessageHub.Instance.Publish(new ExecutionStateChanged(true));
var stopwatch = new Stopwatch();
stopwatch.Start();
>>>>>>>
MessageHub.Instance.Publish(new ExecutionStateChanged(true));
var stopwatch = new Stopwatch();
stopwatch... |
<<<<<<<
_txFilter.Execute(sysTxs);
Logger.LogTrace($"Start executing {sysTxs.Count} system transactions.");
=======
var toRemove = _txFilter.Execute(sysTxs);
// TODO: Remove useless consensus txs.
_logger?.Trace($"Star... |
<<<<<<<
using System.Numerics;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using System.Numerics; |
<<<<<<<
using Volo.Abp.DependencyInjection;
=======
using AElf.Kernel.Managers;
>>>>>>>
using AElf.Kernel.Managers;
using Volo.Abp.DependencyInjection; |
<<<<<<<
RegisterTokenInfo(nativeTokenInfo);
if (input.ResourceTokenList?.Value != null)
{
foreach (var resourceTokenInfo in input.ResourceTokenList.Value)
{
resourceTokenInfo.Supply = 0;
RegisterTokenInfo(resour... |
<<<<<<<
public const int DefaultMinBlockGapBeforeSync = 1024;
=======
public const int DefaultMaxPeers = 25;
>>>>>>>
public const int DefaultMinBlockGapBeforeSync = 1024;
public const int DefaultMaxPeers = 25; |
<<<<<<<
using AElf.SmartContract;
using AElf.Kernel.TransactionPool;
=======
using AElf.TxPool;
>>>>>>>
using AElf.Kernel.TransactionPool;
<<<<<<<
[DependsOn(typeof(RpcAElfModule),typeof(ChainControllerAElfModule),typeof(TransactionPoolAElfModule)
)]
public class RpcChainControllerAElfModule: AElfMo... |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using AElf.Common;
using AElf.Contracts.TestBase;
using AElf.Database;
using AElf.Kernel;
using AElf.Kernel.Account.Application;
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.... |
<<<<<<<
=======
private ActorSystem _sys ;
private readonly IBlockManager _blockManager;
>>>>>>>
private ActorSystem _sys ;
private readonly IBlockManager _blockManager;
<<<<<<<
IChainCreationService chainCreationService, IWorldStateManager worldStateManager,
... |
<<<<<<<
_dataStore.SetDataAsync(CalculateKeyForPathsCount(), ((long)0).ToBytes());
=======
_dataStore.SetDataAsync(GetHashToGetPathsCount(), ((ulong)0).ToBytes());
>>>>>>>
_dataStore.SetDataAsync(CalculateKeyForPathsCount(), ((ulong)0).ToBytes());
<<<<<<<
var countByt... |
<<<<<<<
var txCtxt = new TransactionContext()
{
PreviousBlockHash = _chainContext.BlockHash,
Transaction = transaction,
TransactionResult = result
};
await executive.SetTransactionContext(txCtxt).... |
<<<<<<<
var genTx = await GenerateTransactionWithParentChainBlockInfo(parentChainBlockInfo);
var readyTxs = await _txPoolService.GetReadyTxsAsync(currentRoundInfo);
// remove invalid CrossChainBlockInfoTransaction, only that from local can be executed)
... |
<<<<<<<
ChainService = new ChainService(_chainManager, _blockManager,
_transactionManager, _transactionTraceManager, StateManager);
_smartContractRunnerFactory = new SmartContractRunnerFactory();
var runner =
new SmartContractRunner("../../../../AElf.R... |
<<<<<<<
var block = await GenerateBlock(results, currentBlockTime);
Logger.LogInformation($"Generated block {block.BlockHashToHex} at height {block.Header.Index} with {block.Body.TransactionsCount} txs.");
=======
var block = await GenerateBlock(results, sideChainTransa... |
<<<<<<<
using System.Net;
=======
using System.Linq;
using System.Net;
>>>>>>>
using System.Net;
using System.Linq;
<<<<<<<
var peer = GrpcUrl.Parse(peerConnectionIp);
if (peer == null)
return new ConnectReply { Error = ConnectError.InvalidPeer };
va... |
<<<<<<<
using AElf.Kernel.Extensions;
using AElf.Kernel.Managers;
=======
using AElf.Kernel.Types;
using AElf.Kernel.Types.SmartContract;
>>>>>>>
using AElf.Kernel.Extensions;
using AElf.Kernel.Managers;
using AElf.Kernel.Types;
using AElf.Kernel.Types.SmartContract; |
<<<<<<<
private DPoS _dPoS;
=======
>>>>>>>
private DPoS _dPoS;
<<<<<<<
blockProducer.Nodes.Add(bp["pubkey"]);
}
_dPoS = new DPoS(_nodeKeyPair);
await Task.Run(() =>
{
... |
<<<<<<<
private IBlockManager _blockManager;
private IAuthorizationInfo _authorizationInfo;
private IStateManager _stateManager;
=======
private IAuthorizationInfoReader _authorizationInfoReader;
private IStateStore _stateStore;
>>>>>>>
private IBlockManager _blockMana... |
<<<<<<<
private readonly DPoSInfoProvider _dpoSInfoProvider;
=======
private readonly IChainManager _chainManager;
private readonly ConsensusDataProvider _consensusDataProvider;
>>>>>>>
private readonly DPoSInfoProvider _dpoSInfoProvider;
private readonly IChainManager _chain... |
<<<<<<<
public static int Count(this OrganizationMemberList organizationMemberList)
{
return organizationMemberList.OrganizationMembers.Count;
}
=======
>>>>>>>
<<<<<<<
public static bool AnyDuplicate(this ProposerWhiteList proposerWhiteList)
{
retur... |
<<<<<<<
using AElf.Crosschain;
using AElf.Crosschain.Server;
=======
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
>>>>>>>
using AElf.Crosschain;
using AElf.Crosschain.Server;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; |
<<<<<<<
using AElf.Kernel.Blockchain.Application;
using AElf.Kernel.Miner.Application;
=======
using AElf.Kernel.FeeCalculation;
using AElf.Kernel.FeeCalculation.Application;
using AElf.Kernel.Miner.Application;
>>>>>>>
using AElf.Kernel.FeeCalculation;
using AElf.Kernel.FeeCalculation.Application;
using AElf.Kern... |
<<<<<<<
MaximumLockTime = 1080,
MinimumLockTime = 90
=======
// Create Treasury profit item and register sub items.
TokenContractSystemName = TokenSmartContractAddressNameProvider.Name,
VoteContractSystemName = VoteSma... |
<<<<<<<
=======
var generatedTxn = new Transaction
{
From = FromAddress,
To = input.To,
MethodName = nameof(ACS2BaseContainer.ACS2BaseStub.GetResourceInfo),
Params = input.ToByteString(),
Signature = ByteString.Cop... |
<<<<<<<
=======
private int _timeoutMilliseconds;
private readonly ILogger _logger;
private readonly ClientManager _clientManager;
>>>>>>>
<<<<<<<
private IBlockChain _blockChain;
private readonly ClientManager _clientManager;
private readonly Server... |
<<<<<<<
using Google.Protobuf;
=======
using System;
using AElf.Common.Extensions;
using Google.Protobuf;
using static AElf.Kernel.Storages.Types;
>>>>>>>
using System;
using AElf.Common.Extensions;
using Google.Protobuf; |
<<<<<<<
using AElf.Kernel.Domain;
using AElf.Kernel.SmartContractExecution.Domain;
=======
using AElf.Kernel.Managers;
using AElf.Kernel.Services;
>>>>>>>
using AElf.Kernel.Domain;
using AElf.Kernel.SmartContractExecution.Domain;
using AElf.Kernel.Services; |
<<<<<<<
private readonly IBlockSyncStateProvider _blockSyncStateProvider;
private readonly IAnnouncementCacheProvider _announcementCacheProvider;
private readonly OSTestHelper _osTestHelper;
=======
>>>>>>>
private readonly IAnnouncementCacheProvider _announcementCacheProvider;
... |
<<<<<<<
response.Header.Bloom.ShouldBe(block.Header.Bloom.ToByteArray().ToHex());
response.Header.SignerPubkey.ShouldBe(block.Header.SignerPubkey.ToHex());
response.Header.MerkleTreeRootOfTransactionState.ShouldBe(block.Header.MerkleTreeRootOfTransactionStatus.ToHex());
=======
... |
<<<<<<<
_smartContractService = new SmartContractService(_smartContractManager, _smartContractRunnerContainer, stateStore, _functionMetadataService, _chainService);
=======
_smartContractService = new SmartContractService(_smartContractManager, _smartContractRunnerContainer, _stateManager, _fu... |
<<<<<<<
private readonly IObjectMapper<ChainApplicationWebAppAElfModule> _objectMapper;
=======
private readonly ITransactionResultStatusCacheProvider _transactionResultStatusCacheProvider;
>>>>>>>
private readonly IObjectMapper<ChainApplicationWebAppAElfModule> _objectMapper;
private... |
<<<<<<<
context.Services.AddAssemblyOf<CoreOSAElfModule>();
//Configure<ChainOptions>(option => option.ChainId = ChainHelpers.ConvertBase58ToChainId(configuration["ChainId"]));
=======
>>>>>>>
context.Services.AddAssemblyOf<CoreOSAElfModule>();
//Configure<ChainO... |
<<<<<<<
if(IsTokenDonateToTreasury(symbol))
State.DividendPoolContract.Donate.Send(new DonateInput
{
Symbol = symbol,
Amount = amount
... |
<<<<<<<
using AElf.Types;
=======
using AElf.Kernel.Infrastructure;
>>>>>>>
using AElf.Types;
using AElf.Kernel.Infrastructure; |
<<<<<<<
mockService.Setup(m => m.DoHandshakeAsync(It.IsAny<DnsEndPoint>(), It.IsAny<Handshake>()))
.Returns<DnsEndPoint, Handshake>(async (pe, hsk) =>
=======
mockService.Setup(m => m.DoHandshakeAsync(It.IsAny<IPEndPoint>(), It.IsAny<Handshake>()))
... |
<<<<<<<
=======
private IBackgroundJobStore _jobStore;
private readonly LastIrreversibleBlockJob _job;
>>>>>>>
<<<<<<<
_kernelTestHelper = GetRequiredService<KernelTestHelper>();
_smartContractAddressService.SetAddress(ConsensusSmartContractAddressNameProvider.Name,
... |
<<<<<<<
using AElf.TestBase;
=======
using AElf.Kernel.Managers;
using AElf.Kernel.SmartContract;
using FunctionMetadata = AElf.Kernel.SmartContract.FunctionMetadata;
>>>>>>>
using AElf.TestBase;
using AElf.Kernel.Managers;
using AElf.Kernel.SmartContract;
using FunctionMetadata = AElf.Kernel.SmartContract.FunctionM... |
<<<<<<<
internal TokenContractContainer.TokenContractStub AuthorizedTokenContractStub =>
GetTester<TokenContractContainer.TokenContractStub>(TokenContractAddress, ManagerKeyPair);
internal TokenConverterContractImplContainer.TokenConverterContractImplStub DefaultStub =>
GetTeste... |
<<<<<<<
private readonly ITransactionFeeExemptionService _transactionFeeExemptionService;
=======
private readonly ICalculateFeeService _calService;
>>>>>>>
private readonly ICalculateFeeService _calService;
private readonly ITransactionFeeExemptionService _transactionFeeExemptionServ... |
<<<<<<<
$"Remaining tickets of {bv.Value.ToByteArray().ToPlainBase58()}: {tickets.TotalTickets}");
=======
$"Remaining tickets of {bv.Value.ToByteArray().ToHex()}: {tickets.RemainingTickets}");
>>>>>>>
$"Remaining tickets of {bv.Value.ToByteArra... |
<<<<<<<
_accountService = accountService;
=======
_lazyStateProvider = new Lazy<IStateProvider>(
() => new CachedStateProvider(
new StateProvider() {HostSmartContractBridgeContext = this}),
LazyThreadSafetyMode.PublicationOnly);
... |
<<<<<<<
{
QueryFilter filter = new QueryFilter();
filter.andFilters["AgentID"] = AgentID;
if (data.Query(new string[1] { "*" }, "osagent", filter, null, null, null).Count != 0)
{
data.Update("osagent", new object[] { GroupID }, new[] { "ActiveGroup... |
<<<<<<<
private readonly ICalculateStrategyProvider _calculateStrategyProvider;
=======
private readonly ITransactionFeeExemptionService _transactionFeeExemptionService;
>>>>>>>
private readonly ICalculateStrategyProvider _calculateStrategyProvider;
private readonly ITransactionFeeExe... |
<<<<<<<
using System;
using System.Threading.Tasks;
using AElf.Kernel.Storages;
using Google.Protobuf.WellKnownTypes;
using AElf.Common;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace AElf.Kernel.Managers
{
public class BlockManager : IBlockManager
{
pr... |
<<<<<<<
if (remoteValue != null)
{
=======
if (remoteValue != null || m_doRemoteOnly)
>>>>>>>
if (remoteValue != null || m_doRemoteOnly)
{
<<<<<<<
if (remoteValue != null)
{
=======
if (remoteValue != null || m_doRemot... |
<<<<<<<
private ISmartContractRunnerFactory _smartContractRunnerFactory;
public ILogger<MockSetup> Logger {get;set;}
=======
private ISmartContractRunnerContainer _smartContractRunnerContainer;
private ILogger _logger;
>>>>>>>
public ILogger<MockSetup> Logger {get;set;}
... |
<<<<<<<
var firstRound = _consensusContract.GetRoundInfo(1);
=======
var firstRound= _contracts.GetRoundInfo(1);
>>>>>>>
var firstRound = _contracts.GetRoundInfo(1);
<<<<<<<
Assert.Equal(GlobalConfig.InValueNotMatchToOutValue,
_c... |
<<<<<<<
=======
using AElf.Common;
using AElf.CrossChain.Cache;
using AElf.CrossChain.Grpc;
using AElf.CrossChain.Grpc.Server;
>>>>>>>
<<<<<<<
{
[DependsOn(typeof(KernelAElfModule))]
public class CrossChainAElfModule : AElfModule
{
public override void ConfigureServices(ServiceConfiguration... |
<<<<<<<
private async Task VoteToReferendum(Hash input)
=======
private async Task VoteToReferendum(Hash input, string primaryTokenSymbol)
>>>>>>>
private async Task VoteToReferendum(Hash input, string primaryTokenSymbol)
<<<<<<<
var parliamentCreateProposalRes... |
<<<<<<<
=======
context.Services.AddSingleton<AnnouncementReceivedEventHandler>();
context.Services.AddSingleton<PeerDiscoveryWorker>();
>>>>>>>
context.Services.AddSingleton<PeerDiscoveryWorker>(); |
<<<<<<<
} while (reExecutionResult1.IsFailed() && !_miningStarted);
Thread.VolatileWrite(ref _flag, 0);
=======
} while (reExecutionResult1.CanExecuteAgain() && !_miningStarted);
>>>>>>>
} while (reExecutionResult1.... |
<<<<<<<
_taskQueueManager.Enqueue(async () => await _blockAttachService.AttachReceivedBlockAsync(peerBlock),
KernelConsts.UpdateChainQueueName);
=======
_taskQueueManager.Enqueue(async () => await _blockAttachService.AttachBlockAsync(peerBlock),
... |
<<<<<<<
var blocks = new List<Block>();
for (var i = currentHeight; i > height; i--)
{
var block = await GetBlockByHeightAsync(i);
var body = block.Body;
foreach (var txId in body.Transactions)
... |
<<<<<<<
=======
/// <summary>
/// Initialize a profit contract.
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public override Empty InitializeProfitContract(Empty input)
{
Assert(!State.Initialized.Value, "Already initializ... |
<<<<<<<
ISmartContractRunnerFactory smartContractRunnerFactory,
=======
ISmartContractRunnerContainer smartContractRunnerContainer, ILogger logger,
>>>>>>>
ISmartContractRunnerContainer smartContractRunnerContainer, |
<<<<<<<
=======
private const string GetTxResultMethodName = "get_tx_result";
>>>>>>>
private const string GetTxResultMethodName = "get_tx_result";
<<<<<<<
BroadcastBlockMethodName,
GetContractAbi
=======
BroadcastBlockMethodName,
GetTxResu... |
<<<<<<<
services.AddSingleton<IBlockAcceptedLogEventHandler, TransactionFeeCalculatorCoefficientUpdatedEventHandle>();
services.AddSingleton<IBlockAcceptedLogEventHandler, SymbolListToPayTxFeeUpdatedEventHandler>();
=======
services.AddSingleton<IBlockAcceptedLogEventProcessor, Tra... |
<<<<<<<
using AElf.Contracts.CrossChain;
=======
using AElf.Contracts.Genesis;
>>>>>>>
using AElf.Contracts.Genesis;
using AElf.Contracts.CrossChain;
<<<<<<<
public MappedState<Hash, CrossChainReceiveTokenInput> VerifiedCrossChainTransferTransaction { get; set; }
public CrossChainContractReferenceS... |
<<<<<<<
Logger.LogTrace("UpdateConsensus - Update");
=======
_amIMined = true;
_logger?.Trace("UpdateConsensus - Update");
>>>>>>>
Logger.LogTrace("UpdateConsensus - Update");
_amIMined = true;
<<<<<<<
... |
<<<<<<<
using AElf.Kernel.SmartContract.Application;
=======
using AElf.Kernel.Blockchain.Application;
>>>>>>>
using AElf.Kernel.SmartContract.Application;
using AElf.Kernel.Blockchain.Application; |
<<<<<<<
public override AmountAndTimeProportion GetAmountAndTimeProportionOfVoteWeight(Empty input)
{
return State.AmountAndTimeProportion.Value ?? GetDefaultAmountAndTimeProportion();
}
=======
public override SymbolList GetDistributingSymbolList(Empty input)
... |
<<<<<<<
typeof(AElf.Miner.Rpc.MinerRpcAElfModule),
typeof(CoreKernelAElfModule)
=======
typeof(KernelAElfModule)
>>>>>>>
typeof(CoreKernelAElfModule) |
<<<<<<<
nameof(ISmartContractZero.DeploySmartContract), DefaultCategory,
File.ReadAllBytes(typeof(TokenContract).Assembly.Location));
=======
nameof(ISmartContractZero.DeploySmartContract),
new ContractDeploymentInput()
{
... |
<<<<<<<
public void Remove(TKey key)
{
if (!Cache.TryGetValue(key, out var valuePair))
{
valuePair = LoadKey(key);
Cache[key] = valuePair;
}
valuePair.IsDeleted = true;
}
=======
public void Set(T... |
<<<<<<<
private readonly IStaticChainInformationProvider _staticChainInformationProvider;
private OsBlockchainNodeContext _blockchainNodeCtxt;
=======
private readonly IBlockAttachService _blockAttachService;
>>>>>>>
private readonly IStaticChainInformationProvider _staticCh... |
<<<<<<<
public class ServerServiceTestBase : AElfIntegratedTest<ConnectionServiceTestModule>
{
}
=======
public class GrpcNetworkDialerTestBase : AElfIntegratedTest<GrpcNetworkDialerTestModule>
{}
>>>>>>>
public class GrpcNetworkDialerTestBase : AElfIntegratedTest<GrpcNetworkDi... |
<<<<<<<
using AElf.Kernel.Consensus.Application;
using AElf.Kernel.TransactionPool.Application;
=======
>>>>>>>
using AElf.Kernel.TransactionPool.Application;
<<<<<<<
private readonly ITransactionInclusivenessProvider _transactionInclusivenessProvider;
private readonly IMiningService _miningService;... |
<<<<<<<
context.Services.AddSingleton<ITransactionInclusivenessProvider, TransactionInclusivenessProvider>();
context.Services.RemoveAll<IPreExecutionPlugin>();
=======
context.Services.AddSingleton<ITransactionPackingService, TransactionPackingService>();
... |
<<<<<<<
=======
private async Task SetBestChainAsync(List<ChainBlockLink> successLinks, Chain chain)
{
if (successLinks.Count == 0)
return;
Logger.LogDebug($"Set best chain for block height {string.Join(",", successLinks.Select(l => l.Height))}");
... |
<<<<<<<
var firstRound = await AEDPoSContractStub.GetCurrentRoundInformation.CallAsync(new Empty());
=======
var randomHashes = Enumerable.Range(0, AEDPoSContractTestConstants.InitialMinersCount).Select(_ => Hash.FromString("hash")).ToList();
var triggers = Enumerable.Range(0, AEDP... |
<<<<<<<
// Api.Assert(ValidateMiners(term.FirstRound),
// $"Miners list is wrong of round {term.FirstRound.RoundNumber}.");
// Api.Assert(ValidateMiners(term.SecondRound),
// $"Miners list is wrong of round {term.SecondRound.RoundNumber}.");
=======
var ... |
<<<<<<<
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected IScriptModulePlugin m_ScriptEngine;
protected ISceneChildEntity m_host;
=======
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMet... |
<<<<<<<
private readonly ConcurrentDictionary<Hash, Transaction> _txs = new ConcurrentDictionary<Hash, Transaction>();
private readonly ConcurrentDictionary<Hash, Transaction> _dPoStxs = new ConcurrentDictionary<Hash, Transaction>();
=======
private readonly ConcurrentDictionary<Hash, ITransac... |
<<<<<<<
LockWhiteList =
{
Context.GetContractAddressByName(SmartContractConstants.VoteContractSystemName),
Context.GetContractAddressByName(SmartContractConstants.ProfitContractSystemName),
Context.GetContractAddressByName(Smart... |
<<<<<<<
=======
using AElf.Kernel.SmartContract;
using AElf.Kernel.SmartContract.Domain;
using AElf.Kernel.SmartContractExecution.Events;
>>>>>>>
<<<<<<<
=======
using Google.Protobuf;
using Google.Protobuf.Collections;
>>>>>>>
using AElf.Kernel.SmartContract.Domain;
using Google.Protobuf.Collections; |
<<<<<<<
ResourceTypes = Enum.GetValues(typeof(ResourceType))
.Cast<ResourceType>().Select(x => x.ToString()).ToList();
=======
ResourceTypes = Enum.GetValues(typeof(UserResourceKey.Types.ResourceType))
.Cast<UserResourceKey.Types.ResourceType>().Select(x => x.To... |
<<<<<<<
typeof(Volo.Abp.AspNetCore.AbpAspNetCoreModule),
typeof(CoreKernelAElfModule),
=======
typeof(AbpAspNetCoreModule),
typeof(KernelAElfModule),
>>>>>>>
typeof(AbpAspNetCoreModule),
typeof(CoreKernelAElfModule), |
<<<<<<<
var networkOptions = context.ServiceProvider.GetService<IOptionsSnapshot<NetworkOptions>>().Value;
if (networkOptions.EnablePeerDiscovery)
{
var peerDiscoveryWorker = context.ServiceProvider.GetService<PeerDiscoveryWorker>();
await peerDiscov... |
<<<<<<<
sysTxs = FilterDpos(sysTxs);
=======
if (currentRoundInfo != null)
{
// Note that any txn wont be filtered if currentRoundInfo is null.
// It should be better if this parameter can be removed
... |
<<<<<<<
using AElf.Kernel.Services;
=======
using AElf.Kernel.TransactionPool.Infrastructure;
>>>>>>>
using AElf.Kernel.Services;
using AElf.Kernel.TransactionPool.Infrastructure;
<<<<<<<
IBlockSynchronizer blockSynchronizer,
IChainService chainService,
IConsensus consensus,
... |
<<<<<<<
using Acs4;
=======
using AElf.Contracts.Consensus.DPoS;
>>>>>>>
using Acs4;
using AElf.Contracts.Consensus.DPoS;
<<<<<<<
=======
using AElf.Kernel.Consensus.AElfConsensus.Application;
>>>>>>>
using AElf.Kernel.Consensus.AElfConsensus.Application;
<<<<<<<
return new DPoSInformationGeneration... |
<<<<<<<
new SmartContractService(_smartContractManager, _smartContractRunnerContainer, StateStore,
_functionMetadataService, _chainService), _transactionTraceManager, StateStore,
=======
new SmartContractService(_smartContractManager, _smartContractRunnerContainer, ... |
<<<<<<<
using AElf.Kernel.Manager.Interfaces;
=======
using AElf.Kernel.Managers;
using AElf.Kernel.Storages;
using AElf.Kernel.Types.Transaction;
>>>>>>>
using AElf.Kernel.Manager.Interfaces;
<<<<<<<
private readonly IChainManager _chainManager;
=======
>>>>>>>
private readonly IChainManager _ch... |
<<<<<<<
GetGenesisSmartContractDtosForReferendum(),
GetGenesisSmartContractDtosForAssociation(),
GetGenesisSmartContractDtosForTokenHolder(),
=======
>>>>>>>
GetGenesisSmartContractDtosForTokenHolder(), |
<<<<<<<
private readonly IBlockValidationService _blockValidationService;
private readonly IChainContextService _chainContextService;
public MockSetup(ILogger logger, IDataStore dataStore, IBlockValidationService blockValidationService, IChainContextService chainContextService)
=======... |
<<<<<<<
public const int TimeForNetwork = 100;
public const long MiningRewardPerBlock = 12500000;
public const int MinMinersCount = 9;
public const int RandomNumberRequestMinersCount = 5;
public const int RandomNumberDueRoundCount = 5;
=======
public const int MinimumIn... |
<<<<<<<
using AElf.Execution.Execution;
using AElf.Miner.EventMessages;
using AElf.Miner.TxMemPool;
=======
using Org.BouncyCastle.Asn1.X9;
using AElf.Miner.Rpc.Exceptions;
>>>>>>>
using AElf.Configuration;
using AElf.Cryptography.ECDSA;
using AElf.Kernel;
using AElf.Kernel.Managers;
using AElf.Miner.Rpc.Exceptions;... |
<<<<<<<
int chainId = ChainHelpers.GetChainId(serialNumber);
=======
int chainId = ChainHelper.GetChainId(serialNumber);
var info = State.SideChainInfos[chainId];
Assert(info == null, "Chain creation request already exists.");
>>>>>>>
int chainId = ChainHel... |
<<<<<<<
=======
//private bool testRealGravity;
>>>>>>>
private bool testRealGravity;
private int throttleCounter; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.