magicblock-labs
diff --git a/‎Cargo.lock renamed to ‎rust/Cargo.lock b/‎Cargo.lock renamed to ‎rust/Cargo.lock
diff --git a/‎Cargo.toml renamed to ‎rust/Cargo.toml
Lines changed: 6 additions & 3 deletions b/‎Cargo.toml renamed to ‎rust/Cargo.toml
Lines changed: 6 additions & 3 deletions
diff --git a/‎sdk/commit_attribute/Cargo.toml renamed to ‎rust/commit-attribute/Cargo.toml b/‎sdk/commit_attribute/Cargo.toml renamed to ‎rust/commit-attribute/Cargo.toml
diff --git a/‎sdk/commit_attribute/src/lib.rs renamed to ‎rust/commit-attribute/src/lib.rs b/‎sdk/commit_attribute/src/lib.rs renamed to ‎rust/commit-attribute/src/lib.rs
diff --git a/‎sdk/delegate/Cargo.toml renamed to ‎rust/delegate/Cargo.toml b/‎sdk/delegate/Cargo.toml renamed to ‎rust/delegate/Cargo.toml
diff --git a/‎sdk/delegate/src/lib.rs renamed to ‎rust/delegate/src/lib.rs b/‎sdk/delegate/src/lib.rs renamed to ‎rust/delegate/src/lib.rs
diff --git a/‎sdk/ephemeral/Cargo.toml renamed to ‎rust/ephemeral/Cargo.toml b/‎sdk/ephemeral/Cargo.toml renamed to ‎rust/ephemeral/Cargo.toml
diff --git a/‎sdk/ephemeral/src/lib.rs renamed to ‎rust/ephemeral/src/lib.rs b/‎sdk/ephemeral/src/lib.rs renamed to ‎rust/ephemeral/src/lib.rs
diff --git a/‎sdk/Cargo.toml renamed to ‎rust/sdk/Cargo.toml
Lines changed: 1 addition & 1 deletion b/‎sdk/Cargo.toml renamed to ‎rust/sdk/Cargo.toml
Lines changed: 1 addition & 1 deletion
diff --git a/‎sdk/src/anchor.rs renamed to ‎rust/sdk/src/anchor.rs b/‎sdk/src/anchor.rs renamed to ‎rust/sdk/src/anchor.rs
diff --git a/‎sdk/src/consts.rs renamed to ‎rust/sdk/src/consts.rs b/‎sdk/src/consts.rs renamed to ‎rust/sdk/src/consts.rs
diff --git a/‎sdk/src/cpi.rs renamed to ‎rust/sdk/src/cpi.rs b/‎sdk/src/cpi.rs renamed to ‎rust/sdk/src/cpi.rs
diff --git a/‎sdk/src/delegate_args.rs renamed to ‎rust/sdk/src/delegate_args.rs b/‎sdk/src/delegate_args.rs renamed to ‎rust/sdk/src/delegate_args.rs
diff --git a/‎sdk/src/ephem.rs renamed to ‎rust/sdk/src/ephem.rs b/‎sdk/src/ephem.rs renamed to ‎rust/sdk/src/ephem.rs
diff --git a/‎sdk/src/lib.rs renamed to ‎rust/sdk/src/lib.rs b/‎sdk/src/lib.rs renamed to ‎rust/sdk/src/lib.rs
diff --git a/‎sdk/src/pda.rs renamed to ‎rust/sdk/src/pda.rs b/‎sdk/src/pda.rs renamed to ‎rust/sdk/src/pda.rs
diff --git a/‎sdk/src/types.rs renamed to ‎rust/sdk/src/types.rs b/‎sdk/src/types.rs renamed to ‎rust/sdk/src/types.rs
diff --git a/‎sdk/src/utils.rs renamed to ‎rust/sdk/src/utils.rs b/‎sdk/src/utils.rs renamed to ‎rust/sdk/src/utils.rs
diff --git a/‎sdk/ts/.eslintrc.yml renamed to ‎ts/.eslintrc.yml b/‎sdk/ts/.eslintrc.yml renamed to ‎ts/.eslintrc.yml
diff --git a/‎sdk/ts/package-lock.json renamed to ‎ts/package-lock.json b/‎sdk/ts/package-lock.json renamed to ‎ts/package-lock.json
diff --git a/‎sdk/ts/package.json renamed to ‎ts/package.json b/‎sdk/ts/package.json renamed to ‎ts/package.json
diff --git a/‎sdk/ts/src/accounts.ts renamed to ‎ts/src/accounts.ts b/‎sdk/ts/src/accounts.ts renamed to ‎ts/src/accounts.ts
diff --git a/‎sdk/ts/src/constants.ts renamed to ‎ts/src/constants.ts b/‎sdk/ts/src/constants.ts renamed to ‎ts/src/constants.ts
diff --git a/‎sdk/ts/src/index.ts renamed to ‎ts/src/index.ts b/‎sdk/ts/src/index.ts renamed to ‎ts/src/index.ts
diff --git a/‎sdk/ts/src/instructions/delegate.ts renamed to ‎ts/src/instructions/delegate.ts b/‎sdk/ts/src/instructions/delegate.ts renamed to ‎ts/src/instructions/delegate.ts
diff --git a/‎sdk/ts/src/instructions/undelegate.ts renamed to ‎ts/src/instructions/undelegate.ts b/‎sdk/ts/src/instructions/undelegate.ts renamed to ‎ts/src/instructions/undelegate.ts
diff --git a/‎sdk/ts/src/seeds.ts renamed to ‎ts/src/seeds.ts b/‎sdk/ts/src/seeds.ts renamed to ‎ts/src/seeds.ts
diff --git a/‎sdk/ts/src/utils.ts renamed to ‎ts/src/utils.ts b/‎sdk/ts/src/utils.ts renamed to ‎ts/src/utils.ts
diff --git a/‎sdk/ts/tsconfig.json renamed to ‎ts/tsconfig.json b/‎sdk/ts/tsconfig.json renamed to ‎ts/tsconfig.json
diff --git a/‎sdk/ts/typedoc.json renamed to ‎ts/typedoc.json b/‎sdk/ts/typedoc.json renamed to ‎ts/typedoc.json
diff --git a/‎sdk/ts/yarn.lock renamed to ‎ts/yarn.lock b/‎sdk/ts/yarn.lock renamed to ‎ts/yarn.lock
diff --git a/‎version_align.sh
Lines changed: 7 additions & 7 deletions b/‎version_align.sh
Lines changed: 7 additions & 7 deletions
@@ -1,6 +1,9 @@
 [workspace]
 members = [
     "sdk",
+	"ephemeral",
+	"delegate",
+	"commit-attribute"
 ]
 
 resolver = "2"
