Merge pull request #228 from klever-io/develop

fix avail signed extension

Author: gustavocbritto

Cargo.lock

@@ -47,7 +47,7 @@ homepage = "https://klever.org/"
 license = "Apache-2.0"
 repository = "https://github.com/kleverio/kos-rs"
 rust-version = "1.74.0"
-version = "0.2.36"
+version = "0.2.37"
 
 [workspace.dependencies]
 bech32 = "0.9.1"
@@ -88,7 +88,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 kos-mobile = { version = "0.1.0", path = "./packages/kos-mobile", default-features = false }
 ecies = { version = "0.2.7", default-features = false, features = ["pure"] }
-kos = { version = "0.2.36", path = "./packages/kos", default-features = false, features = ["not-ksafe"] }
+kos = { version = "0.2.37", path = "./packages/kos", default-features = false, features = ["not-ksafe"] }
 
 # lightning
 lwk_common = "0.9.0"

Cargo.toml

@@ -1,4 +1,4 @@
-.PHONY: all fmt clippy check webpack webpack-npm grcov
+.PHONY: all fmt clippy check webpack webpack-npm grcov build-go build-go-mac build-go-musl
 
 UNAME := $(shell uname)
 
@@ -46,11 +46,24 @@ build-ios:
 build-go:
 	cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.4.0+v0.28.3 && \
 	cargo build --release --package kos-mobile && uniffi-bindgen-go --library target/release/libkos_mobile.a --out-dir ./packages/kos-go
+	mkdir -p ./packages/kos-go/kos_mobile/lib/linux-amd64/ && \
+	cp target/release/libkos_mobile.so ./packages/kos-go/kos_mobile/lib/linux-amd64/ || \
+	(echo "Error: Failed to copy libkos_mobile.so"; exit 1)
+
+build-go-mac:
+	cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.4.0+v0.28.3 && \
+	cargo build --release --package kos-mobile && uniffi-bindgen-go --library target/release/libkos_mobile.a --out-dir ./packages/kos-go
+	mkdir -p ./packages/kos-go/kos_mobile/lib/darwin-aarch64/ && \
+	cp target/release/libkos_mobile.dylib ./packages/kos-go/kos_mobile/lib/darwin-aarch64/ || \
+	(echo "Error: Failed to copy libkos_mobile.dylib"; exit 1)
 
 build-go-musl:	
 	cargo install uniffi-bindgen-go --git https://github.com/NordSecurity/uniffi-bindgen-go --tag v0.4.0+v0.28.3 && \
 	cargo build --profile min-size --target x86_64-unknown-linux-musl --package kos-mobile && \
 	uniffi-bindgen-go --library target/x86_64-unknown-linux-musl/min-size/libkos_mobile.a --out-dir ./packages/kos-go
+	mkdir -p ./packages/kos-go/kos_mobile/lib/linux-musl-amd64/ && \
+	cp target/x86_64-unknown-linux-musl/min-size/libkos_mobile.so ./packages/kos-go/kos_mobile/lib/linux-musl-amd64/ || \
+	(echo "Error: Failed to copy libkos_mobile.so from musl build"; exit 1)
 
 test-ios: build-ios
 	cd packages/kos-mobile/ios/framework/KOSMobile && xcodebuild \

Makefile

@@ -263,7 +263,20 @@ mod test {
                 spec_version,
                 transaction_version,
                 app_id: Some(0),
-                signed_extensions: None,
+                signed_extensions: Some(
+                    [
+                        "CheckNonZeroSender".to_string(),
+                        "CheckSpecVersion".to_string(),
+                        "CheckTxVersion".to_string(),
+                        "CheckGenesis".to_string(),
+                        "CheckMortality".to_string(),
+                        "CheckNonce".to_string(),
+                        "CheckWeight".to_string(),
+                        "ChargeTransactionPayment".to_string(),
+                        "CheckAppId".to_string(),
+                    ]
+                    .to_vec(),
+                ),
             }),
         };
 
