Skip to content

Attempt to address merge conflicts related to automation feature #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhaval-supraoracles merged 6 commits into from
Feb 13, 2026
Merged

Attempt to address merge conflicts related to automation feature #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6c2dcf
Attempt to address merge conflicts releated to automation feature
Sep 24, 2025
f0b466f
Addressed review comments
Oct 2, 2025
9073faf
Added missing module_metadata.rs file
Nov 11, 2025
7812615
Preserved default feature list from dev branch
Nov 11, 2025
a2128d5
Addressed errors in transaction_validation.move
Nov 12, 2025
b2480a5
Issue/fix building issue on upgrade (#315)
dhaval-supraoracles Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
297 changes: 241 additions & 56 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/move-test-package/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ version = "0.0.0"
# test user address to be installed dynamically on build

[dependencies]
AptosFramework = { local = "../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../aptos-move/framework/supra-framework" }
1 change: 1 addition & 0 deletions api/src/bcs_payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ impl ApiResponse for Bcs {
responses: vec![MetaResponse {
description: "BCS: Binary Canonical Serialization",
status: Some(200),
status_range: None,
content: vec![MetaMediaType {
content_type: Self::CONTENT_TYPE,
schema: Self::schema_ref(),
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_abi/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "pack_abi"
version = "0.0.0"

[dependencies]
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }

[addresses]
abi = "_"
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_counter/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "pack_counter"
version = "0.0.0"

[dependencies]
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }

[addresses]
addr = "_"
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_exceed_limit/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"

[dependencies]
MoveStdlib = { local = "../../../../../aptos-move/framework/move-stdlib" }
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }
AptosToken = { local = "../../../../../aptos-move/framework/aptos-token" }

[addresses]
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_exceed_limit/sources/exceed_limit.move
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module addr::exceed_limit {
use std::option::Option;
use aptos_framework::account::Account;
use supra_framework::account::Account;
use std::signer;
use std::string::{Self};
use std::simple_map::{SimpleMap, Self};
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_function_values/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "pack_function_values"
version = "0.0.0"

[dependencies]
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }

[addresses]
account = "_"
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_token_objects/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "pack_token_objects"
version = "0.0.0"

[dependencies]
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }
AptosTokenObjects = { local = "../../../../../aptos-move/framework/aptos-token-objects" }

[addresses]
Expand Down
8 changes: 4 additions & 4 deletions api/src/tests/move/pack_token_objects/sources/token_objects.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ module addr::token_objects {
use std::string::{Self, String};
use std::signer;

use aptos_framework::object::{Self, Object};
use supra_framework::object::{Self, Object};
use aptos_token_objects::collection;
use aptos_token_objects::token;
use aptos_token_objects::property_map;
use aptos_framework::event;
use supra_framework::event;
use aptos_std::string_utils::{to_string};

/// The token does not exist
Expand Down Expand Up @@ -36,7 +36,7 @@ module addr::token_objects {
const RANK_SILVER: vector<u8> = b"Silver";
const RANK_BRONZE: vector<u8> = b"Bronze";

#[resource_group_member(group = aptos_framework::object::ObjectGroup)]
#[resource_group_member(group = supra_framework::object::ObjectGroup)]
/// The ambassador token
struct AmbassadorToken has key {
/// Used to mutate the token uri
Expand All @@ -49,7 +49,7 @@ module addr::token_objects {
base_uri: String,
}

#[resource_group_member(group = aptos_framework::object::ObjectGroup)]
#[resource_group_member(group = supra_framework::object::ObjectGroup)]
/// The ambassador level
struct AmbassadorLevel has key {
ambassador_level: u64,
Expand Down
2 changes: 1 addition & 1 deletion api/src/tests/move/pack_token_v1/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"

[dependencies]
MoveStdlib = { local = "../../../../../aptos-move/framework/move-stdlib" }
AptosFramework = { local = "../../../../../aptos-move/framework/aptos-framework" }
SupraFramework = { local = "../../../../../aptos-move/framework/supra-framework" }
AptosToken = { local = "../../../../../aptos-move/framework/aptos-token" }

[addresses]
Expand Down
Loading