[Framework] Resolve merge conflicts in supra framework (#295)

* resolve merge conflicts in framework

* renaming

* address comments

* address comments

* revert changes to AggregatableCoin

* trivial

* adapt to supra

* rename

* address comments

Author: fEst1ck

aptos-move/framework/supra-framework/sources/account/account_abstraction.move

@@ -201,7 +201,7 @@ module supra_framework::account_abstraction {
     }
 
     inline fun resource_addr(source: address): address {
-        object::create_user_derived_object_address(source, @aptos_fungible_asset)
+        object::create_user_derived_object_address(source, @supra_fungible_asset)
     }
 
     fun update_dispatchable_authenticator_impl(

aptos-move/framework/supra-framework/sources/aggregator/aggregator_factory.move

@@ -39,13 +39,18 @@ module supra_framework::aggregator_factory {
 
     /// Creates a new aggregator instance which overflows on exceeding a `limit`.
     public(friend) fun create_aggregator_internal(): Aggregator acquires AggregatorFactory {
+        create_aggregator_internal_with_limit(MAX_U128)
+    }
+
+    /// Creates a new aggregator instance which overflows on exceeding a `limit`.
+    public(friend) fun create_aggregator_internal_with_limit(limit: u128): Aggregator acquires AggregatorFactory {
         assert!(
             exists<AggregatorFactory>(@supra_framework),
             error::not_found(EAGGREGATOR_FACTORY_NOT_FOUND)
         );
 
         let aggregator_factory = borrow_global_mut<AggregatorFactory>(@supra_framework);
-        new_aggregator(aggregator_factory, MAX_U128)
+        new_aggregator(aggregator_factory, limit)
     }
 
     #[deprecated]

aptos-move/framework/supra-framework/sources/aggregator/optional_aggregator.move

@@ -88,6 +88,21 @@ module supra_framework::optional_aggregator {
         }
     }
 
+    /// Creates a new optional aggregator.
+    public(friend) fun new_with_limit(limit: u128, parallelizable: bool): OptionalAggregator {
+        if (parallelizable) {
+            OptionalAggregator {
+                aggregator: option::some(aggregator_factory::create_aggregator_internal_with_limit(limit)),
+                integer: option::none(),
+            }
+        } else {
+            OptionalAggregator {
+                aggregator: option::none(),
+                integer: option::some(new_integer(limit)),
+            }
+        }
+    }
+
     /// Switches between parallelizable and non-parallelizable implementations.
     public fun switch(_optional_aggregator: &mut OptionalAggregator) {
         abort error::invalid_state(ESWITCH_DEPRECATED)

aptos-move/framework/supra-framework/sources/code.spec.move

@@ -79,13 +79,6 @@ spec supra_framework::code {
         aborts_if !permissioned_signer::spec_check_permission_exists(s, perm);
     }
 
-    spec schema AbortsIfPermissionedSigner {
-        use aptos_framework::permissioned_signer;
-        s: signer;
-        let perm = CodePublishingPermission {};
-        aborts_if !permissioned_signer::spec_check_permission_exists(s, perm);
-    }
-
     spec initialize(supra_framework: &signer, package_owner: &signer, metadata: PackageMetadata) {
         let aptos_addr = signer::address_of(supra_framework);
         let owner_addr = signer::address_of(package_owner);