rebase

starcoinorg · Sep 29, 2022 · c3038cb · c3038cb
1 parent b09ba9b
commit c3038cb
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -327,7 +327,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: C418E52E298E7210FDE1B8940380A857EC8FD1C313530D80EC6BCD9F4A547033
+  source_digest: BA11C8B16393EE8048481F812F0038A5D20D703FD7F7B2B9BD5F49840B6703E1
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/integration-tests/daospace/dao_ext.exp b/integration-tests/daospace/dao_ext.exp
@@ -2,7 +2,7 @@ processed 9 tasks
 
 task 6 'run'. lines 56-65:
 {
-  "gas_used": 1035755,
+  "gas_used": 1008684,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_grant.exp b/integration-tests/daospace/dao_grant.exp
@@ -18,7 +18,7 @@ task 5 'run'. lines 13-21:
 
 task 8 'run'. lines 123-134:
 {
-  "gas_used": 1839336,
+  "gas_used": 1812265,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_proposal.exp b/integration-tests/daospace/dao_proposal.exp
@@ -2,7 +2,7 @@ processed 42 tasks
 
 task 7 'run'. lines 158-169:
 {
-  "gas_used": 1836539,
+  "gas_used": 1809468,
   "status": "Executed"
 }
 
@@ -121,6 +121,6 @@ task 39 'run'. lines 444-454:
 
 task 41 'run'. lines 459-471:
 {
-  "gas_used": 461159,
+  "gas_used": 452403,
   "status": "Executed"
 }
diff --git a/integration-tests/daospace/dao_proposal_rejected.exp b/integration-tests/daospace/dao_proposal_rejected.exp
@@ -2,7 +2,7 @@ processed 40 tasks
 
 task 7 'run'. lines 126-135:
 {
-  "gas_used": 1239905,
+  "gas_used": 1212834,
   "status": {
     "MoveAbort": {
       "location": {

diff --git a/integration-tests/daospace/dao_upgrade.exp b/integration-tests/daospace/dao_upgrade.exp
@@ -20,7 +20,7 @@ task 9 'run'. lines 130-144:
 
 task 10 'run'. lines 145-154:
 {
-  "gas_used": 1122278,
+  "gas_used": 1095207,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/dao_upgrade_incompatible.exp b/integration-tests/daospace/dao_upgrade_incompatible.exp
@@ -14,7 +14,7 @@ task 9 'run'. lines 117-132:
 
 task 10 'run'. lines 134-143:
 {
-  "gas_used": 1122278,
+  "gas_used": 1095207,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/stake_to_sbt_plugin.exp b/integration-tests/daospace/stake_to_sbt_plugin.exp
@@ -2,7 +2,7 @@ processed 17 tasks
 
 task 5 'run'. lines 71-79:
 {
-  "gas_used": 1785765,
+  "gas_used": 1758694,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospace/xdao.exp b/integration-tests/daospace/xdao.exp
@@ -2,7 +2,7 @@ processed 7 tasks
 
 task 3 'run'. lines 54-61:
 {
-  "gas_used": 1195341,
+  "gas_used": 1168270,
   "status": "Executed"
 }
 

diff --git a/integration-tests/daospaceplugin/gas_oracle_plugin.exp b/integration-tests/daospaceplugin/gas_oracle_plugin.exp
@@ -59,6 +59,6 @@ task 24 'run'. lines 221-229:
 
 task 26 'run'. lines 234-251:
 {
-  "gas_used": 581714,
+  "gas_used": 582817,
   "status": "Executed"
 }
diff --git a/integration-tests/daospaceplugin/mint_proposal_plugin.exp b/integration-tests/daospaceplugin/mint_proposal_plugin.exp
@@ -8,7 +8,7 @@ task 8 'run'. lines 71-85:
 
 task 9 'run'. lines 87-96:
 {
-  "gas_used": 1260277,
+  "gas_used": 1233206,
   "status": "Executed"
 }
 
@@ -76,6 +76,6 @@ task 26 'run'. lines 232-246:
 
 task 28 'run'. lines 250-271:
 {
-  "gas_used": 524043,
+  "gas_used": 515357,
   "status": "Executed"
 }
diff --git a/integration-tests/daospaceplugin/salary_gov_plugin.exp b/integration-tests/daospaceplugin/salary_gov_plugin.exp
@@ -2,7 +2,7 @@ processed 21 tasks
 
 task 7 'run'. lines 252-264:
 {
-  "gas_used": 1794501,
+  "gas_used": 1767430,
   "status": "Executed"
 }
 

diff --git a/sources/daospaceplugin/GasOracleProposalPlugin.move b/sources/daospaceplugin/GasOracleProposalPlugin.move
@@ -21,11 +21,11 @@ module StarcoinFramework::GasOracleProposalPlugin {
         precision: u8
     }
 
-    struct OracleSourceAddAction<phantom TokenType: store> has store {
+    struct OracleSourceAddAction<phantom TokenType: store> has store, drop {
         source_address: address
     }
 
-    struct OracleSourceRemoveAction<phantom TokenType: store> has store {
+    struct OracleSourceRemoveAction<phantom TokenType: store> has store, drop {
         source_address: address
     }