add on chain events types for generating types of python && Fix strat…

…um id (starcoinorg#2468)
ruyichang · Apr 30, 2021 · 843dfac · 843dfac
1 parent 5b59123
commit 843dfac
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2018"
 
 [dependencies]
 
-jsonrpc-tcp-server = { git = "https://github.com/starcoinorg/jsonrpc", rev = "ea1c05d445a8c9e2deef09d439674eb820489e0b"}
-jsonrpc-derive =  { git = "https://github.com/starcoinorg/jsonrpc", rev = "ea1c05d445a8c9e2deef09d439674eb820489e0b"}
-jsonrpc-core = { git = "https://github.com/starcoinorg/jsonrpc", rev = "ea1c05d445a8c9e2deef09d439674eb820489e0b",features=["arbitrary_precision"]}
-jsonrpc-pubsub = { git = "https://github.com/starcoinorg/jsonrpc", rev = "ea1c05d445a8c9e2deef09d439674eb820489e0b"}
+jsonrpc-tcp-server = { git = "https://github.com/starcoinorg/jsonrpc", rev = "a913ce4632c1989c8fa1810823ec7c209a50d26c"}
+jsonrpc-derive =  { git = "https://github.com/starcoinorg/jsonrpc", rev = "a913ce4632c1989c8fa1810823ec7c209a50d26c"}
+jsonrpc-core = { git = "https://github.com/starcoinorg/jsonrpc", rev = "a913ce4632c1989c8fa1810823ec7c209a50d26c",features=["arbitrary_precision"]}
+jsonrpc-pubsub = { git = "https://github.com/starcoinorg/jsonrpc", rev = "a913ce4632c1989c8fa1810823ec7c209a50d26c"}
 serde_json = { version="1.0", features = ["arbitrary_precision"]}
 serde = { version = "1.0.125" }
 hex = { version = "0.4.3", default-features = false }

diff --git a/stratum/src/stratum.rs b/stratum/src/stratum.rs
@@ -29,7 +29,8 @@ impl Stratum {
         }
     }
     fn next_id(&self) -> SubscriptionId {
-        SubscriptionId::Number(1)
+        let id = self.uid.fetch_add(1, atomic::Ordering::SeqCst);
+        SubscriptionId::Number(id)
     }
     fn sync_current_job(&mut self) -> Result<Option<MintBlockEvent>> {
         let service = self.miner_service.clone();

diff --git a/testsuite/generate-format/tests/staged/starcoin.yaml b/testsuite/generate-format/tests/staged/starcoin.yaml
@@ -346,4 +346,71 @@ EventFilter:
         SEQ:
           TYPENAME: EventKey
     - limit:
-        OPTION: U64
+        OPTION: U64
+AcceptTokenEvent:
+  STRUCT:
+    - token_code:
+        TYPENAME: TokenCode
+AccountAddress:
+  NEWTYPESTRUCT:
+    TUPLEARRAY:
+      CONTENT: U8
+      SIZE: 16
+BlockRewardEvent:
+  STRUCT:
+    - block_number: U64
+    - block_reward: U128
+    - gas_fees: U128
+    - miner:
+        TYPENAME: AccountAddress
+BurnEvent:
+  STRUCT:
+    - amount: U128
+    - token_code:
+        TYPENAME: TokenCode
+DepositEvent:
+  STRUCT:
+    - amount: U128
+    - token_code:
+        TYPENAME: TokenCode
+    - metadata:
+        SEQ: U8
+MintEvent:
+  STRUCT:
+    - amount: U128
+    - token_code:
+        TYPENAME: TokenCode
+NewBlockEvent:
+  STRUCT:
+    - number: U64
+    - author:
+        TYPENAME: AccountAddress
+    - timestamp: U64
+    - uncles: U64
+ProposalCreatedEvent:
+  STRUCT:
+    - proposal_id: U64
+    - proposer:
+        TYPENAME: AccountAddress
+TokenCode:
+  STRUCT:
+    - address:
+        TYPENAME: AccountAddress
+    - module: STR
+    - name: STR
+VoteChangedEvent:
+  STRUCT:
+    - proposal_id: U64
+    - proposer:
+        TYPENAME: AccountAddress
+    - voter:
+        TYPENAME: AccountAddress
+    - agree: BOOL
+    - vote: U128
+WithdrawEvent:
+  STRUCT:
+    - amount: U128
+    - token_code:
+        TYPENAME: TokenCode
+    - metadata:
+        SEQ: U8