chore: update to expiration_time

gmove-io · Nov 20, 2024 · 10792c0 · 10792c0
1 parent d38dff0
commit 10792c0
Show file tree

Hide file tree

Showing 28 changed files with 143 additions and 90 deletions.
diff --git a/examples/sources/access_control.move b/examples/sources/access_control.move
@@ -49,7 +49,7 @@ public fun propose_update_fee(
     multisig: &mut Multisig, 
     key: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     description: String,
     fee: u64,
     ctx: &mut TxContext
@@ -61,7 +61,7 @@ public fun propose_update_fee(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
     proposal_mut.add_action(UpdateFee { fee });

diff --git a/examples/sources/access_control_composable.move b/examples/sources/access_control_composable.move
@@ -49,7 +49,7 @@ public fun propose_update_fee(
     multisig: &mut Multisig, 
     key: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     description: String,
     fee: u64,
     ctx: &mut TxContext
@@ -61,7 +61,7 @@ public fun propose_update_fee(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
     new_update_fee(proposal_mut, fee);

diff --git a/examples/sources/upgrade_and_restrict.move b/examples/sources/upgrade_and_restrict.move
@@ -31,7 +31,7 @@ public fun propose_upgrade(
     multisig: &mut Multisig, 
     key: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     description: String,
     name: String,
     digest: vector<u8>,
@@ -47,7 +47,7 @@ public fun propose_upgrade(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
     // first we would like to upgrade

diff --git a/examples/sources/upgrade_rule.move b/examples/sources/upgrade_rule.move
@@ -44,7 +44,7 @@ module examples::upgrade_rule {
         multisig: &mut Multisig, 
         key: String,
         execution_time: u64,
-        expiration_epoch: u64,
+        expiration_time: u64,
         description: String,
         digest: vector<u8>,
         lock: &UpgradeLock,
@@ -61,7 +61,7 @@ module examples::upgrade_rule {
             b"".to_string(),
             description,
             execution_time,
-            expiration_epoch,
+            expiration_time,
             ctx
         );
 

diff --git a/packages/actions/Move.lock b/packages/actions/Move.lock
@@ -2,15 +2,26 @@
 
 [move]
 version = 3
-manifest_digest = "623B928F2557599345F27FA0DBD20673C0D2D7F417FD3D8F15E02FC3CD713B3A"
-deps_digest = "F9B494B64F0615AED0E98FC12A85B85ECD2BC5185C22D30E7F67786BB52E507C"
+manifest_digest = "09983F337E1A9CACD0ABE0FAE9A215C4EF33258AF9D6B2C3D2C5C461DB71CFD3"
+deps_digest = "397E6A9F7A624706DBDFEE056CE88391A15876868FD18A88504DA74EB458D697"
 dependencies = [
+  { id = "AccountConfig", name = "AccountConfig" },
   { id = "AccountExtensions", name = "AccountExtensions" },
   { id = "AccountProtocol", name = "AccountProtocol" },
   { id = "Kiosk", name = "Kiosk" },
   { id = "Sui", name = "Sui" },
 ]
 
+[[move.package]]
+id = "AccountConfig"
+source = { local = "../config" }
+
+dependencies = [
+  { id = "AccountExtensions", name = "AccountExtensions" },
+  { id = "AccountProtocol", name = "AccountProtocol" },
+  { id = "Sui", name = "Sui" },
+]
+
 [[move.package]]
 id = "AccountExtensions"
 source = { local = "../extensions" }
@@ -57,6 +68,6 @@ flavor = "sui"
 
 [env.testnet]
 chain-id = "4c78adac"
-original-published-id = "0xbd4c78226735c67c73d1ca38d515b6f8ff98c28e82fe20df70b530bf096fc7d5"
-latest-published-id = "0xbd4c78226735c67c73d1ca38d515b6f8ff98c28e82fe20df70b530bf096fc7d5"
+original-published-id = "0x44d7e0d34256670a0c41927282b8a738137a9a52d109db113cad5ab44e889676"
+latest-published-id = "0x44d7e0d34256670a0c41927282b8a738137a9a52d109db113cad5ab44e889676"
 published-version = "1"
diff --git a/packages/actions/Move.toml b/packages/actions/Move.toml
@@ -18,12 +18,15 @@ rev = "testnet"
 [dependencies.AccountProtocol]
 local = "../protocol"
 
+[dependencies.AccountConfig]
+local = "../config"
+
 [dependencies.AccountExtensions]
 local = "../extensions"
 
 [addresses]
-account_config = "0x9e27e8950bb08c32342feb6277f11abb4d0f7efee0aefde04062f7acf4977af1"
-account_actions = "0xbd4c78226735c67c73d1ca38d515b6f8ff98c28e82fe20df70b530bf096fc7d5"
-account_protocol = "0xfab9c0343c7710a5a10f4edca62c4dd25f742010086289cd89dd8e66c1b0e7c2"
-account_extensions = "0x1114fd9cc11d62d5e5390b37e8389688e9023358075e6e0c23ab9773ddae155d"
+account_config = "0x62f210209975f48d52705d4f5b9383d1715ac4a72f2790f19c706c7aceb5ec5f"
+account_actions = "0x44d7e0d34256670a0c41927282b8a738137a9a52d109db113cad5ab44e889676"
+account_protocol = "0x0216b1790ffa86e5147b8ace8b2bdc0ba04fe5970d42eddcf33f8f3512134adc"
+account_extensions = "0x7d84a9d786503d6de795896df00a5729588de1723c433fd727edd5842d413624"
 kiosk = "0xbd8fc1947cf119350184107a3087e2dc27efefa0dd82e25a1f699069fe81a585"
diff --git a/packages/actions/sources/access_control.move b/packages/actions/sources/access_control.move
@@ -84,7 +84,7 @@ public fun propose_access<Config, Outcome, Cap>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     ctx: &mut TxContext
 ) {
     assert!(has_lock<Config, Outcome, Cap>(account), ENoLock);
@@ -98,7 +98,7 @@ public fun propose_access<Config, Outcome, Cap>(
         key, 
         description, 
         execution_time, 
-        expiration_epoch, 
+        expiration_time, 
         ctx
     );
 

diff --git a/packages/actions/sources/config.move b/packages/actions/sources/config.move
@@ -79,7 +79,7 @@ public fun propose_config_metadata<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     keys: vector<String>,
     values: vector<String>,
     ctx: &mut TxContext
@@ -93,7 +93,7 @@ public fun propose_config_metadata<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -121,7 +121,7 @@ public fun propose_config_deps<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     extensions: &Extensions,
     names: vector<String>,
     addresses: vector<address>,
@@ -137,7 +137,7 @@ public fun propose_config_deps<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 

diff --git a/packages/actions/sources/currency.move b/packages/actions/sources/currency.move
@@ -217,7 +217,7 @@ public fun propose_disable<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     disable_mint: bool,
     disable_burn: bool,
     disable_update_symbol: bool,
@@ -237,7 +237,7 @@ public fun propose_disable<Config, Outcome, CoinType>(
         key, 
         description, 
         execution_time, 
-        expiration_epoch, 
+        expiration_time, 
         ctx
     );
 
@@ -274,7 +274,7 @@ public fun propose_mint<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     amount: u64,
     ctx: &mut TxContext
 ) {
@@ -292,7 +292,7 @@ public fun propose_mint<Config, Outcome, CoinType>(
         key, 
         description, 
         execution_time, 
-        expiration_epoch, 
+        expiration_time, 
         ctx
     );
 
@@ -326,7 +326,7 @@ public fun propose_burn<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     coin_id: ID,
     amount: u64,
     ctx: &mut TxContext
@@ -344,7 +344,7 @@ public fun propose_burn<Config, Outcome, CoinType>(
         key, 
         description, 
         execution_time, 
-        expiration_epoch, 
+        expiration_time, 
         ctx
     );
 
@@ -380,7 +380,7 @@ public fun propose_update<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     md_symbol: Option<ascii::String>,
     md_name: Option<String>,
     md_description: Option<String>,
@@ -404,7 +404,7 @@ public fun propose_update<Config, Outcome, CoinType>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -440,7 +440,7 @@ public fun propose_transfer<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     amounts: vector<u64>,
     recipients: vector<address>,
     ctx: &mut TxContext
@@ -462,7 +462,7 @@ public fun propose_transfer<Config, Outcome, CoinType>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -504,7 +504,7 @@ public fun propose_vesting<Config, Outcome, CoinType>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     total_amount: u64,
     start_timestamp: u64, 
     end_timestamp: u64, 
@@ -525,7 +525,7 @@ public fun propose_vesting<Config, Outcome, CoinType>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 

diff --git a/packages/actions/sources/kiosk.move b/packages/actions/sources/kiosk.move
@@ -211,7 +211,7 @@ public fun propose_take<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     kiosk_name: String,
     nft_ids: vector<ID>,
     recipient: address,
@@ -228,7 +228,7 @@ public fun propose_take<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -265,7 +265,7 @@ public fun propose_list<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     kiosk_name: String,
     nft_ids: vector<ID>,
     prices: vector<u64>,
@@ -283,7 +283,7 @@ public fun propose_list<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 

diff --git a/packages/actions/sources/owned.move b/packages/actions/sources/owned.move
@@ -62,7 +62,7 @@ public fun propose_transfer<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     object_ids: vector<ID>,
     recipients: vector<address>,
     ctx: &mut TxContext
@@ -77,7 +77,7 @@ public fun propose_transfer<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -115,7 +115,7 @@ public fun propose_vesting<Config, Outcome>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     coin_id: ID, // coin owned by the account, must have the total amount to be paid
     start_timestamp: u64,
     end_timestamp: u64, 
@@ -131,7 +131,7 @@ public fun propose_vesting<Config, Outcome>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 

diff --git a/packages/actions/sources/treasury.move b/packages/actions/sources/treasury.move
@@ -163,7 +163,7 @@ public fun propose_transfer<Config, Outcome, CoinType: drop>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     treasury_name: String,
     amounts: vector<u64>,
     recipients: vector<address>,
@@ -184,7 +184,7 @@ public fun propose_transfer<Config, Outcome, CoinType: drop>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );
 
@@ -222,7 +222,7 @@ public fun propose_vesting<Config, Outcome, CoinType: drop>(
     key: String,
     description: String,
     execution_time: u64,
-    expiration_epoch: u64,
+    expiration_time: u64,
     treasury_name: String, 
     coin_amount: u64, 
     start_timestamp: u64, 
@@ -243,7 +243,7 @@ public fun propose_vesting<Config, Outcome, CoinType: drop>(
         key,
         description,
         execution_time,
-        expiration_epoch,
+        expiration_time,
         ctx
     );