Merge pull request #89 from Elements-Studio/buy_back_fix_gap_time

Buy back fix gap time
Elements-Studio · Nov 30, 2022 · 34ac13d · 34ac13d
2 parents ca94c57 + 154bceb
commit 34ac13d
Show file tree

Hide file tree

Showing 6 changed files with 237 additions and 95 deletions.
diff --git a/aptos/bridge/Move.toml b/aptos/bridge/Move.toml
@@ -4,7 +4,10 @@ version = "1.0.0"
 
 [addresses]
 bridge = "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa"
+move_std = "0x1"
+aptos_framework = "0x1"
+aptos_std = "0x1"
+aptos_token = "0x3"
 
 [dependencies]
 AptosFramework = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "01108a2345b87d539d54a67b32db55193f9ace40", subdir = "aptos-move/framework/aptos-framework"}
-
diff --git a/starcoin/Move.toml b/starcoin/Move.toml
@@ -1,6 +1,6 @@
 [package]
 name = "Starswap-Core"
-version = "2.0.3"
+version = "2.0.5"
 
 [addresses]
 StarcoinFramework = "0x1"

diff --git a/starcoin/integration-tests/gov/buy_back_test.exp b/starcoin/integration-tests/gov/buy_back_test.exp
@@ -32,25 +32,25 @@ task 10 'run'. lines 110-152:
 
 task 12 'run'. lines 156-200:
 {
-  "gas_used": 1916214,
+  "gas_used": 1921293,
   "status": "Executed"
 }
 
 task 14 'run'. lines 204-237:
 {
-  "gas_used": 45171,
+  "gas_used": 45001,
   "status": "Executed"
 }
 
 task 16 'run'. lines 241-271:
 {
-  "gas_used": 1670304,
+  "gas_used": 1675383,
   "status": "Executed"
 }
 
 task 18 'run'. lines 276-302:
 {
-  "gas_used": 30939,
+  "gas_used": 30769,
   "status": "Executed"
 }
 

diff --git a/starcoin/integration-tests/gov/timely_release_pool_test.exp b/starcoin/integration-tests/gov/timely_release_pool_test.exp
@@ -1,24 +1,24 @@
-processed 17 tasks
+processed 23 tasks
 
-task 4 'run'. lines 54-74:
+task 5 'run'. lines 59-78:
 {
   "gas_used": 741952,
   "status": "Executed"
 }
 
-task 5 'run'. lines 76-114:
+task 6 'run'. lines 80-117:
 {
   "gas_used": 723904,
   "status": "Executed"
 }
 
-task 6 'run'. lines 117-156:
+task 7 'run'. lines 120-157:
 {
-  "gas_used": 120754,
+  "gas_used": 137404,
   "status": "Executed"
 }
 
-task 7 'run'. lines 158-171:
+task 8 'run'. lines 159-171:
 {
   "gas_used": 24309,
   "status": {
@@ -34,9 +34,9 @@ task 7 'run'. lines 158-171:
   }
 }
 
-task 9 'run'. lines 175-191:
+task 10 'run'. lines 175-190:
 {
-  "gas_used": 24309,
+  "gas_used": 29121,
   "status": {
     "MoveAbort": {
       "location": {
@@ -45,14 +45,26 @@ task 9 'run'. lines 175-191:
           "name": "TimelyReleasePool"
         }
       },
-      "abort_code": "769025"
+      "abort_code": "512513"
     }
   }
 }
 
-task 11 'run'. lines 195-213:
+task 12 'run'. lines 194-211:
+{
+  "gas_used": 92550,
+  "status": "Executed"
+}
+
+task 14 'run'. lines 215-232:
 {
-  "gas_used": 24511,
+  "gas_used": 92550,
+  "status": "Executed"
+}
+
+task 15 'run'. lines 235-253:
+{
+  "gas_used": 29121,
   "status": {
     "MoveAbort": {
       "location": {
@@ -66,20 +78,26 @@ task 11 'run'. lines 195-213:
   }
 }
 
-task 13 'run'. lines 217-235:
+task 16 'run'. lines 255-274:
+{
+  "gas_used": 59111,
+  "status": "Executed"
+}
+
+task 18 'run'. lines 278-292:
 {
-  "gas_used": 87301,
+  "gas_used": 97681,
   "status": "Executed"
 }
 
-task 15 'run'. lines 239-257:
+task 20 'run'. lines 296-323:
 {
-  "gas_used": 87301,
+  "gas_used": 44401,
   "status": "Executed"
 }
 
-task 16 'run'. lines 259-275:
+task 22 'run'. lines 327-362:
 {
-  "gas_used": 73629,
+  "gas_used": 130740,
   "status": "Executed"
 }