@@ -17,9 +20,9 @@ readme = "./README.md"
 keywords = ["solana", "crypto", "delegation", "ephemeral-rollups", "magicblock"]
 
 [workspace.dependencies]
-ephemeral-rollups-sdk-attribute-ephemeral-v2 = { path = "sdk/ephemeral", version = "=0.1.1" }
-ephemeral-rollups-sdk-attribute-delegate-v2 = { path = "sdk/delegate", version = "=0.1.1" }
-ephemeral-rollups-sdk-attribute-commit-v2 = { path = "sdk/commit_attribute", version = "=0.1.1" }
+ephemeral-rollups-sdk-attribute-ephemeral-v2 = { path = "ephemeral", version = "=0.1.1" }
+ephemeral-rollups-sdk-attribute-delegate-v2 = { path = "delegate", version = "=0.1.1" }
+ephemeral-rollups-sdk-attribute-commit-v2 = { path = "commit-attribute", version = "=0.1.1" }
 
 ## External crates
 anchor-lang = "0.30.1"
 
@@ -16,10 +16,10 @@ default = []
 anchor = ["anchor-lang"]
 
 [dependencies]
+anchor-lang = { workspace = true, optional = true }
 borsh = { workspace = true }
 ephemeral-rollups-sdk-attribute-delegate-v2 = { workspace = true }
 ephemeral-rollups-sdk-attribute-ephemeral-v2 = { workspace = true }
 ephemeral-rollups-sdk-attribute-commit-v2 = { workspace = true }
 paste = { workspace = true }
 solana-program = { workspace = true }
-anchor-lang = { workspace = true, optional = true }
@@ -3,7 +3,7 @@
 set -e
 
 # Step 1: Read the version from Cargo.toml
-version=$(grep '^version = ' Cargo.toml | head -n 1 | sed 's/version = "\(.*\)"/\1/')
+version=$(grep '^version = ' rust/Cargo.toml | head -n 1 | sed 's/version = "\(.*\)"/\1/')
 
 if [ -z "$version" ]; then
     echo "Version not found in Cargo.toml"
@@ -20,19 +20,19 @@ case "$(uname)" in
 esac
 
 # Update the version for all crates in the Cargo.toml workspace.dependencies section
-sed "${sedi[@]}" -e '/\[workspace.dependencies\]/,/## External crates/s/version = ".*"/version = "='$version'"/' Cargo.toml
+sed "${sedi[@]}" -e '/\[workspace.dependencies\]/,/## External crates/s/version = ".*"/version = "='$version'"/' rust/Cargo.toml
 
 # Update the version in clients/bolt-sdk/package.json
-jq --arg version "$version" '.version = $version' sdk/ts/package.json > temp.json && mv temp.json sdk/ts/package.json
+jq --arg version "$version" '.version = $version' ts/package.json > temp.json && mv temp.json ts/package.json
 
 # Potential for collisions in Cargo.lock, use cargo update to update it
-cargo update --workspace
+cargo update --workspace --manifest-path rust/Cargo.toml
 
 # Check if any changes have been made to the specified files, if running with --check
 if [[ "$1" == "--check" ]]; then
     files_to_check=(
-        "sdk/ts/package.json"
-        "Cargo.toml"
+        "ts/package.json"
+        "rust/Cargo.toml"
     )
 
     for file in "${files_to_check[@]}"; do
@@ -43,4 +43,4 @@ if [[ "$1" == "--check" ]]; then
         fi
     done
     exit 0
-fi
+fi