create-dubhe 1.2.0-pre.98 → 2.0.0

package/templates/nextjs/sui-template/packages/contracts/deployment.ts

@@ -1,5 +1,10 @@
 type NetworkType = 'testnet' | 'mainnet' | 'devnet' | 'localnet';
 
-export const NETWORK: NetworkType = 'localnet';
-export const PACKAGE_ID = '0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936';
-export const DUBHE_SCHEMA_ID = '0x2ab2ccf03d090f06932debbb5659fefb07073a03e978d819db0676653486527b';
+export const Network: NetworkType = 'localnet';
+export const PackageId = '0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9';
+export const DappHubId = '0xa5993c7c817169d64272e8b2537c225e59724fcd9165107c95d0154d5e756e9f';
+export const DappStorageId = '0x0142b62a6dd1d38c6129e61a3dfc19e455ffb435a65e7b46204543c4edc48063';
+
+// Published package ID of the dubhe framework — required for proxy operations.
+export const FrameworkPackageId: string | undefined =
+  '0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101';

package/templates/nextjs/sui-template/packages/contracts/dubhe.config.json

@@ -1,5 +1,4 @@
 {
-  "components": [],
   "resources": [
     {
       "counter1": {
@@ -47,19 +46,19 @@
             "base_fee": "u256"
           },
           {
-            "byte_fee": "u256"
+            "bytes_fee": "u256"
           },
           {
             "free_credit": "u256"
           },
           {
-            "total_bytes_size": "u256"
+            "credit_pool": "u256"
           },
           {
-            "total_recharged": "u256"
+            "total_settled": "u256"
           },
           {
-            "total_paid": "u256"
+            "suspended": "bool"
           }
         ],
         "keys": [
@@ -70,8 +69,9 @@
     }
   ],
   "enums": [],
-  "original_package_id": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
-  "dubhe_object_id": "0x2ab2ccf03d090f06932debbb5659fefb07073a03e978d819db0676653486527b",
-  "original_dubhe_package_id": "0x0998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
-  "start_checkpoint": "151"
+  "original_package_id": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
+  "dubhe_object_id": "0xa5993c7c817169d64272e8b2537c225e59724fcd9165107c95d0154d5e756e9f",
+  "original_dubhe_package_id": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+  "start_checkpoint": "152",
+  "dapp_storage_id": "0x0142b62a6dd1d38c6129e61a3dfc19e455ffb435a65e7b46204543c4edc48063"
 }

package/templates/nextjs/sui-template/packages/contracts/dubhe.config.ts

@@ -3,10 +3,6 @@ import { defineConfig } from '@0xobelisk/sui-common';
 export const dubheConfig = defineConfig({
   name: 'counter',
   description: 'counter contract',
-  components: {
-    // counter0: {},
-    // counter1: 'u32'
-  },
   resources: {
     counter1: 'u32',
     counter2: {

package/templates/nextjs/sui-template/packages/contracts/metadata.json

@@ -1,11 +1,11 @@
 {
   "counter1": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "counter1",
     "friends": [
       {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+        "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
         "name": "counter_system"
       }
     ],
@@ -19,19 +19,21 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
           {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
+            "Reference": {
+              "Struct": {
+                "address": "0x2",
+                "module": "tx_context",
+                "name": "TxContext",
+                "typeArguments": []
+              }
             }
           }
         ],
@@ -52,7 +54,7 @@
           }
         ]
       },
-      "get": {
+      "ensure_has": {
         "visibility": "Public",
         "isEntry": false,
         "typeParameters": [],
@@ -60,19 +62,47 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
-          },
+          }
+        ],
+        "return": []
+      },
+      "ensure_has_not": {
+        "visibility": "Public",
+        "isEntry": false,
+        "typeParameters": [],
+        "parameters": [
           {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
+            "Reference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "UserStorage",
+                "typeArguments": []
+              }
+            }
+          }
+        ],
+        "return": []
+      },
+      "get": {
+        "visibility": "Public",
+        "isEntry": false,
+        "typeParameters": [],
+        "parameters": [
+          {
+            "Reference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "UserStorage",
+                "typeArguments": []
+              }
             }
           }
         ],
