Merge pull request #22 from flare-foundation/upgrade-fixes

mboben · web-flow · commit f389ed8efbb4 · 2025-07-22T15:44:28.000+02:00
fixes after upgrade
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,5 @@ rosetta-data
 data
 .vscode*
 __debug_bin*
-build_docker.sh
+build_docker.sh
+.idea
diff --git a/server/constants/network.go b/server/constants/network.go
@@ -2,20 +2,9 @@ package constants
 
 import (
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/coreth/params"
 )
 
 const (
-	MainnetChainID = 43114
-	MainnetAssetID = "FvwEAhmxKfeiG8SnEvq42hc6whRyY3EFYAvebMqDNDGCgxN5Z"
 	MainnetNetwork = constants.MainnetName
-
-	FujiChainID = 43113
-	FujiAssetID = "U8iRqJoiJm8xZHAacmvYyZVwqQx6uDNtQeP3CQ6fcgQk3JqnK"
-	FujiNetwork = constants.FujiName
-)
-
-var (
-	MainnetAP5Activation = *params.AvalancheMainnetChainConfig.ApricotPhase5BlockTimestamp
-	FujiAP5Activation    = *params.AvalancheFujiChainConfig.ApricotPhase5BlockTimestamp
+	TestnetNetwork = constants.TestnetName
 )
