Fix schema and types

public-awesome · Oct 1, 2023 · 5d63e73 · 5d63e73
1 parent 7d7594b
commit 5d63e73
Show file tree

Hide file tree

Showing 19 changed files with 210 additions and 4,672 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/infinity-builder/Cargo.toml b/contracts/infinity-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-builder"
-version    = "0.1.0"
+version    = "0.1.1"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-builder/schema/infinity-builder.json b/contracts/infinity-builder/schema/infinity-builder.json
@@ -1,13 +1,14 @@
 {
   "contract_name": "infinity-builder",
-  "contract_version": "0.1.0",
+  "contract_version": "0.1.1",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "InstantiateMsg",
     "type": "object",
     "required": [
       "code_ids",
+      "default_royalty_fee_percent",
       "fair_burn",
       "fair_burn_fee_percent",
       "marketplace",
@@ -27,6 +28,9 @@
       "code_ids": {
         "$ref": "#/definitions/CodeIds"
       },
+      "default_royalty_fee_percent": {
+        "$ref": "#/definitions/Decimal"
+      },
       "fair_burn": {
         "type": "string"
       },

diff --git a/contracts/infinity-factory/Cargo.toml b/contracts/infinity-factory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-factory"
-version    = "0.1.1"
+version    = "0.1.2"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-factory/schema/infinity-factory.json b/contracts/infinity-factory/schema/infinity-factory.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "infinity-factory",
-  "contract_version": "0.1.1",
+  "contract_version": "0.1.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/infinity-global/Cargo.toml b/contracts/infinity-global/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-global"
-version    = "0.1.1"
+version    = "0.1.2"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-global/schema/infinity-global.json b/contracts/infinity-global/schema/infinity-global.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "infinity-global",
-  "contract_version": "0.1.1",
+  "contract_version": "0.1.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -45,6 +45,7 @@
       "GlobalConfig_for_String": {
         "type": "object",
         "required": [
+          "default_royalty_fee_percent",
           "fair_burn",
           "fair_burn_fee_percent",
           "infinity_factory",
@@ -58,6 +59,14 @@
           "royalty_registry"
         ],
         "properties": {
+          "default_royalty_fee_percent": {
+            "description": "The royalty percentage amount to be paid when no royalty is specified for the protocol",
+            "allOf": [
+              {
+                "$ref": "#/definitions/Decimal"
+              }
+            ]
+          },
           "fair_burn": {
             "description": "The address of the FairBurn contract",
             "type": "string"
@@ -183,6 +192,7 @@
       "title": "GlobalConfig_for_Addr",
       "type": "object",
       "required": [
+        "default_royalty_fee_percent",
         "fair_burn",
         "fair_burn_fee_percent",
         "infinity_factory",
@@ -196,6 +206,14 @@
         "royalty_registry"
       ],
       "properties": {
+        "default_royalty_fee_percent": {
+          "description": "The royalty percentage amount to be paid when no royalty is specified for the protocol",
+          "allOf": [
+            {
+              "$ref": "#/definitions/Decimal"
+            }
+          ]
+        },
         "fair_burn": {
           "description": "The address of the FairBurn contract",
           "allOf": [

diff --git a/contracts/infinity-index/Cargo.toml b/contracts/infinity-index/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-index"
-version    = "0.1.1"
+version    = "0.1.2"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-index/schema/infinity-index.json b/contracts/infinity-index/schema/infinity-index.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "infinity-index",
-  "contract_version": "0.1.1",
+  "contract_version": "0.1.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/infinity-pair/Cargo.toml b/contracts/infinity-pair/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-pair"
-version    = "0.1.1"
+version    = "0.1.2"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-pair/schema/infinity-pair.json b/contracts/infinity-pair/schema/infinity-pair.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "infinity-pair",
-  "contract_version": "0.1.1",
+  "contract_version": "0.1.2",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/contracts/infinity-router/Cargo.toml b/contracts/infinity-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name       = "infinity-router"
-version    = "0.1.2"
+version    = "0.1.3"
 edition    = { workspace = true }
 repository = { workspace = true }
 license    = { workspace = true }

diff --git a/contracts/infinity-router/schema/infinity-router.json b/contracts/infinity-router/schema/infinity-router.json
@@ -1,6 +1,6 @@
 {
   "contract_name": "infinity-router",
-  "contract_version": "0.1.2",
+  "contract_version": "0.1.3",
   "idl_version": "1.0.0",
   "instantiate": {
     "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/typescript/packages/e2e-tests/package.json b/typescript/packages/e2e-tests/package.json
@@ -19,7 +19,7 @@
     "@cosmjs/proto-signing": "^0.31.0",
     "@cosmjs/stargate": "^0.31.0",
     "@stargazezone/core-types": "0.1.0",
-    "@stargazezone/infinity-types": "0.8.0",
+    "@stargazezone/infinity-types": "0.10.0",
     "@stargazezone/launchpad": "^2.3.3",
     "@types/jest": "^29.5.2",
     "axios": "^1.4.0",

diff --git a/typescript/packages/e2e-tests/tests/setup/context.ts b/typescript/packages/e2e-tests/tests/setup/context.ts
@@ -116,6 +116,7 @@ export default class Context {
       fair_burn: fairBurnAddress,
       fair_burn_fee_percent: '0.005',
       marketplace: marketplaceAddress,
+      default_royalty_fee_percent: '0.005',
       max_royalty_fee_percent: '0.05',
       max_swap_fee_percent: '0.10',
       min_prices: [{ amount: '1000000', denom: 'ustars' }],

diff --git a/typescript/packages/infinity-types/package.json b/typescript/packages/infinity-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stargazezone/infinity-types",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "The official types package for the Infinity Swap protocol",
   "author": "Tasio Victoria",
   "homepage": "https://stargaze.zone/",

diff --git a/typescript/packages/infinity-types/src/codegen/InfinityBuilder.types.ts b/typescript/packages/infinity-types/src/codegen/InfinityBuilder.types.ts
@@ -9,6 +9,7 @@ export type Uint128 = string;
 export interface InstantiateMsg {
   admin?: string | null;
   code_ids: CodeIds;
+  default_royalty_fee_percent: Decimal;
   fair_burn: string;
   fair_burn_fee_percent: Decimal;
   marketplace: string;

diff --git a/typescript/packages/infinity-types/src/codegen/InfinityGlobal.types.ts b/typescript/packages/infinity-types/src/codegen/InfinityGlobal.types.ts
@@ -11,6 +11,7 @@ export interface InstantiateMsg {
   min_prices: Coin[];
 }
 export interface GlobalConfigForString {
+  default_royalty_fee_percent: Decimal;
   fair_burn: string;
   fair_burn_fee_percent: Decimal;
   infinity_factory: string;
@@ -40,6 +41,7 @@ export type QueryMsg = {
 };
 export type Addr = string;
 export interface GlobalConfigForAddr {
+  default_royalty_fee_percent: Decimal;
   fair_burn: Addr;
   fair_burn_fee_percent: Decimal;
   infinity_factory: Addr;