Merge branch 'feature/msg-address-unpack' into 'master'

Add UnpackAbi and KnownParamType support for MsgAddress See merge request network/nekoton!2
broxus · Sep 27, 2023 · dd1befc · dd1befc
2 parents c7e3bdc + 30e6351
commit dd1befc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/nekoton-abi/src/known_param_type.rs b/nekoton-abi/src/known_param_type.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use ton_abi::{Param, ParamType};
-use ton_block::{MsgAddrStd, MsgAddressInt};
+use ton_block::{MsgAddrStd, MsgAddress, MsgAddressInt};
 use ton_types::{BuilderData, Cell};
 
 use super::{MaybeRef, StandaloneToken};
@@ -120,6 +120,12 @@ impl KnownParamType for MsgAddressInt {
     }
 }
 
+impl KnownParamType for MsgAddress {
+    fn param_type() -> ParamType {
+        ParamType::Address
+    }
+}
+
 impl KnownParamType for MsgAddrStd {
     fn param_type() -> ParamType {
         ParamType::Address

diff --git a/nekoton-abi/src/token_unpacker.rs b/nekoton-abi/src/token_unpacker.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use num_bigint::{BigInt, BigUint};
 use num_traits::ToPrimitive;
 use ton_abi::{Token, TokenValue};
-use ton_block::{MsgAddrStd, MsgAddressInt};
+use ton_block::{MsgAddrStd, MsgAddress, MsgAddressInt};
 use ton_types::Cell;
 
 use super::{MaybeRef, StandaloneToken};
@@ -219,6 +219,15 @@ impl UnpackAbi<MsgAddressInt> for TokenValue {
     }
 }
 
+impl UnpackAbi<MsgAddress> for TokenValue {
+    fn unpack(self) -> UnpackerResult<MsgAddress> {
+        match self {
+            TokenValue::Address(address) => Ok(address),
+            _ => Err(UnpackerError::InvalidAbi),
+        }
+    }
+}
+
 impl UnpackAbi<MsgAddrStd> for TokenValue {
     fn unpack(self) -> UnpackerResult<MsgAddrStd> {
         match self {