diff --git a/server/mapper/helper.go b/server/mapper/helper.go
@@ -32,8 +32,8 @@ func EqualFoldContains(arr []string, str string) bool {
 func GetHRP(networkIdentifier *types.NetworkIdentifier) (string, error) {
 	var hrp string
 	switch strings.ToLower(networkIdentifier.Network) {
-	case rosConst.FujiNetwork:
-		hrp = constants.GetHRP(constants.FujiID)
+	case rosConst.TestnetNetwork:
+		hrp = constants.GetHRP(constants.TestnetID)
 	case rosConst.MainnetNetwork:
 		hrp = constants.GetHRP(constants.MainnetID)
 	default:
diff --git a/server/mapper/transaction_test.go b/server/mapper/transaction_test.go
@@ -256,7 +256,7 @@ func TestCrossChainImportedInputs(t *testing.T) {
 		tx          = &evm.Tx{}
 
 		networkIdentifier = &types.NetworkIdentifier{
-			Network: constants.FujiNetwork,
+			Network: constants.TestnetNetwork,
 		}
 		chainIDToAliasMapping = map[ids.ID]constants.ChainIDAlias{
 			ids.Empty: constants.PChain,
@@ -309,7 +309,7 @@ func TestCrossChainExportedOuts(t *testing.T) {
 		tx          = &evm.Tx{}
 
 		networkIdentifier = &types.NetworkIdentifier{
-			Network: constants.FujiNetwork,
+			Network: constants.TestnetNetwork,
 		}
 		chainIDToAliasMapping = map[ids.ID]constants.ChainIDAlias{
 			ids.Empty: constants.PChain,
diff --git a/server/rosetta-cli-conf/costwo/config.json b/server/rosetta-cli-conf/costwo/config.json
@@ -24,9 +24,9 @@
     },
     "prefunded_accounts": [
       {
-        "privkey": "",
+        "privkey": "private-key-for-that-address",
         "account_identifier": {
-          "address": "0xcb00566863A90DBa5fE56e9a7e4Cf310c24e6506"
+          "address": "public-address-prefunded-with-faucet"
         },
         "curve_type": "secp256k1",
         "currency": {
diff --git a/server/rosetta-cli-conf/costwo/costwo.ros b/server/rosetta-cli-conf/costwo/costwo.ros
@@ -55,7 +55,7 @@ transfer(10){
     // Set the recipient_amount as some value <= sender.balance-max_fee
     max_fee = "4725000000000000"; // 0.004725 FLR
     available_amount = {{sender.balance.value}} - {{max_fee}};
-    recipient_amount = random_number({"minimum": "1", "maximum": {{available_amount}}});
+    recipient_amount = random_number({"minimum": "1", "maximum": "10000"});
     print_message({"recipient_amount":{{recipient_amount}}});
 
     // Find recipient and construct operations
diff --git a/server/rosetta-cli-conf/costwo/server-config.json b/server/rosetta-cli-conf/costwo/server-config.json
@@ -1,6 +1,6 @@
 {
     "mode": "online",
-    "rpc_endpoint": "http://127.0.0.1:9650",
+    "rpc_base_url": "http://127.0.0.1:9650",
     "network_name": "testnet",
     "genesis_block_hash": "0xc47d9c5d19d9cde5316780d1b0896ce2f20a0bc09c9ce2c86fbfafc0742b1e63",
     "chain_id": 114
diff --git a/server/rosetta-cli-conf/flare/exempt_accounts.json b/server/rosetta-cli-conf/flare/exempt_accounts.json
@@ -52,5 +52,32 @@
             "symbol": "FLR",
             "decimals": 18
         }
+    },
+    {
+        "account_identifier": {
+            "address": "0xbe653C54DF337F13Fcb726101388F4a4803049F3"
+        },
+        "currency": {
+            "symbol": "FLR",
+            "decimals": 18
+        }
+    },
+    {
+        "account_identifier": {
+            "address": "0xF09fc2658270ac5494fa365dc5e29E0a2c636413"
+        },
+        "currency": {
+            "symbol": "FLR",
+            "decimals": 18
+        }
+    },
+    {
+        "account_identifier": {
+            "address": "0xbe653C54DF337F13Fcb726101388F4a4803049F3"
+        },
+        "currency": {
+            "symbol": "FLR",
+            "decimals": 18
+        }
     }
 ]
diff --git a/server/rosetta-cli-conf/flare/server-config.json b/server/rosetta-cli-conf/flare/server-config.json
@@ -1,6 +1,6 @@
 {
     "mode": "online",
-    "rpc_endpoint": "http://127.0.0.1:9650",
+    "rpc_base_url": "http://127.0.0.1:9650",
     "network_name": "mainnet",
     "genesis_block_hash": "0xf501834f1cfce08939acb0feadb11ca0a94d806c5bedb6700a771fc27d2f1068",
     "chain_id": 14
diff --git a/server/service/backend/cchainatomictx/backend_test.go b/server/service/backend/cchainatomictx/backend_test.go
@@ -17,7 +17,7 @@ import (
 func TestShouldHandleRequest(t *testing.T) {
 	cChainNetworkIdentifier := &types.NetworkIdentifier{
 		Blockchain: service.BlockchainName,
-		Network:    constants.FujiNetwork,
+		Network:    constants.TestnetNetwork,
 	}
 
 	bech32AccountIdentifier := &types.AccountIdentifier{Address: "C-avax1us3us4s4mv0g85vxjm8va04ewdl27wcwnqwejf"}
diff --git a/server/service/backend/cchainatomictx/construction_test.go b/server/service/backend/cchainatomictx/construction_test.go
@@ -26,7 +26,7 @@ import (
 var (
 	networkIdentifier = &types.NetworkIdentifier{
 		Blockchain: service.BlockchainName,
-		Network:    constants.FujiNetwork,
+		Network:    constants.TestnetNetwork,
 	}
 
 	cAccountIdentifier       = &types.AccountIdentifier{Address: "0x3158e80abD5A1e1aa716003C9Db096792C379621"}
diff --git a/server/service/backend/pchain/account_test.go b/server/service/backend/pchain/account_test.go
@@ -95,7 +95,7 @@ func TestAccountBalance(t *testing.T) {
 			ctx,
 			&types.AccountBalanceRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -142,7 +142,7 @@ func TestAccountBalance(t *testing.T) {
 			ctx,
 			&types.AccountBalanceRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -186,7 +186,7 @@ func TestAccountBalance(t *testing.T) {
 			ctx,
 			&types.AccountBalanceRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -272,7 +272,7 @@ func TestAccountPendingRewardsBalance(t *testing.T) {
 			ctx,
 			&types.AccountBalanceRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -316,7 +316,7 @@ func TestAccountPendingRewardsBalance(t *testing.T) {
 			ctx,
 			&types.AccountBalanceRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -398,7 +398,7 @@ func TestAccountCoins(t *testing.T) {
 			ctx,
 			&types.AccountCoinsRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
@@ -468,7 +468,7 @@ func TestAccountCoins(t *testing.T) {
 			ctx,
 			&types.AccountCoinsRequest{
 				NetworkIdentifier: &types.NetworkIdentifier{
-					Network: constants.FujiNetwork,
+					Network: constants.TestnetNetwork,
 					SubNetworkIdentifier: &types.SubNetworkIdentifier{
 						Network: constants.PChain.String(),
 					},
diff --git a/server/service/backend/pchain/backend_test.go b/server/service/backend/pchain/backend_test.go
@@ -18,15 +18,15 @@ import (
 func TestShouldHandleRequest(t *testing.T) {
 	pChainNetworkIdentifier := &types.NetworkIdentifier{
 		Blockchain: service.BlockchainName,
-		Network:    constants.FujiNetwork,
+		Network:    constants.TestnetNetwork,
 		SubNetworkIdentifier: &types.SubNetworkIdentifier{
 			Network: constants.PChain.String(),
 		},
 	}
 
 	cChainNetworkIdentifier := &types.NetworkIdentifier{
 		Blockchain: service.BlockchainName,
-		Network:    constants.FujiNetwork,
+		Network:    constants.TestnetNetwork,
 	}
 
 	ctx := context.Background()
diff --git a/server/service/backend/pchain/construction_test.go b/server/service/backend/pchain/construction_test.go
@@ -29,7 +29,7 @@ import (
 var (
 	pChainNetworkIdentifier = &types.NetworkIdentifier{
 		Blockchain: service.BlockchainName,
-		Network:    constants.FujiNetwork,
+		Network:    constants.TestnetNetwork,
 		SubNetworkIdentifier: &types.SubNetworkIdentifier{
 			Network: constants.PChain.String(),
 		},
diff --git a/server/service/service_account_test.go b/server/service/service_account_test.go
@@ -24,7 +24,7 @@ func TestAccountBalance(t *testing.T) {
 	t.Run("p-chain request is delegated to p-chain backend", func(t *testing.T) {
 		req := &types.AccountBalanceRequest{
 			NetworkIdentifier: &types.NetworkIdentifier{
-				Network: constants.FujiNetwork,
+				Network: constants.TestnetNetwork,
 				SubNetworkIdentifier: &types.SubNetworkIdentifier{
 					Network: constants.PChain.String(),
 				},
@@ -47,7 +47,7 @@ func TestAccountBalance(t *testing.T) {
 	t.Run("c-chain atomic request is delegated to c-chain atomic tx backend", func(t *testing.T) {
 		req := &types.AccountBalanceRequest{
 			NetworkIdentifier: &types.NetworkIdentifier{
-				Network: constants.FujiNetwork,
+				Network: constants.TestnetNetwork,
 			},
 			AccountIdentifier: &types.AccountIdentifier{
 				Address: "C-fuji15f9g0h5xkr5cp47n6u3qxj6yjtzzzrdr23a3tl",
@@ -79,7 +79,7 @@ func TestAccountCoins(t *testing.T) {
 	t.Run("p-chain request is delegated to p-chain backend", func(t *testing.T) {
 		req := &types.AccountCoinsRequest{
 			NetworkIdentifier: &types.NetworkIdentifier{
-				Network: constants.FujiNetwork,
+				Network: constants.TestnetNetwork,
 				SubNetworkIdentifier: &types.SubNetworkIdentifier{
 					Network: constants.PChain.String(),
 				},
@@ -103,7 +103,7 @@ func TestAccountCoins(t *testing.T) {
 	t.Run("c-chain atomic request is delegated to c-chain atomic tx backend", func(t *testing.T) {
 		req := &types.AccountCoinsRequest{
 			NetworkIdentifier: &types.NetworkIdentifier{
-				Network: constants.FujiNetwork,
+				Network: constants.TestnetNetwork,
 			},
 			AccountIdentifier: &types.AccountIdentifier{
 				Address: "C-fuji15f9g0h5xkr5cp47n6u3qxj6yjtzzzrdr23a3tl",
@@ -125,7 +125,7 @@ func TestAccountCoins(t *testing.T) {
 	t.Run("c-chain regular request is not supported", func(t *testing.T) {
 		req := &types.AccountCoinsRequest{
 			NetworkIdentifier: &types.NetworkIdentifier{
-				Network: constants.FujiNetwork,
+				Network: constants.TestnetNetwork,
 			},
 			AccountIdentifier: &types.AccountIdentifier{
 				Address: "0x197E90f9FAD81970bA7976f33CbD77088E5D7cf7",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"mode": "online",`
`3`		`- "rpc_endpoint": "http://127.0.0.1:9650",`
	`3`	`+ "rpc_base_url": "http://127.0.0.1:9650",`
`4`	`4`	`"network_name": "testnet",`
`5`	`5`	`"genesis_block_hash": "0xc47d9c5d19d9cde5316780d1b0896ce2f20a0bc09c9ce2c86fbfafc0742b1e63",`
`6`	`6`	`"chain_id": 114`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`func TestShouldHandleRequest(t *testing.T) {`
`18`	`18`	`cChainNetworkIdentifier := &types.NetworkIdentifier{`
`19`	`19`	`Blockchain: service.BlockchainName,`
`20`		`- Network: constants.FujiNetwork,`
	`20`	`+ Network: constants.TestnetNetwork,`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`bech32AccountIdentifier := &types.AccountIdentifier{Address: "C-avax1us3us4s4mv0g85vxjm8va04ewdl27wcwnqwejf"}`