@@ -88,20 +118,12 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
-          },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
           }
         ],
         "return": [
@@ -116,21 +138,13 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U32",
           {
             "MutableReference": {
@@ -149,14 +163,9 @@
   },
   "counter2": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "counter2",
-    "friends": [
-      {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
-        "name": "counter_system"
-      }
-    ],
+    "friends": [],
     "structs": {},
     "exposedFunctions": {
       "delete": {
@@ -167,22 +176,24 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
+          "U64",
           {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
+            "Reference": {
+              "Struct": {
+                "address": "0x2",
+                "module": "tx_context",
+                "name": "TxContext",
+                "typeArguments": []
+              }
             }
-          },
-          "U64"
+          }
         ],
         "return": []
       },
@@ -209,21 +220,13 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U64"
         ],
         "return": []
@@ -236,21 +239,13 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U64"
         ],
         "return": []
@@ -263,21 +258,13 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U64"
         ],
         "return": [
@@ -292,21 +279,13 @@
           {
             "Reference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U64"
         ],
         "return": [
@@ -321,21 +300,13 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
           },
-          {
-            "Struct": {
-              "address": "0x1",
-              "module": "ascii",
-              "name": "String",
-              "typeArguments": []
-            }
-          },
           "U64",
           "U32",
           {
@@ -355,7 +326,7 @@
   },
   "counter_system": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "counter_system",
     "friends": [],
     "structs": {},
@@ -368,9 +339,9 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "UserStorage",
                 "typeArguments": []
               }
             }
@@ -393,19 +364,19 @@
   },
   "dapp_key": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "dapp_key",
     "friends": [
       {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+        "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
         "name": "counter1"
       },
       {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+        "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
         "name": "counter2"
       },
       {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+        "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
         "name": "genesis"
       }
     ],
@@ -468,7 +439,7 @@
         "return": [
           {
             "Struct": {
-              "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+              "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
               "module": "dapp_key",
               "name": "DappKey",
               "typeArguments": []
@@ -505,11 +476,11 @@
   },
   "deploy_hook": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "deploy_hook",
     "friends": [
       {
-        "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+        "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
         "name": "genesis"
       }
     ],
@@ -523,9 +494,9 @@
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
-                "name": "DappHub",
+                "name": "DappStorage",
                 "typeArguments": []
               }
             }
@@ -545,14 +516,14 @@
       }
     }
   },
-  "errors": {
+  "error": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
-    "name": "errors",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
+    "name": "error",
     "friends": [],
     "structs": {},
     "exposedFunctions": {
-      "invalid_increment_error": {
+      "invalid_increment": {
         "visibility": "Public",
         "isEntry": false,
         "typeParameters": [],
@@ -565,20 +536,58 @@
   },
   "genesis": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "genesis",
     "friends": [],
     "structs": {},
     "exposedFunctions": {
+      "migrate": {
+        "visibility": "Friend",
+        "isEntry": false,
+        "typeParameters": [],
+        "parameters": [
+          {
+            "MutableReference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "DappHub",
+                "typeArguments": []
+              }
+            }
+          },
+          {
+            "MutableReference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "DappStorage",
+                "typeArguments": []
+              }
+            }
+          },
+          {
+            "MutableReference": {
+              "Struct": {
+                "address": "0x2",
+                "module": "tx_context",
+                "name": "TxContext",
+                "typeArguments": []
+              }
+            }
+          }
+        ],
+        "return": []
+      },
       "run": {
         "visibility": "Public",
-        "isEntry": true,
+        "isEntry": false,
         "typeParameters": [],
         "parameters": [
           {
             "MutableReference": {
               "Struct": {
-                "address": "0x998156fb668348852da7b22e650d80633490e17bb48db8b7c609e310ab16583",
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
                 "module": "dapp_service",
                 "name": "DappHub",
                 "typeArguments": []
@@ -612,7 +621,7 @@
   },
   "migrate": {
     "fileFormatVersion": 6,
-    "address": "0x24897b01c7d0431530d402e4df375350de372976363fe017206a265881f7b936",
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
     "name": "migrate",
     "friends": [],
     "structs": {},
@@ -627,5 +636,52 @@
         ]
       }
     }
+  },
+  "user_storage_init": {
+    "fileFormatVersion": 6,
+    "address": "0xf9ed1eb340feef0c9c576450fea9895c94b00d636f329cbb618809afad30b1e9",
+    "name": "user_storage_init",
+    "friends": [],
+    "structs": {},
+    "exposedFunctions": {
+      "init_user_storage": {
+        "visibility": "Public",
+        "isEntry": true,
+        "typeParameters": [],
+        "parameters": [
+          {
+            "Reference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "DappHub",
+                "typeArguments": []
+              }
+            }
+          },
+          {
+            "MutableReference": {
+              "Struct": {
+                "address": "0x954337de6806ee3122d2c6058af41ff4749aa92f8cad1d6963647b6f19f22101",
+                "module": "dapp_service",
+                "name": "DappStorage",
+                "typeArguments": []
+              }
+            }
+          },
+          {
+            "MutableReference": {
+              "Struct": {
+                "address": "0x2",
+                "module": "tx_context",
+                "name": "TxContext",
+                "typeArguments": []
+              }
+            }
+          }
+        ],
+        "return": []
+      }
+    }
   }
 }

