Merge remote-tracking branch 'origin/develop' into legacy-migration

iotaledger · Feb 20, 2024 · 2fa1b46 · 2fa1b46
2 parents 7a22247 + 8417db0
commit 2fa1b46
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/packages/wasmvm/wasmclient/Cargo.toml b/packages/wasmvm/wasmclient/Cargo.toml
@@ -18,8 +18,8 @@ iota-crypto = { git = "https://github.com/iotaledger/crypto.rs", branch = "dev",
 wasmlib = { path = "../wasmlib" }
 #wasmlib = { git = "https://github.com/iotaledger/wasp", branch = "develop" }
 wasm-bindgen = "0.2.91"
-serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.113"
+serde = { version = "1.0.197", features = ["derive"] }
+serde_json = "1.0.114"
 bech32 = "0.9.1"
 base64 = "0.21.7"
 hmac = "0.12.1"

diff --git a/tools/wasp-cli/.goreleaser.yml b/tools/wasp-cli/.goreleaser.yml
@@ -37,8 +37,8 @@ builds:
     goarch:
       - arm64
 
-  # macOS
-  - id: wasp-cli-darwin-all
+  # macOS ARM64
+  - id: wasp-cli-darwin-arm64
     binary: wasp-cli
     ldflags:
       - -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }}
@@ -50,6 +50,19 @@ builds:
       - darwin
     goarch:
       - arm64
+
+    # macOS AMD64
+  - id: wasp-cli-darwin-amd64
+    binary: wasp-cli
+    ldflags:
+      - -s -w -X=github.com/iotaledger/wasp/components/app.Version={{ .Summary }}
+    main: main.go
+    dir: ./tools/wasp-cli
+    tags:
+      - no_wasmhost
+    goos:
+      - darwin
+    goarch:
       - amd64
 
   # Windows AMD64
@@ -110,24 +123,33 @@ archives:
       - src: sdk/libiota_sdk.so
         dst: libiota_sdk.so
 
-  - # MacOS
-    id: wasp-cli-macos
+  - # MacOS ARM64
+    id: wasp-cli-macos-arm64
     builds: 
-      - wasp-cli-darwin-all
+      - wasp-cli-darwin-arm64
     format: tar.gz
     wrap_in_directory: true
     name_template: >- 
-      {{ .ProjectName }}_{{ .Version }}_MacOS_
-      {{- if eq .Arch "amd64" }}x86_64
-      {{- else if eq .Arch "arm64" }}ARM64
-      {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
+      {{ .ProjectName }}_{{ .Version }}_MacOS_ARM64
     files:
       - README.md
       - LICENSE
-      - src: sdk/libiota_sdk.dylib
+      - src: sdk/libiota_sdk_arm64.dylib
         dst: libiota_sdk.dylib
 
+  - # MacOS AMD64
+    id: wasp-cli-macos-amd64
+    builds: 
+      - wasp-cli-darwin-amd64
+    format: tar.gz
+    wrap_in_directory: true
+    name_template: >- 
+      {{ .ProjectName }}_{{ .Version }}_MacOS_x86_64
+    files:
+      - README.md
+      - LICENSE
+      - src: sdk/libiota_sdk_amd64.dylib
+        dst: libiota_sdk.dylib
 
 
 # Checksum

diff --git a/tools/wasp-cli/cli/wallet/providers/ledger.go b/tools/wasp-cli/cli/wallet/providers/ledger.go
@@ -1,14 +1,21 @@
 package providers
 
 import (
+	"os"
+
 	walletsdk "github.com/iotaledger/wasp-wallet-sdk"
 	"github.com/iotaledger/wasp/packages/parameters"
 	"github.com/iotaledger/wasp/tools/wasp-cli/cli/wallet/wallets"
 	"github.com/iotaledger/wasp/tools/wasp-cli/log"
 )
 
 func LoadLedgerWallet(sdk *walletsdk.IOTASDK, addressIndex uint32) wallets.Wallet {
-	secretManager, err := walletsdk.NewLedgerSecretManager(sdk, false)
+	useEmulator := false
+	if isEmulator, ok := os.LookupEnv("IOTA_SDK_USE_SIMULATOR"); isEmulator == "true" && ok {
+		useEmulator = true
+	}
+
+	secretManager, err := walletsdk.NewLedgerSecretManager(sdk, useEmulator)
 	log.Check(err)
 
 	status, err := secretManager.GetLedgerStatus()