Merge branch 'MystenLabs:main' into main

retwn · Jul 25, 2024 · 9891b08 · 9891b08
2 parents 9f98b5a + c7de614
commit 9891b08
Show file tree

Hide file tree

Showing 16,438 changed files with 1,061,497 additions and 611,196 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -11,5 +11,34 @@ xclippy = [
 xlint = "run --package x --bin x -- lint"
 xtest = "run --package x --bin x -- external-crates-tests"
 
+# Configuration specifically for running clippy on `external-crates/move/`.
+# Some of these allows are to avoid code churn; others are filed as issues on the `sui` repo now.
+move-clippy = [
+    "clippy",
+    "--all-targets",
+    "--",
+    "-Wclippy::all",
+    "-Wclippy::disallowed_methods",
+    "-Aclippy::upper_case_acronyms",
+    "-Aclippy::type_complexity",
+    "-Aclippy::new_without_default",
+]
+
+mysql-clippy = [
+    "clippy",
+    "--all-targets",
+    "--package",
+    "sui-indexer",
+    "--features",
+    "mysql-feature",
+    "--no-default-features",
+    "--",
+    "-Wclippy::all",
+    "-Wclippy::disallowed_methods",
+    "-Aclippy::upper_case_acronyms",
+    "-Aclippy::type_complexity",
+    "-Aclippy::new_without_default",
+]
+
 [build]
 rustflags = ["-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -1,20 +1,25 @@
 {
-  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "minor",
-  "privatePackages": false,
-  "ignore": [
-    "sui-wallet",
-    "sui-explorer",
-    "@mysten/core",
-    "@mysten/ui",
-    "sui-wallet-adapter-demo",
-    "wallet-kit-site",
-    "sponsored-transactions"
-  ]
+	"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+	"changelog": "@changesets/cli/changelog",
+	"commit": false,
+	"fixed": [],
+	"linked": [],
+	"access": "public",
+	"baseBranch": "main",
+	"updateInternalDependencies": "minor",
+	"privatePackages": false,
+	"ignore": [
+		"sui-wallet",
+		"@mysten/core",
+		"sponsored-transactions",
+		"kiosk-demo",
+		"kiosk-cli",
+		"@mysten/sdk-docs",
+		"mev-bot",
+		"escrow-api-demo",
+		"trading-frontend-demo"
+	],
+	"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
+		"onlyUpdatePeerDependentsWhenOutOfRange": true
+	}
 }
diff --git a/.changeset/cyan-pumas-smell.md b/.changeset/cyan-pumas-smell.md
diff --git a/.changeset/dirty-trainers-thank.md b/.changeset/dirty-trainers-thank.md
diff --git a/.changeset/late-toes-decide.md b/.changeset/late-toes-decide.md
diff --git a/.changeset/lovely-clocks-visit.md b/.changeset/lovely-clocks-visit.md
diff --git a/.changeset/lovely-plums-live.md b/.changeset/lovely-plums-live.md
diff --git a/.changeset/rich-peaches-complain.md b/.changeset/rich-peaches-complain.md
diff --git a/.changeset/short-pugs-obey.md b/.changeset/short-pugs-obey.md
diff --git a/.changeset/slow-foxes-live.md b/.changeset/slow-foxes-live.md
diff --git a/.changeset/spotty-sloths-sniff.md b/.changeset/spotty-sloths-sniff.md
diff --git a/.changeset/wild-apples-itch.md b/.changeset/wild-apples-itch.md
diff --git a/.config/hakari.toml b/.config/hakari.toml
diff --git a/.config/nextest.toml b/.config/nextest.toml
@@ -20,19 +20,19 @@ status-level = "skip"
 fail-fast = false
 # Do not retry failing tests
 retries = 0
-# Mark tests as slow after 4 hours, kill them right after
-slow-timeout = { period = "4h", terminate-after = 1 }
+# Mark tests as slow after 7 hours, kill them right after
+slow-timeout = { period = "7h", terminate-after = 1 }
 
 [profile.simtestnightly]
 # Print out output for failing tests as soon as they fail, and also at the end
 # of the run (for easy scrollability).
-failure-output = "immediate-final"
+failure-output = "immediate"
 # Show skipped tests in the CI output.
-status-level = "skip"
+status-level = "fail"
 # Do not cancel the test run on the first failure.
 fail-fast = false
-# Mark tests as slow after 20m, terminate after 1h
-slow-timeout = { period = "20m", terminate-after = 3 }
+# Mark tests as slow after 30m, terminate after 1.5h
+slow-timeout = { period = "30m", terminate-after = 3 }
 
 [profile.ci.junit]
 path = "junit.xml"
diff --git a/.dockerignore b/.dockerignore
@@ -6,3 +6,4 @@ target/
 *.md
 build/
 storage/
+docker/
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ target/ @@
     *.md
     build/
     storage/
+    docker/