merge

Author: Aseyed

Diff for: extractors/susy/bridge/common.go

@@ -36,7 +36,7 @@ type ConfigureCommand struct {
 	LUPortAddress, IBPortAddress        string
 	SourceDecimals, DestinationDecimals int64
 
-	SourceNodeUrl, DestinationNodeUrl string
+	SourceNodeUrl, DestinationNodeUrl   string
 
 	Meta map[string]string
 }
@@ -142,3 +142,4 @@ func ValidateErgoAddress(address string) bool {
 	isValid, _ := helpers.CheckAddress(address)
 	return isValid
 }
+

Diff for: extractors/susy/bridge/solana_bytes.go

@@ -91,7 +91,8 @@ type SwapRequestsDict map[SwapID]*IBPortContractUnwrapRequest
 
 type IBPortContractState struct {
 	NebulaAddress        solcommon.PublicKey
-	TokenAddress         solcommon.PublicKey
+	TokenBinary          solcommon.PublicKey
+	TokenMint            solcommon.PublicKey
 	InitializerAddress   solcommon.PublicKey
 	Oracles            []solcommon.PublicKey
 
@@ -126,10 +127,13 @@ func DecodeIBPortState(decoded []byte) *IBPortContractState {
 
 	currentOffset += addressLength
 
-	// fmt.Printf("nebulaAddress: %v \n", base58.Encode(nebulaAddress[:]))
 
-	var tokenAddress [32]byte
-	copy(tokenAddress[:], decoded[currentOffset:currentOffset+addressLength])
+	var tokenBinaryAddress [32]byte
+	copy(tokenBinaryAddress[:], decoded[currentOffset:currentOffset+addressLength])
+	currentOffset += addressLength
+
+	var tokenMint [32]byte
+	copy(tokenMint[:], decoded[currentOffset:currentOffset+addressLength])
 	currentOffset += addressLength
 
 	// fmt.Printf("tokenAddress: %v \n", base58.Encode(tokenAddress[:]))
@@ -221,7 +225,8 @@ func DecodeIBPortState(decoded []byte) *IBPortContractState {
 
 	return &IBPortContractState {
 		NebulaAddress:      nebulaAddress,
-		TokenAddress:       tokenAddress,
+		TokenBinary:        tokenBinaryAddress,
+		TokenMint:          tokenMint,
 		InitializerAddress: initializerAddress,
 		Oracles:            oracles,
 

Diff for: extractors/susy/common.go

@@ -15,8 +15,10 @@ const (
 	EthToWavesReverse    extractors.ExtractorType = "eth-based-to-waves-reverse"
 	EVMToSolanaDirect    extractors.ExtractorType = "evm-based-to-solana-direct"
 	EVMToSolanaReverse   extractors.ExtractorType = "evm-based-to-solana-reverse"
+
 	ErgToErgDirect    	 extractors.ExtractorType = "erg-based-to-erg-direct"
 	ErgToErgReverse    	 extractors.ExtractorType = "erg-based-to-erg-reverse"
+
 )
 
 type ExtractionProvider interface {
@@ -92,6 +94,7 @@ func (e *SourceExtractor) Extract(ctx context.Context) (*extractors.Data, error)
 	case WavesToEthDirect, EthToWavesDirect, EVMToSolanaDirect, ErgToErgDirect:
 		result, err = e.delegate.ExtractDirectTransferRequest(ctx)
 	case WavesToEthReverse, EthToWavesReverse, EVMToSolanaReverse, ErgToErgReverse:
+
 		result, err = e.delegate.ExtractReverseTransferRequest(ctx)
 	}
 

Diff for: main.go

@@ -84,6 +84,7 @@ func main() {
 		susy.EthToWavesDirect, susy.EthToWavesReverse,
 		susy.EVMToSolanaDirect, susy.EVMToSolanaReverse,
 		susy.ErgToErgReverse, susy.ErgToErgDirect:
+
 		extractor, err = susy.New(
 			cfg.SourceNodeURL,
 			cfg.DestinationNodeURL,