Merge branch 'develop' into devx/fix-navbar-items-ui

iotaledger · Dec 13, 2024 · c25ca64 · c25ca64
2 parents 4b5f7c8 + 3befead
commit c25ca64
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 17 deletions.
diff --git a/.changeset/silly-bulldogs-divide.md b/.changeset/silly-bulldogs-divide.md
diff --git a/crates/iota-genesis-builder/src/main.rs b/crates/iota-genesis-builder/src/main.rs
@@ -46,7 +46,7 @@ enum Snapshot {
             long,
             help = "Path to the address swap map file. This must be a CSV file with two columns, where an entry contains in the first column an IotaAddress present in the Hornet full-snapshot and in the second column an IotaAddress that will be used for the swap."
         )]
-        address_swap_map_path: String,
+        address_swap_map_path: Option<String>,
         #[clap(long, value_parser = clap::value_parser!(MigrationTargetNetwork), help = "Target network for migration")]
         target_network: MigrationTargetNetwork,
     },
@@ -84,7 +84,11 @@ fn main() -> Result<()> {
         CoinType::Iota => scale_amount_for_iota(snapshot_parser.total_supply()?)?,
     };
 
-    let address_swap_map = AddressSwapMap::from_csv(&address_swap_map_path)?;
+    let address_swap_map = if let Some(address_swap_map_path) = address_swap_map_path {
+        AddressSwapMap::from_csv(&address_swap_map_path)?
+    } else {
+        AddressSwapMap::default()
+    };
     // Prepare the migration using the parser output stream
     let migration = Migration::new(
         snapshot_parser.target_milestone_timestamp(),

diff --git a/docs/content/developer/getting-started/build-test.mdx b/docs/content/developer/getting-started/build-test.mdx
@@ -60,7 +60,7 @@ Test result: OK. Total tests: 0; passed: 0; failed: 0
 
 ### Add Tests
 
-You can add your first unit test by copying the following public test function and adding it to `first_package_tests` file, within the `tests` directory.
+You can add your first unit test by copying the following public test function and adding it to the `first_package` file.
 
 ```move
 #[test]

diff --git a/examples/move/first_package/Move.toml b/examples/move/first_package/Move.toml
@@ -5,7 +5,7 @@ edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move
 # authors = ["..."]      # e.g., ["Joe Smith ([email protected])", "John Snow ([email protected])"]
 
 [dependencies]
-Iota = { local = "../../../crates/iota-framework/packages/iota-framework" }
+Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "testnet" }
 
 # For remote import, use the `{ git = "...", subdir = "...", rev = "..." }`.
 # Revision can be a branch, a tag, and a commit hash.

diff --git a/sdk/create-dapp/CHANGELOG.md b/sdk/create-dapp/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @iota/create-dapp
 
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [9864dcb]
+    -   @iota/iota-sdk@0.4.0
+    -   @iota/dapp-kit@0.3.2
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/sdk/create-dapp/package.json b/sdk/create-dapp/package.json
@@ -3,7 +3,7 @@
     "author": "IOTA Foundation <[email protected]>",
     "description": "A CLI for creating new IOTA dApps",
     "homepage": "https://docs.iota.org/ts-sdk/typescript/",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "license": "Apache-2.0",
     "files": [
         "CHANGELOG.md",

diff --git a/sdk/dapp-kit/CHANGELOG.md b/sdk/dapp-kit/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @iota/dapp-kit
 
+## 0.3.2
+
+### Patch Changes
+
+-   Updated dependencies [9864dcb]
+    -   @iota/iota-sdk@0.4.0
+    -   @iota/wallet-standard@0.2.2
+
 ## 0.3.1
 
 ### Patch Changes

diff --git a/sdk/dapp-kit/package.json b/sdk/dapp-kit/package.json
@@ -3,7 +3,7 @@
     "author": "IOTA Foundation <[email protected]>",
     "description": "A collection of React hooks and components for interacting with the IOTA blockchain and wallets.",
     "homepage": "https://docs.iota.org/ts-sdk/dapp-kit/",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "license": "Apache-2.0",
     "files": [
         "CHANGELOG.md",

diff --git a/sdk/graphql-transport/CHANGELOG.md b/sdk/graphql-transport/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @iota/graphql-transport
 
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [9864dcb]
+    -   @iota/iota-sdk@0.4.0
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/sdk/graphql-transport/package.json b/sdk/graphql-transport/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@iota/graphql-transport",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "A GraphQL transport to allow IotaClient to work with RPC 2.0",
     "license": "Apache-2.0",
     "author": "IOTA Foundation <[email protected]>",

diff --git a/sdk/kiosk/CHANGELOG.md b/sdk/kiosk/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @iota/kiosk
 
+## 0.3.0
+
+### Minor Changes
+
+-   9864dcb: Add default royalty, kiosk lock, floor price & personal kiosk rules package ids to
+    testnet network
+
+### Patch Changes
+
+-   Updated dependencies [9864dcb]
+    -   @iota/iota-sdk@0.4.0
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/sdk/kiosk/package.json b/sdk/kiosk/package.json
@@ -2,7 +2,7 @@
     "name": "@iota/kiosk",
     "author": "IOTA Foundation <[email protected]>",
     "description": "IOTA Kiosk library",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "license": "Apache-2.0",
     "type": "commonjs",
     "main": "./dist/cjs/index.js",

diff --git a/sdk/typescript/CHANGELOG.md b/sdk/typescript/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @iota/iota-sdk
 
+## 0.4.0
+
+### Minor Changes
+
+-   9864dcb: Add default royalty, kiosk lock, floor price & personal kiosk rules package ids to
+    testnet network
+
 ## 0.3.1
 
 ### Patch Changes

diff --git a/sdk/typescript/package.json b/sdk/typescript/package.json
@@ -3,7 +3,7 @@
     "author": "IOTA Foundation <[email protected]>",
     "description": "IOTA TypeScript API",
     "homepage": "https://docs.iota.org/ts-sdk/typescript/",
-    "version": "0.3.1",
+    "version": "0.4.0",
     "license": "Apache-2.0",
     "sideEffects": false,
     "files": [

diff --git a/sdk/typescript/src/version.ts b/sdk/typescript/src/version.ts
@@ -4,5 +4,5 @@
 
 // This file is generated by genversion.mjs. Do not edit it directly.
 
-export const PACKAGE_VERSION = '0.3.1';
+export const PACKAGE_VERSION = '0.4.0';
 export const TARGETED_RPC_VERSION = '0.8.0-alpha';
diff --git a/sdk/wallet-standard/CHANGELOG.md b/sdk/wallet-standard/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @iota/wallet-standard
 
+## 0.2.2
+
+### Patch Changes
+
+-   Updated dependencies [9864dcb]
+    -   @iota/iota-sdk@0.4.0
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/sdk/wallet-standard/package.json b/sdk/wallet-standard/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@iota/wallet-standard",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "A suite of standard utilities for implementing wallets based on the Wallet Standard.",
     "license": "Apache-2.0",
     "author": "IOTA Foundation <[email protected]>",
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ Test result: OK. Total tests: 0; passed: 0; failed: 0 @@
     ### Add Tests
-    You can add your first unit test by copying the following public test function and adding it to `first_package_tests` file, within the `tests` directory.
+    You can add your first unit test by copying the following public test function and adding it to the `first_package` file.
     ```move
     #[test]
@@ Expand Down @@