Halborn finding fixes (#572)

* [Bug]: Fix calculate discount and add more tests (#570) * add calculate discount test and bug fix * get asset by denom * ci: use post-upgrade-snapshot-generator (#571) * ci: use post-upgrade-snapshot-generator * ci: update delete snapshot CI to use post upgrade snapshot gen binary * halborn finding fixes * fix masterchef external incentive add * resolve tests --------- Co-authored-by: Amit Yadav <[email protected]> Co-authored-by: Cosmic Vagabond <[email protected]>
elys-network · Jun 19, 2024 · a64745a · a64745a
1 parent 19635d9
commit a64745a
Show file tree

Hide file tree

Showing 36 changed files with 250 additions and 457 deletions.
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -41978,10 +41978,10 @@ paths:
                     format: uint64
                   from_block:
                     type: string
-                    format: uint64
+                    format: int64
                   to_block:
                     type: string
-                    format: uint64
+                    format: int64
                   amount_per_block:
                     type: string
                   apr:
@@ -87291,10 +87291,10 @@ definitions:
         format: uint64
       from_block:
         type: string
-        format: uint64
+        format: int64
       to_block:
         type: string
-        format: uint64
+        format: int64
       amount_per_block:
         type: string
       apr:
@@ -87449,10 +87449,10 @@ definitions:
             format: uint64
           from_block:
             type: string
-            format: uint64
+            format: int64
           to_block:
             type: string
-            format: uint64
+            format: int64
           amount_per_block:
             type: string
           apr:

diff --git a/proto/elys/masterchef/external_incentive.proto b/proto/elys/masterchef/external_incentive.proto
@@ -10,10 +10,12 @@ message ExternalIncentive {
   uint64 id = 1;
   string reward_denom = 2;
   uint64 pool_id = 3;
-  uint64 from_block = 4;
-  uint64 to_block = 5;
-	string amount_per_block = 6
-    [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
+  int64 from_block = 4;
+  int64 to_block = 5;
+  string amount_per_block = 6 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
   string apr = 7 
     [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
diff --git a/proto/elys/masterchef/tx.proto b/proto/elys/masterchef/tx.proto
@@ -32,8 +32,8 @@ message MsgAddExternalIncentive {
     string sender = 1;
     string reward_denom = 2;
     uint64 pool_id = 3;
-    uint64 from_block = 4;
-    uint64 to_block = 5;
+    int64 from_block = 4;
+    int64 to_block = 5;
     string amount_per_block = 6
         [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
 }

diff --git a/x/accountedpool/types/query.pb.gw.go b/x/accountedpool/types/query.pb.gw.go