Merge pull request #165 from renproject/feat/pull-fees-from-state

Pull cross-chain fees from RenVM state
renproject · May 22, 2021 · be11de4 · be11de4
2 parents a967ea0 + de9c0a1
commit be11de4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.4.1
-- Update Multichain to v0.3.8
+- Update Multichain to v0.3.10
 - Add support for watching Solana burns
+- Pull cross-chain fees from RenVM state
 
 ## 0.3.2
 

diff --git a/compat/v0/compat.go b/compat/v0/compat.go
@@ -71,8 +71,9 @@ func QueryFeesResponseFromState(state map[string]engine.XState) (ResponseQueryFe
 	}
 	bitcoinCap := bitcoinS.GasCap
 	bitcoinLimit := bitcoinS.GasLimit
-
 	bitcoinUnderlying := U64{Int: big.NewInt(int64(bitcoinCap.Int().Uint64() * bitcoinLimit.Int().Uint64()))}
+	bitcoinMintFee := U64{Int: big.NewInt(int64(bitcoinS.MintFee))}
+	bitcoinBurnFee := U64{Int: big.NewInt(int64(bitcoinS.BurnFee))}
 
 	zcashS, ok := state[string(multichain.Zcash.NativeAsset())]
 	if !ok {
@@ -83,6 +84,8 @@ func QueryFeesResponseFromState(state map[string]engine.XState) (ResponseQueryFe
 	zcashCap := zcashS.GasCap
 	zcashLimit := zcashS.GasLimit
 	zcashUnderlying := U64{Int: big.NewInt(int64(zcashCap.Int().Uint64() * zcashLimit.Int().Uint64()))}
+	zcashMintFee := U64{Int: big.NewInt(int64(zcashS.MintFee))}
+	zcashBurnFee := U64{Int: big.NewInt(int64(zcashS.BurnFee))}
 
 	bitcoinCashS, ok := state[string(multichain.BitcoinCash.NativeAsset())]
 	if !ok {
@@ -91,35 +94,33 @@ func QueryFeesResponseFromState(state map[string]engine.XState) (ResponseQueryFe
 	}
 	bitcoinCashCap := bitcoinCashS.GasCap
 	bitcoinCashLimit := bitcoinCashS.GasLimit
-
 	bitcoinCashUnderlying := U64{Int: big.NewInt(int64(bitcoinCashCap.Int().Uint64() * bitcoinCashLimit.Int().Uint64()))}
-
-	mintFee := U64{Int: big.NewInt(25)}
-	burnFee := U64{Int: big.NewInt(10)}
+	bitcoinCashMintFee := U64{Int: big.NewInt(int64(bitcoinCashS.MintFee))}
+	bitcoinCashBurnFee := U64{Int: big.NewInt(int64(bitcoinCashS.BurnFee))}
 
 	resp := ResponseQueryFees{
 		Btc: Fees{
 			Lock:    bitcoinUnderlying,
 			Release: bitcoinUnderlying,
 			Ethereum: MintAndBurnFees{
-				Mint: mintFee,
-				Burn: burnFee,
+				Mint: bitcoinMintFee,
+				Burn: bitcoinBurnFee,
 			},
 		},
 		Zec: Fees{
 			Lock:    zcashUnderlying,
 			Release: zcashUnderlying,
 			Ethereum: MintAndBurnFees{
-				Mint: mintFee,
-				Burn: burnFee,
+				Mint: zcashMintFee,
+				Burn: zcashBurnFee,
 			},
 		},
 		Bch: Fees{
 			Lock:    bitcoinCashUnderlying,
 			Release: bitcoinCashUnderlying,
 			Ethereum: MintAndBurnFees{
-				Mint: mintFee,
-				Burn: burnFee,
+				Mint: bitcoinCashMintFee,
+				Burn: bitcoinCashBurnFee,
 			},
 		},
 	}