Move contracts to packages

d0rich · Nov 25, 2023 · aa3c8d5 · aa3c8d5
1 parent a2afb79
commit aa3c8d5
Show file tree

Hide file tree

Showing 46 changed files with 75 additions and 54 deletions.
diff --git a/apps/d.d0rich.me/package.json b/apps/d.d0rich.me/package.json
@@ -11,8 +11,8 @@
     "type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false"
   },
   "dependencies": {
-    "@d0rich/contracts": "*",
     "@d0rich/esprit-design": "*",
+    "@d0rich/ton-contracts": "*",
     "@orbs-network/ton-access": "^2.3.3",
     "@tonconnect/ui": "^2.0.0-beta.6",
     "@vueuse/core": "^10.6.1",

diff --git a/apps/d.d0rich.me/src/features/blog/model/DBlog.ts b/apps/d.d0rich.me/src/features/blog/model/DBlog.ts
@@ -1,4 +1,4 @@
-import { DSocialNetworkBlog } from '@d0rich/contracts/wrappers/DSocialNetworkBlog'
+import { DSocialNetworkBlog } from '@d0rich/ton-contracts/wrappers/DSocialNetworkBlog'
 
 export class DBlog {
   // eslint-disable-next-line no-useless-constructor

diff --git a/apps/d.d0rich.me/src/features/master/stores/masterContractStore.ts b/apps/d.d0rich.me/src/features/master/stores/masterContractStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { Address } from 'ton-core/dist/address/Address'
-import { DSocialNetworkMaster } from '@d0rich/contracts/wrappers/DSocialNetworkMaster'
+import { DSocialNetworkMaster } from '@d0rich/ton-contracts/wrappers/DSocialNetworkMaster'
 
 const masterContractAddress = 'kQBzW8ZRV2T-rx3xfAwIZyiO2FN4wCpI7If4Exj7vX9DElJG'
 

diff --git a/apps/d.d0rich.me/src/features/post/model/DPost.ts b/apps/d.d0rich.me/src/features/post/model/DPost.ts
@@ -2,7 +2,7 @@ import { Address } from 'ton-core'
 import {
   DSocialNetworkPost,
   type NftMetadata
-} from '@d0rich/contracts/wrappers/DSocialNetworkPost'
+} from '@d0rich/ton-contracts/wrappers/DSocialNetworkPost'
 
 export type DPostModel = {
   url: string

diff --git a/ignore-builds-master.mjs b/ignore-builds-master.mjs
@@ -16,7 +16,9 @@ const isDD0richMeChanged = changesList.includes('apps/d.d0rich.me')
 
 //  Contracts
 
-const areContractsChanged = changesList.includes('contracts/contracts')
+const areContractsChanged = changesList.includes(
+  'packages/ton-contracts/contracts'
+)
 
 // Packages
 const isNuxtContentMermaidChanged = changesList.includes(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,8 +3,7 @@
   "private": true,
   "workspaces": [
     "apps/*",
-    "packages/*",
-    "contracts"
+    "packages/*"
   ],
   "scripts": {
     "prepare:all": "turbo run prepare",

diff --git a/contracts/.gitignore → packages/ton-contracts/.gitignore b/contracts/.gitignore → packages/ton-contracts/.gitignore
diff --git a/contracts/.prettierignore → packages/ton-contracts/.prettierignore b/contracts/.prettierignore → packages/ton-contracts/.prettierignore
diff --git a/contracts/README.md → packages/ton-contracts/README.md b/contracts/README.md → packages/ton-contracts/README.md
diff --git a/contracts/build-scripts/new-imports.ts → ...on-contracts/build-scripts/new-imports.ts b/contracts/build-scripts/new-imports.ts → ...on-contracts/build-scripts/new-imports.ts
diff --git a/.../build-scripts/patch-wrappers-imports.mjs → .../build-scripts/patch-wrappers-imports.mjs b/.../build-scripts/patch-wrappers-imports.mjs → .../build-scripts/patch-wrappers-imports.mjs
diff --git a/...acts/contracts/d_social_network_blog.tact → ...acts/contracts/d_social_network_blog.tact b/...acts/contracts/d_social_network_blog.tact → ...acts/contracts/d_social_network_blog.tact
diff --git a/...ts/contracts/d_social_network_master.tact → ...ts/contracts/d_social_network_master.tact b/...ts/contracts/d_social_network_master.tact → ...ts/contracts/d_social_network_master.tact
diff --git a/...acts/contracts/d_social_network_post.tact → ...acts/contracts/d_social_network_post.tact b/...acts/contracts/d_social_network_post.tact → ...acts/contracts/d_social_network_post.tact
diff --git a/contracts/contracts/imports/stdlib.fc → ...ton-contracts/contracts/imports/stdlib.fc b/contracts/contracts/imports/stdlib.fc → ...ton-contracts/contracts/imports/stdlib.fc
diff --git a/contracts/contracts/lib/messages_nft.tact → ...contracts/contracts/lib/messages_nft.tact b/contracts/contracts/lib/messages_nft.tact → ...contracts/contracts/lib/messages_nft.tact
diff --git a/contracts/contracts/lib/native_dict.tact → ...-contracts/contracts/lib/native_dict.tact b/contracts/contracts/lib/native_dict.tact → ...-contracts/contracts/lib/native_dict.tact
diff --git a/...ts/contracts/lib/tep64_serialization.tact → ...ts/contracts/lib/tep64_serialization.tact b/...ts/contracts/lib/tep64_serialization.tact → ...ts/contracts/lib/tep64_serialization.tact
diff --git a/...racts/contracts/lib/trait_accounting.tact → ...racts/contracts/lib/trait_accounting.tact b/...racts/contracts/lib/trait_accounting.tact → ...racts/contracts/lib/trait_accounting.tact
diff --git a/...s/contracts/lib/trait_nft_collection.tact → ...s/contracts/lib/trait_nft_collection.tact b/...s/contracts/lib/trait_nft_collection.tact → ...s/contracts/lib/trait_nft_collection.tact
diff --git a/...ait_nft_collection_royalty_extention.tact → ...ait_nft_collection_royalty_extention.tact b/...ait_nft_collection_royalty_extention.tact → ...ait_nft_collection_royalty_extention.tact
diff --git a/contracts/contracts/lib/trait_nft_item.tact → ...ntracts/contracts/lib/trait_nft_item.tact b/contracts/contracts/lib/trait_nft_item.tact → ...ntracts/contracts/lib/trait_nft_item.tact
diff --git a/...ts/contracts/lib/trait_personal_fees.tact → ...ts/contracts/lib/trait_personal_fees.tact b/...ts/contracts/lib/trait_personal_fees.tact → ...ts/contracts/lib/trait_personal_fees.tact
diff --git a/...ntracts/lib/trait_storage_controller.tact → ...ntracts/lib/trait_storage_controller.tact b/...ntracts/lib/trait_storage_controller.tact → ...ntracts/lib/trait_storage_controller.tact
diff --git a/contracts/contracts/messages_d.tact → ...s/ton-contracts/contracts/messages_d.tact b/contracts/contracts/messages_d.tact → ...s/ton-contracts/contracts/messages_d.tact
diff --git a/contracts/jest.config.ts → packages/ton-contracts/jest.config.ts b/contracts/jest.config.ts → packages/ton-contracts/jest.config.ts
diff --git a/contracts/package.json → packages/ton-contracts/package.json b/contracts/package.json → packages/ton-contracts/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@d0rich/contracts",
+  "name": "@d0rich/ton-contracts",
   "version": "0.0.1",
   "private": true,
   "scripts": {

diff --git a/...cts/scripts/deployDSocialNetworkMaster.ts → ...cts/scripts/deployDSocialNetworkMaster.ts b/...cts/scripts/deployDSocialNetworkMaster.ts → ...cts/scripts/deployDSocialNetworkMaster.ts
diff --git a/contracts/scripts/deployTestSocialNetwork.ts → ...tracts/scripts/deployTestSocialNetwork.ts b/contracts/scripts/deployTestSocialNetwork.ts → ...tracts/scripts/deployTestSocialNetwork.ts
diff --git a/contracts/tests/DSocialNetworkBlog.spec.ts → ...ontracts/tests/DSocialNetworkBlog.spec.ts b/contracts/tests/DSocialNetworkBlog.spec.ts → ...ontracts/tests/DSocialNetworkBlog.spec.ts
diff --git a/contracts/tests/DSocialNetworkMaster.spec.ts → ...tracts/tests/DSocialNetworkMaster.spec.ts b/contracts/tests/DSocialNetworkMaster.spec.ts → ...tracts/tests/DSocialNetworkMaster.spec.ts
diff --git a/contracts/tests/DSocialNetworkPost.spec.ts → ...ontracts/tests/DSocialNetworkPost.spec.ts b/contracts/tests/DSocialNetworkPost.spec.ts → ...ontracts/tests/DSocialNetworkPost.spec.ts
diff --git a/contracts/tsconfig.json → packages/ton-contracts/tsconfig.json b/contracts/tsconfig.json → packages/ton-contracts/tsconfig.json
diff --git a/...cts/utils/onchain-metadata-parser/dict.ts → ...cts/utils/onchain-metadata-parser/dict.ts b/...cts/utils/onchain-metadata-parser/dict.ts → ...cts/utils/onchain-metadata-parser/dict.ts
diff --git a/...ils/onchain-metadata-parser/nftContent.ts → ...ils/onchain-metadata-parser/nftContent.ts b/...ils/onchain-metadata-parser/nftContent.ts → ...ils/onchain-metadata-parser/nftContent.ts
diff --git a/...ts/utils/onchain-metadata-parser/parse.ts → ...ts/utils/onchain-metadata-parser/parse.ts b/...ts/utils/onchain-metadata-parser/parse.ts → ...ts/utils/onchain-metadata-parser/parse.ts
diff --git a/contracts/utils/stub-post-serialization.ts → ...ontracts/utils/stub-post-serialization.ts b/contracts/utils/stub-post-serialization.ts → ...ontracts/utils/stub-post-serialization.ts
diff --git a/contracts/utils/test-fixtures.ts → ...ages/ton-contracts/utils/test-fixtures.ts b/contracts/utils/test-fixtures.ts → ...ages/ton-contracts/utils/test-fixtures.ts
diff --git a/...ts/wrappers/DSocialNetworkBlog.compile.ts → ...ts/wrappers/DSocialNetworkBlog.compile.ts b/...ts/wrappers/DSocialNetworkBlog.compile.ts → ...ts/wrappers/DSocialNetworkBlog.compile.ts
diff --git a/contracts/wrappers/DSocialNetworkBlog.ts → ...-contracts/wrappers/DSocialNetworkBlog.ts b/contracts/wrappers/DSocialNetworkBlog.ts → ...-contracts/wrappers/DSocialNetworkBlog.ts
diff --git a/.../wrappers/DSocialNetworkMaster.compile.ts → .../wrappers/DSocialNetworkMaster.compile.ts b/.../wrappers/DSocialNetworkMaster.compile.ts → .../wrappers/DSocialNetworkMaster.compile.ts
diff --git a/contracts/wrappers/DSocialNetworkMaster.ts → ...ontracts/wrappers/DSocialNetworkMaster.ts b/contracts/wrappers/DSocialNetworkMaster.ts → ...ontracts/wrappers/DSocialNetworkMaster.ts
diff --git a/...ts/wrappers/DSocialNetworkPost.compile.ts → ...ts/wrappers/DSocialNetworkPost.compile.ts b/...ts/wrappers/DSocialNetworkPost.compile.ts → ...ts/wrappers/DSocialNetworkPost.compile.ts
diff --git a/contracts/wrappers/DSocialNetworkPost.ts → ...-contracts/wrappers/DSocialNetworkPost.ts b/contracts/wrappers/DSocialNetworkPost.ts → ...-contracts/wrappers/DSocialNetworkPost.ts
diff --git a/turbo.json b/turbo.json
@@ -16,25 +16,31 @@
       "dependsOn": ["prepare"],
       "outputs": ["dist"]
     },
-    "@d0rich/contracts#build": {
+    "@d0rich/ton-contracts#build": {
       "outputs": ["dist"]
     },
     "d.d0rich.me#build": {
-      "dependsOn": ["@d0rich/contracts#build", "@d0rich/esprit-design#build"],
+      "dependsOn": [
+        "@d0rich/ton-contracts#build",
+        "@d0rich/esprit-design#build"
+      ],
       "outputs": ["dist"]
     },
     "typecheck": {},
     "test": {},
-    "@d0rich/contracts#test": {
-      "dependsOn": ["@d0rich/contracts#build"]
+    "@d0rich/ton-contracts#test": {
+      "dependsOn": ["@d0rich/ton-contracts#build"]
     },
     "dev": {
       "cache": false,
       "persistent": true
     },
     "d0rich.me#dev": {},
     "d.d0rich.me#dev": {
-      "dependsOn": ["@d0rich/contracts#build", "@d0rich/esprit-design#build"]
+      "dependsOn": [
+        "@d0rich/ton-contracts#build",
+        "@d0rich/esprit-design#build"
+      ]
     },
     "d0xigen.d0rich.me#dev": {},
     "design.d0rich.me#dev": {},