@@ -288,7 +301,7 @@ mod test {
 
         let signed_tx = encode_for_broadcast(tx.clone(), acc).unwrap();
 
-        assert_eq!(hex::encode(signed_tx.raw_data), "2d02840066933bd1f37070ef87bd1198af3dacceb095237f803f3d32b173e6b425ed79723045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54073045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54b50120000603004e0edd04c47b1adc3b21dcd8671a5d90a1c2eb75fb60d293a9086f2626dbcd5904");
+        assert_eq!(hex::encode(signed_tx.raw_data), "3102840066933bd1f37070ef87bd1198af3dacceb095237f803f3d32b173e6b425ed79723045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54073045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54b5012000000603004e0edd04c47b1adc3b21dcd8671a5d90a1c2eb75fb60d293a9086f2626dbcd5904");
         assert_eq!(
             hex::encode(signed_tx.signature),
             "3045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54073045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54"

packages/kos-codec/src/chains/substrate/mod.rs

@@ -52,18 +52,13 @@ impl ExtrinsicPayload {
             }
         }
 
-        let has_app_id = parse_signed_extensions(&self.signed_extensions, "AppId");
+        let has_app_id = parse_signed_extensions(&self.signed_extensions, "CheckAppId");
         if let Ok(true) = has_app_id {
             if let Some(app_id) = self.app_id {
                 encoded.extend(Compact(app_id).encode());
             }
         }
 
-        // Use the app_id if it is set for AVAIL transactions, otherwise use the mode
-        if let Some(app_id) = self.app_id {
-            encoded.extend(Compact(app_id).encode());
-        }
-
         if let Some(mode) = self.mode {
             encoded.extend(mode.encode());
         }
@@ -111,7 +106,7 @@ impl ExtrinsicPayload {
             }
         }
 
