From cbfb30d220e20d24e311219e868320d08fe37e20 Mon Sep 17 00:00:00 2001 From: PavitraAgarwal21 Date: Tue, 17 Dec 2024 10:40:08 +0530 Subject: [PATCH 1/4] add tba --- Scarb.lock | 70 ++++++++++++++++++++++++++++++++++++++++ Scarb.toml | 1 + crates/tba/Scarb.toml | 9 ++++++ crates/tba/src/lib.cairo | 1 + scripts/build-all.sh | 1 + 5 files changed, 82 insertions(+) create mode 100644 crates/tba/Scarb.toml create mode 100644 crates/tba/src/lib.cairo diff --git a/Scarb.lock b/Scarb.lock index 8cea8d6..cfb381d 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -6,6 +6,66 @@ name = "cubit" version = "1.3.0" source = "git+https://github.com/bal7hazar/cubit?branch=cairo-2.8.4#6bce623d5c735c097be47a4045c0e0432bad38e7" +[[package]] +name = "openzeppelin_access" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:541bb8fdf1ad17fe0d275b00acb9f0d7f56ea5534741e21535ac3fda2c600281" +dependencies = [ + "openzeppelin_introspection", + "openzeppelin_utils", +] + +[[package]] +name = "openzeppelin_account" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:c4e11609fdd1f4c3d3004cd1468711bd2ea664739c9e59a4b270567fe4c23ee3" +dependencies = [ + "openzeppelin_introspection", + "openzeppelin_utils", +] + +[[package]] +name = "openzeppelin_governance" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:b7e0142d88d69a8c367aea8c9dc7f659f27372551efc23f39a0cf71a189c1302" +dependencies = [ + "openzeppelin_access", + "openzeppelin_introspection", +] + +[[package]] +name = "openzeppelin_introspection" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:892433a4a1ea0fc9cf7cdb01e06ddc2782182abcc188e4ea5dd480906d006cf8" + +[[package]] +name = "openzeppelin_token" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:77997a7e217b69674c34b402dc0c7b2210540db66a56087572679c31896eaabb" +dependencies = [ + "openzeppelin_account", + "openzeppelin_governance", + "openzeppelin_introspection", +] + +[[package]] +name = "openzeppelin_utils" +version = "0.17.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:36d93e353f42fd6b824abcd8b4b51c3f5d02c893c5f886ae81403b0368aa5fde" + +[[package]] +name = "orgami_token_bound_accounts" +version = "1.0.0-rc.2" +dependencies = [ + "token_bound_accounts", +] + [[package]] name = "origami_algebra" version = "1.0.0-rc.2" @@ -35,3 +95,13 @@ version = "1.0.0-rc.2" [[package]] name = "origami_security" version = "1.0.0-rc.2" + +[[package]] +name = "token_bound_accounts" +version = "0.3.0" +source = "registry+https://scarbs.xyz/" +checksum = "sha256:a3b25f192bb88f16415f0c76e3a9dd317fd85129eea172548305354a9dd90346" +dependencies = [ + "openzeppelin_introspection", + "openzeppelin_token", +] diff --git a/Scarb.toml b/Scarb.toml index bd24873..e76f1ae 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -6,6 +6,7 @@ members = [ "crates/random", "crates/rating", "crates/security", + "crates/tba", ] [workspace.package] diff --git a/crates/tba/Scarb.toml b/crates/tba/Scarb.toml new file mode 100644 index 0000000..dfe348f --- /dev/null +++ b/crates/tba/Scarb.toml @@ -0,0 +1,9 @@ +[package] +name = "orgami_token_bound_accounts" +version.workspace = true +description = "tba library for Dojo based games." +homepage = "https://www.tbaexplorer.com/" +edition = "2024_07" + +[dependencies] +token_bound_accounts = "0.3.0" \ No newline at end of file diff --git a/crates/tba/src/lib.cairo b/crates/tba/src/lib.cairo new file mode 100644 index 0000000..70e17f6 --- /dev/null +++ b/crates/tba/src/lib.cairo @@ -0,0 +1 @@ +pub use token_bound_accounts::{registry, interfaces, accountV3, test_helper, components, utils}; \ No newline at end of file diff --git a/scripts/build-all.sh b/scripts/build-all.sh index 7dc5423..ab09634 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -5,6 +5,7 @@ scarb --manifest-path crates/map/Scarb.toml build scarb --manifest-path crates/random/Scarb.toml build scarb --manifest-path crates/rating/Scarb.toml build scarb --manifest-path crates/security/Scarb.toml build +scarb --manifest-path crates/tba/Scarb.toml build # Sozo dependent crates. sozo build --package "origami_token" From e235a5978de64fb24ecdcb4f2626a84374b787df Mon Sep 17 00:00:00 2001 From: PavitraAgarwal21 Date: Thu, 19 Dec 2024 14:52:18 +0530 Subject: [PATCH 2/4] upgrade to 0.3.1 --- Scarb.lock | 4 ++-- crates/tba/Scarb.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index cfb381d..2df0672 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -98,9 +98,9 @@ version = "1.0.0-rc.2" [[package]] name = "token_bound_accounts" -version = "0.3.0" +version = "0.3.1" source = "registry+https://scarbs.xyz/" -checksum = "sha256:a3b25f192bb88f16415f0c76e3a9dd317fd85129eea172548305354a9dd90346" +checksum = "sha256:75e6ce74837d9d3199a1ce22cefcf464995ebeb3c86595eb9147b00a0c20e890" dependencies = [ "openzeppelin_introspection", "openzeppelin_token", diff --git a/crates/tba/Scarb.toml b/crates/tba/Scarb.toml index dfe348f..3aa6a30 100644 --- a/crates/tba/Scarb.toml +++ b/crates/tba/Scarb.toml @@ -6,4 +6,4 @@ homepage = "https://www.tbaexplorer.com/" edition = "2024_07" [dependencies] -token_bound_accounts = "0.3.0" \ No newline at end of file +token_bound_accounts = "0.3.1" \ No newline at end of file From 69668b087b65447c2a1021d8eeedd2e3efa9c2cc Mon Sep 17 00:00:00 2001 From: PavitraAgarwal21 Date: Tue, 24 Dec 2024 15:15:33 +0530 Subject: [PATCH 3/4] rename package name --- Scarb.lock | 14 +++++++------- crates/tba/Scarb.toml | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Scarb.lock b/Scarb.lock index 2df0672..d21133c 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -59,13 +59,6 @@ version = "0.17.0" source = "registry+https://scarbs.xyz/" checksum = "sha256:36d93e353f42fd6b824abcd8b4b51c3f5d02c893c5f886ae81403b0368aa5fde" -[[package]] -name = "orgami_token_bound_accounts" -version = "1.0.0-rc.2" -dependencies = [ - "token_bound_accounts", -] - [[package]] name = "origami_algebra" version = "1.0.0-rc.2" @@ -96,6 +89,13 @@ version = "1.0.0-rc.2" name = "origami_security" version = "1.0.0-rc.2" +[[package]] +name = "origami_token_bound_accounts" +version = "1.0.0-rc.2" +dependencies = [ + "token_bound_accounts", +] + [[package]] name = "token_bound_accounts" version = "0.3.1" diff --git a/crates/tba/Scarb.toml b/crates/tba/Scarb.toml index 3aa6a30..935c44f 100644 --- a/crates/tba/Scarb.toml +++ b/crates/tba/Scarb.toml @@ -1,9 +1,17 @@ [package] -name = "orgami_token_bound_accounts" +name = "origami_token_bound_accounts" version.workspace = true -description = "tba library for Dojo based games." -homepage = "https://www.tbaexplorer.com/" +description = "A port of ERC6551 to Starknet (SNIP-14)" +homepage = "https//www.tbaexplorer.com/" edition = "2024_07" [dependencies] -token_bound_accounts = "0.3.1" \ No newline at end of file +token_bound_accounts = "0.3.1" + + + +# name = "token_bound_accounts" +# version.workspace = true +# description = "A port of ERC6551 to Starknet (SNIP-14)" +# homepage = "https://www.tbaexplorer.com/" +# edition = "2024_07" \ No newline at end of file From de3655665949a4172ec68d66e23437913a9f961c Mon Sep 17 00:00:00 2001 From: PavitraAgarwal21 Date: Tue, 24 Dec 2024 15:17:14 +0530 Subject: [PATCH 4/4] fmt --- crates/tba/src/lib.cairo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/tba/src/lib.cairo b/crates/tba/src/lib.cairo index 70e17f6..e0cb760 100644 --- a/crates/tba/src/lib.cairo +++ b/crates/tba/src/lib.cairo @@ -1 +1 @@ -pub use token_bound_accounts::{registry, interfaces, accountV3, test_helper, components, utils}; \ No newline at end of file +pub use token_bound_accounts::{registry, interfaces, accountV3, test_helper, components, utils};