package/templates/nextjs/sui-template/packages/contracts/package.json

@@ -7,18 +7,22 @@
     "// Utility Commands": "----------------",
     "account:gen": "pnpm dubhe generate-key",
     "check-balance": "pnpm dubhe check-balance --network",
-    "config:store": "pnpm dubhe config-store --output-ts-path ./deployment.ts --network",
+    "config:store": "pnpm dubhe store-config --output-ts-path ./deployment.ts --network",
     "deploy": "pnpm dubhe publish --network",
     "faucet": "pnpm dubhe faucet --network",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
+    "generate": "pnpm dubhe generate",
     "graphql": "docker-compose up --remove-orphans",
     "indexer": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url .chk --config-json dubhe.config.json",
+    "indexer:mainnet": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url https://checkpoints.mainnet.sui.io --config-json dubhe.config.json",
+    "indexer:testnet": "dubhe-indexer --database-url postgres://postgres:postgres@localhost:5432/postgres --checkpoint-url https://checkpoints.testnet.sui.io --config-json dubhe.config.json",
     "prod:localnet": "pnpm config:store localnet && pnpm run indexer",
-    "prod:testnet": "pnpm config:store testnet && pnpm run indexer",
-    "schemagen": "pnpm dubhe schemagen",
+    "prod:mainnet": "pnpm config:store mainnet && pnpm run indexer:mainnet",
+    "prod:testnet": "pnpm config:store testnet && pnpm run indexer:testnet",
     "setup:localnet": "pnpm account:gen && pnpm faucet localnet && pnpm run deploy localnet && pnpm run config:store localnet && pnpm run indexer --force",
-    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm run deploy testnet && pnpm run config:store testnet && pnpm run indexer --force",
+    "setup:mainnet": "pnpm account:gen && pnpm check-balance mainnet && pnpm run deploy mainnet && pnpm run config:store mainnet && pnpm run indexer:mainnet --force",
+    "setup:testnet": "pnpm account:gen && pnpm check-balance testnet && pnpm run deploy testnet && pnpm run config:store testnet && pnpm run indexer:testnet --force",
     "start:localnet": "pnpm dubhe node",
     "type-check": "tsc --noEmit",
     "upgrade": "pnpm dubhe upgrade --network",

package/templates/nextjs/sui-template/packages/contracts/src/counter/Move.toml

@@ -8,3 +8,7 @@ Dubhe = { local = "../dubhe" }
 
 [addresses]
 counter = "0x0"
+
+[environments]
+testnet = "4c78adac"
+mainnet = "35834a8a"