-        let has_app_id = parse_signed_extensions(&self.signed_extensions, "AppId");
+        let has_app_id = parse_signed_extensions(&self.signed_extensions, "CheckAppId");
         if let Ok(true) = has_app_id {
             if let Some(app_id) = self.app_id {
                 encoded.extend(Compact(app_id).encode());

packages/kos-codec/src/chains/substrate/models.rs

@@ -98,6 +98,8 @@ test-linux-amd64:
 
 .PHONY: test-darwin-arm64
 test-darwin-arm64:
+	install_name_tool -id @rpath/libkos_mobile.dylib kos_mobile/lib/darwin-aarch64/libkos_mobile.dylib
+	otool -D kos_mobile/lib/darwin-aarch64/libkos_mobile.dylib
 	DYLD_LIBRARY_PATH=$(PWD)/kos_mobile/lib/darwin-aarch64 \
 	CGO_ENABLED=1 \
 	GOOS=darwin \
@@ -152,5 +154,4 @@ help:
 	@echo "  build-darwin-arm64  - Build for macOS ARM64"
 	@echo "  test-linux-amd64    - Test Linux AMD64"
 	@echo "  test-linux-musl     - Test Linux with musl"
-	@echo "  test-darwin-amd64   - Test macOS AMD64"
 	@echo "  test-darwin-arm64   - Test macOS ARM64"

packages/kos-go/Makefile

@@ -3,3 +3,5 @@ module github.com/klever-io/kos-rs/packages/kos-go/demo
 go 1.24.7
 
 require github.com/klever-io/kos-rs/packages/kos-go v0.2.36
+
+replace github.com/klever-io/kos-rs/packages/kos-go => ../

packages/kos-go/demo/go.mod

@@ -1,2 +0,0 @@
-github.com/klever-io/kos-rs/packages/kos-go v0.2.36 h1:m17sM3KzasFHPA4Aa9DYm9e3ES8owhAU1sYfWmA1RVw=
-github.com/klever-io/kos-rs/packages/kos-go v0.2.36/go.mod h1:ekYnxLsNZh51RGO8/X4WrhDWbUGmW0uUM7NxqE1P5sQ=

packages/kos-go/demo/go.sum

@@ -708,7 +708,7 @@ func uniffiCheckChecksums() {
 		checksum := rustCall(func(_uniffiStatus *C.RustCallStatus) C.uint16_t {
 			return C.uniffi_kos_mobile_checksum_func_new_substrate_transaction_options()
 		})
-		if checksum != 59821 {
+		if checksum != 29579 {
 			// If this happens try cleaning and rebuilding your project
 			panic("kos_mobile: uniffi_kos_mobile_checksum_func_new_substrate_transaction_options: UniFFI API checksum mismatch")
 		}
@@ -1702,25 +1702,27 @@ type TransactionChainOptionsSubstrate struct {
 	Era                []byte
 	Nonce              uint32
 	Tip                uint64
-	AssetId            *uint32
+	AssetId            *string
 	BlockHash          []byte
 	GenesisHash        []byte
 	SpecVersion        uint32
 	TransactionVersion uint32
 	AppId              *uint32
+	SignedExtensions   *[]string
 }
 
 func (e TransactionChainOptionsSubstrate) Destroy() {
 	FfiDestroyerBytes{}.Destroy(e.Call)
 	FfiDestroyerBytes{}.Destroy(e.Era)
 	FfiDestroyerUint32{}.Destroy(e.Nonce)
 	FfiDestroyerUint64{}.Destroy(e.Tip)
-	FfiDestroyerOptionalUint32{}.Destroy(e.AssetId)
+	FfiDestroyerOptionalString{}.Destroy(e.AssetId)
 	FfiDestroyerBytes{}.Destroy(e.BlockHash)
 	FfiDestroyerBytes{}.Destroy(e.GenesisHash)
 	FfiDestroyerUint32{}.Destroy(e.SpecVersion)
 	FfiDestroyerUint32{}.Destroy(e.TransactionVersion)
 	FfiDestroyerOptionalUint32{}.Destroy(e.AppId)
+	FfiDestroyerOptionalSequenceString{}.Destroy(e.SignedExtensions)
 }
 
 type TransactionChainOptionsCosmos struct {
@@ -1762,12 +1764,13 @@ func (FfiConverterTransactionChainOptions) Read(reader io.Reader) TransactionCha
 			FfiConverterBytesINSTANCE.Read(reader),
 			FfiConverterUint32INSTANCE.Read(reader),
 			FfiConverterUint64INSTANCE.Read(reader),
-			FfiConverterOptionalUint32INSTANCE.Read(reader),
+			FfiConverterOptionalStringINSTANCE.Read(reader),
 			FfiConverterBytesINSTANCE.Read(reader),
 			FfiConverterBytesINSTANCE.Read(reader),
 			FfiConverterUint32INSTANCE.Read(reader),
 			FfiConverterUint32INSTANCE.Read(reader),
 			FfiConverterOptionalUint32INSTANCE.Read(reader),
+			FfiConverterOptionalSequenceStringINSTANCE.Read(reader),
 		}
 	case 4:
 		return TransactionChainOptionsCosmos{
@@ -1794,12 +1797,13 @@ func (FfiConverterTransactionChainOptions) Write(writer io.Writer, value Transac
 		FfiConverterBytesINSTANCE.Write(writer, variant_value.Era)
 		FfiConverterUint32INSTANCE.Write(writer, variant_value.Nonce)
 		FfiConverterUint64INSTANCE.Write(writer, variant_value.Tip)
-		FfiConverterOptionalUint32INSTANCE.Write(writer, variant_value.AssetId)
+		FfiConverterOptionalStringINSTANCE.Write(writer, variant_value.AssetId)
 		FfiConverterBytesINSTANCE.Write(writer, variant_value.BlockHash)
 		FfiConverterBytesINSTANCE.Write(writer, variant_value.GenesisHash)
 		FfiConverterUint32INSTANCE.Write(writer, variant_value.SpecVersion)
 		FfiConverterUint32INSTANCE.Write(writer, variant_value.TransactionVersion)
 		FfiConverterOptionalUint32INSTANCE.Write(writer, variant_value.AppId)
+		FfiConverterOptionalSequenceStringINSTANCE.Write(writer, variant_value.SignedExtensions)
 	case TransactionChainOptionsCosmos:
 		writeInt32(writer, 4)
 		FfiConverterStringINSTANCE.Write(writer, variant_value.ChainId)
@@ -1919,6 +1923,43 @@ func (_ FfiDestroyerOptionalUint32) Destroy(value *uint32) {
 	}
 }
 
+type FfiConverterOptionalString struct{}
+
+var FfiConverterOptionalStringINSTANCE = FfiConverterOptionalString{}
+
+func (c FfiConverterOptionalString) Lift(rb RustBufferI) *string {
+	return LiftFromRustBuffer[*string](c, rb)
+}
+
+func (_ FfiConverterOptionalString) Read(reader io.Reader) *string {
+	if readInt8(reader) == 0 {
+		return nil
+	}
+	temp := FfiConverterStringINSTANCE.Read(reader)
+	return &temp
+}
+
+func (c FfiConverterOptionalString) Lower(value *string) C.RustBuffer {
+	return LowerIntoRustBuffer[*string](c, value)
+}
+
+func (_ FfiConverterOptionalString) Write(writer io.Writer, value *string) {
+	if value == nil {
+		writeInt8(writer, 0)
+	} else {
+		writeInt8(writer, 1)
+		FfiConverterStringINSTANCE.Write(writer, *value)
+	}
+}
+
+type FfiDestroyerOptionalString struct{}
+
+func (_ FfiDestroyerOptionalString) Destroy(value *string) {
+	if value != nil {
+		FfiDestroyerString{}.Destroy(*value)
+	}
+}
+
 type FfiConverterOptionalWalletOptions struct{}
 
 var FfiConverterOptionalWalletOptionsINSTANCE = FfiConverterOptionalWalletOptions{}
@@ -2030,6 +2071,43 @@ func (_ FfiDestroyerOptionalWalletChainOptions) Destroy(value *WalletChainOption
 	}
 }
 
+type FfiConverterOptionalSequenceString struct{}
+
+var FfiConverterOptionalSequenceStringINSTANCE = FfiConverterOptionalSequenceString{}
+
+func (c FfiConverterOptionalSequenceString) Lift(rb RustBufferI) *[]string {
+	return LiftFromRustBuffer[*[]string](c, rb)
+}
+
+func (_ FfiConverterOptionalSequenceString) Read(reader io.Reader) *[]string {
+	if readInt8(reader) == 0 {
+		return nil
+	}
+	temp := FfiConverterSequenceStringINSTANCE.Read(reader)
+	return &temp
+}
+
+func (c FfiConverterOptionalSequenceString) Lower(value *[]string) C.RustBuffer {
+	return LowerIntoRustBuffer[*[]string](c, value)
+}
+
+func (_ FfiConverterOptionalSequenceString) Write(writer io.Writer, value *[]string) {
+	if value == nil {
+		writeInt8(writer, 0)
+	} else {
+		writeInt8(writer, 1)
+		FfiConverterSequenceStringINSTANCE.Write(writer, *value)
+	}
+}
+
+type FfiDestroyerOptionalSequenceString struct{}
+
+func (_ FfiDestroyerOptionalSequenceString) Destroy(value *[]string) {
+	if value != nil {
+		FfiDestroyerSequenceString{}.Destroy(*value)
+	}
+}
+
 type FfiConverterSequenceUint32 struct{}
 
 var FfiConverterSequenceUint32INSTANCE = FfiConverterSequenceUint32{}
@@ -2642,10 +2720,10 @@ func NewIcpWalletOptions(useLegacyPath bool, keyType string) WalletOptions {
 	}))
 }
 
-func NewSubstrateTransactionOptions(call string, era string, nonce uint32, tip uint64, assetId *uint32, blockHash string, genesisHash string, specVersion uint32, transactionVersion uint32, appId *uint32) TransactionChainOptions {
+func NewSubstrateTransactionOptions(call string, era string, nonce uint32, tip uint64, assetId *string, blockHash string, genesisHash string, specVersion uint32, transactionVersion uint32, appId *uint32, signedExtensions *[]string) TransactionChainOptions {
 	return FfiConverterTransactionChainOptionsINSTANCE.Lift(rustCall(func(_uniffiStatus *C.RustCallStatus) RustBufferI {
 		return GoRustBuffer{
-			inner: C.uniffi_kos_mobile_fn_func_new_substrate_transaction_options(FfiConverterStringINSTANCE.Lower(call), FfiConverterStringINSTANCE.Lower(era), FfiConverterUint32INSTANCE.Lower(nonce), FfiConverterUint64INSTANCE.Lower(tip), FfiConverterOptionalUint32INSTANCE.Lower(assetId), FfiConverterStringINSTANCE.Lower(blockHash), FfiConverterStringINSTANCE.Lower(genesisHash), FfiConverterUint32INSTANCE.Lower(specVersion), FfiConverterUint32INSTANCE.Lower(transactionVersion), FfiConverterOptionalUint32INSTANCE.Lower(appId), _uniffiStatus),
+			inner: C.uniffi_kos_mobile_fn_func_new_substrate_transaction_options(FfiConverterStringINSTANCE.Lower(call), FfiConverterStringINSTANCE.Lower(era), FfiConverterUint32INSTANCE.Lower(nonce), FfiConverterUint64INSTANCE.Lower(tip), FfiConverterOptionalStringINSTANCE.Lower(assetId), FfiConverterStringINSTANCE.Lower(blockHash), FfiConverterStringINSTANCE.Lower(genesisHash), FfiConverterUint32INSTANCE.Lower(specVersion), FfiConverterUint32INSTANCE.Lower(transactionVersion), FfiConverterOptionalUint32INSTANCE.Lower(appId), FfiConverterOptionalSequenceStringINSTANCE.Lower(signedExtensions), _uniffiStatus),
 		}
 	}))
 }

packages/kos-go/kos_mobile/kos_mobile.go

@@ -582,7 +582,7 @@ RustBuffer uniffi_kos_mobile_fn_func_new_icp_wallet_options(int8_t use_legacy_pa
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_KOS_MOBILE_FN_FUNC_NEW_SUBSTRATE_TRANSACTION_OPTIONS
 #define UNIFFI_FFIDEF_UNIFFI_KOS_MOBILE_FN_FUNC_NEW_SUBSTRATE_TRANSACTION_OPTIONS
-RustBuffer uniffi_kos_mobile_fn_func_new_substrate_transaction_options(RustBuffer call, RustBuffer era, uint32_t nonce, uint64_t tip, RustBuffer asset_id, RustBuffer block_hash, RustBuffer genesis_hash, uint32_t spec_version, uint32_t transaction_version, RustBuffer app_id, RustCallStatus *out_status
+RustBuffer uniffi_kos_mobile_fn_func_new_substrate_transaction_options(RustBuffer call, RustBuffer era, uint32_t nonce, uint64_t tip, RustBuffer asset_id, RustBuffer block_hash, RustBuffer genesis_hash, uint32_t spec_version, uint32_t transaction_version, RustBuffer app_id, RustBuffer signed_extensions, RustCallStatus *out_status
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_KOS_MOBILE_FN_FUNC_NEW_WALLET_OPTIONS