Merge branch 'development' into improve/state-query-doc

planetarium · Feb 25, 2021 · 190777b · 190777b
2 parents 2d088a4 + 65e7294
commit 190777b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - 9c-main
+      - development
 
 jobs:
   build_and_push:
@@ -17,7 +18,7 @@ jobs:
       - name: login
         run: docker login --username '${{ secrets.DOCKER_USERNAME }}' --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}'
       - name: build
-        run: docker build . -t planetariumhq/ninechronicles-headless:git-${{ github.sha }} --build-arg COMMIT=git-${{ github.sha }} --build-arg COMMIT=git-${{ github.sha }}
+        run: docker build . -t planetariumhq/ninechronicles-headless:git-${{ github.sha }} --build-arg COMMIT=git-${{ github.sha }}
       - name: push git-version
         run: docker push planetariumhq/ninechronicles-headless:git-${{ github.sha }}
 
diff --git a/NineChronicles.Headless/Controllers/GraphQLController.cs b/NineChronicles.Headless/Controllers/GraphQLController.cs
@@ -32,7 +32,6 @@ public class GraphQLController : ControllerBase
         private ConcurrentDictionary<Address, long> NotificationRecords { get; }
             = new ConcurrentDictionary<Address, long>();
         private StandaloneContext StandaloneContext { get; }
-        private Address _address;
 
         public const string RunStandaloneEndpoint = "/run-standalone";
 
@@ -115,9 +114,8 @@ public IActionResult SetPrivateKey([FromBody] SetPrivateKeyRequest request)
 
             var privateKey = new PrivateKey(ByteUtil.ParseHex(request.PrivateKeyString));
             StandaloneContext.NineChroniclesNodeService.PrivateKey = privateKey;
-            _address = privateKey.PublicKey.ToAddress();
-            var msg = $"Private key set ({privateKey.PublicKey.ToAddress()}).";
-            Log.Debug(msg);
+            var msg = $"Private key set ({StandaloneContext.NineChroniclesNodeService.PrivateKey.PublicKey.ToAddress()}).";
+            Log.Information("SetPrivateKey: {Msg}", msg);
             return Ok(msg);
         }
 
@@ -249,34 +247,41 @@ bool NeedsRefillNotification(AvatarState avatarState)
 
         private void NotifyAction(ActionBase.ActionEvaluation<ActionBase> eval)
         {
-            if (eval.OutputStates.UpdatedAddresses.Contains(_address))
+            if (StandaloneContext.NineChroniclesNodeService.PrivateKey is null)
             {
-                if (eval.Signer == _address)
+                Log.Information("PrivateKey is not set. please call SetPrivateKey() first.");
+                return;
+            }
+            Address address = StandaloneContext.NineChroniclesNodeService.PrivateKey.PublicKey.ToAddress();
+            if (eval.OutputStates.UpdatedAddresses.Contains(address) || eval.Signer == address)
+            {
+                if (eval.Signer == address)
                 {
                     var type = NotificationEnum.Refill;
                     var msg = string.Empty;
                     switch (eval.Action)
                     {
-                        case HackAndSlash3 has:
+                        case HackAndSlash4 has:
                             type = NotificationEnum.HAS;
                             msg = has.stageId.ToString(CultureInfo.InvariantCulture);
                             break;
-                        case CombinationConsumable2 _:
+                        case CombinationConsumable3 _:
                             type = NotificationEnum.CombinationConsumable;
                             break;
-                        case CombinationEquipment3 _:
+                        case CombinationEquipment4 _:
                             type = NotificationEnum.CombinationEquipment;
                             break;
-                        case Buy3 _:
+                        case Buy4 _:
                             type = NotificationEnum.Buyer;
                             break;
                     }
+                    Log.Information("NotifyAction: Type: {Type} MSG: {Msg}", type, msg);
                     var notification = new Notification(type, msg);
                     StandaloneContext.NotificationSubject.OnNext(notification);
                 }
                 else
                 {
-                    if (eval.Action is Buy3 buy && buy.sellerAgentAddress == _address)
+                    if (eval.Action is Buy4 buy && buy.sellerAgentAddress == address)
                     {
                         var notification = new Notification(NotificationEnum.Seller);
                         StandaloneContext.NotificationSubject.OnNext(notification);