Skip to content

Commit

Permalink
devhawk/storage-fix (#101)
Browse files Browse the repository at this point in the history 
* re-enable ParseStorage on adapter 3

* esnure storage key hash code is 8 characters long

Co-authored-by: Harry <[email protected]>
  • Loading branch information
@devhawk
devhawk and Harry authored Mar 29, 2021
1 parent 1ea6849 commit ff8f8aa
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 46 deletions.
94 changes: 49 additions & 45 deletions src/adapter3/LaunchConfigParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace NeoDebug.Neo3
{
using ConfigProps = IReadOnlyDictionary<string, JToken>;
using Invocation = OneOf<LaunchConfigParser.InvokeFileInvocation, LaunchConfigParser.OracleResponseInvocation, LaunchConfigParser.LaunchInvocation, LaunchConfigParser.ContractDeployInvocation>;
// using Storages = IEnumerable<(byte[] key, StorageItem item)>;
using Storages = IEnumerable<(byte[] key, StorageItem item)>;

partial class LaunchConfigParser
{
Expand Down Expand Up @@ -134,8 +134,10 @@ static async Task<IApplicationEngine> CreateDebugEngineAsync(ConfigProps config,
}
else
{
var (lauchContractId, launchContractHash) = EnsureContractDeployed(store, launchNefFile, launchManifest, signers, settings);
var paramParser = CreateContractParameterParser(settings.AddressVersion, store, chain);

var (lauchContractId, launchContractHash) = EnsureContractDeployed(store, launchNefFile, launchManifest, signers, settings);
UpdateContractStorage(store, lauchContractId, ParseStorage(config, paramParser));
invokeScript = await CreateInvokeScriptAsync(invocation, program, launchContractHash, paramParser);

if (invocation.IsT1) // T1 == OracleResponseInvocation
Expand Down Expand Up @@ -380,6 +382,25 @@ static int GetNextAvailableId(DataCache snapshot)
}
}

static void UpdateContractStorage(IStore store, int contractId, Storages storages)
{
using var snapshot = new SnapshotCache(store.GetSnapshot());
foreach (var (key, storageItem) in storages)
{
var storageKey = new StorageKey() { Id = contractId, Key = key };
var item = snapshot.GetAndChange(storageKey);
if (item == null)
{
snapshot.Add(storageKey, new StorageItem() { Value = storageItem.Value });
}
else
{
item.Value = storageItem.Value;
}
}
snapshot.Commit();
}

// stripped down Blockchain.Persist logic to initize empty blockchain
static void EnsureLedgerInitialized(IStore store, ProtocolSettings settings)
{
Expand Down Expand Up @@ -455,19 +476,6 @@ static Task<Script> CreateInvokeScriptAsync(Invocation invocation, string progra
deployment => Task.FromException<Script>(new Exception("CreateInvokeScriptAsync doesn't support ContractDeploymentInvocation")));
}


// static void UpdateContractStorage(IStore store, int contractId, Storages storages)
// {
// using var snapshot = new SnapshotCache(store.GetSnapshot());
// foreach (var (key, item) in storages)
// {
// var storageKey = new StorageKey() { Id = contractId, Key = key };
// var updatedItem = snapshot.GetAndChange(storageKey);
// updatedItem.Value = item.Value;
// }
// snapshot.Commit();
// }

static TransactionAttribute[] GetTransactionAttributes(in OracleResponseInvocation invocation, IStore store, UInt160 contractHash, ContractParameterParser paramParser)
{
var (requestId, request) = GetOracleRequestId(store, invocation, contractHash, paramParser);
Expand Down Expand Up @@ -572,6 +580,32 @@ public StackItem ToStackItem(ReferenceCounter referenceCounter)
}
}

static Storages ParseStorage(ConfigProps config, ContractParameterParser paramParser)
=> config.TryGetValue("storage", out var token)
? ParseStorage(token, paramParser)
: Enumerable.Empty<(byte[], StorageItem)>();

static Storages ParseStorage(JToken? token, ContractParameterParser paramParser)
{
return token == null
? Enumerable.Empty<(byte[], StorageItem)>()
: token.Select(t =>
{
var key = ConvertParameter(t["key"], paramParser);
var item = new StorageItem
{
Value = ConvertParameter(t["value"], paramParser)
};
return (key, item);
});

static byte[] ConvertParameter(JToken? token, ContractParameterParser paramParser)
{
var arg = paramParser.ParseParameter(token ?? JValue.CreateNull());
return arg.ToStackItem().GetSpan().ToArray();
}
}

static (TriggerType trigger, Func<byte[], bool>? witnessChecker) ParseRuntime(ConfigProps config, ExpressChain? chain, byte version)
{
if (config.TryGetValue("runtime", out var jsonRuntime))
Expand Down Expand Up @@ -748,35 +782,5 @@ static async IAsyncEnumerable<DebugInfo> LoadDebugInfosAsync(ConfigProps config,
// // }
// // }
// // }


// static Storages ParseStorage(Dictionary<string, JToken> config, ContractParameterParser paramParser)
// {
// return config.TryGetValue("storage", out var token)
// ? ParseStorage(token, paramParser)
// : Enumerable.Empty<(byte[], StorageItem)>();
// }

// static Storages ParseStorage(JToken? token, ContractParameterParser paramParser)
// {
// return token == null
// ? Enumerable.Empty<(byte[], StorageItem)>()
// : token.Select(t =>
// {
// var key = ConvertParameter(t["key"], paramParser);
// var item = new StorageItem
// {
// Value = ConvertParameter(t["value"], paramParser)
// };
// return (key, item);
// });

// static byte[] ConvertParameter(JToken? token, ContractParameterParser paramParser)
// {
// var arg = paramParser.ParseParameter(token ?? JValue.CreateNull());
// return arg.ToStackItem().GetSpan().ToArray();
// }
// }

}
}
2 changes: 1 addition & 1 deletion src/adapter3/VariableContainers/StorageContainerBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public IEnumerable<Variable> Enumerate(IVariableManager manager)
var storages = GetStorages();
foreach (var (key, item) in storages)
{
var keyHashCode = key.Span.GetSequenceHashCode().ToString("x");
var keyHashCode = key.Span.GetSequenceHashCode().ToString("x8");
var kvp = new KvpContainer(key, item, keyHashCode);
yield return new Variable()
{
Expand Down

0 comments on commit ff8f8aa

Please sign in to comment.