updates for mainnet going live

core/state_transition.go

@@ -820,11 +820,14 @@ func (st *StateTransition) handleFsnCall(param *common.FSNCallParam) error {
 			}
 		}
 
+		swapDeleted := "false"
+
 		if swap.SwapSize.Cmp(takeSwapParam.Size) == 0 {
 			if err := st.state.RemoveSwap(swap.ID); err != nil {
 				st.addLog(common.TakeSwapFunc, takeSwapParam, common.NewKeyValue("Error", "System Error"))
 				return err
 			}
+			swapDeleted = "true"
 		} else {
 			swap.SwapSize = swap.SwapSize.Sub(swap.SwapSize, takeSwapParam.Size)
 			if err := st.state.UpdateSwap(swap); err != nil {
@@ -867,7 +870,7 @@ func (st *StateTransition) handleFsnCall(param *common.FSNCallParam) error {
 				// st.state.SubTimeLockBalance(swap.Owner, swap.FromAssetID, fromNeedValue)
 			}
 		}
-		st.addLog(common.TakeSwapFunc, takeSwapParam, common.NewKeyValue("SwapID", swap.ID))
+		st.addLog(common.TakeSwapFunc, takeSwapParam, common.NewKeyValue("SwapID", swap.ID), common.NewKeyValue("Deleted", swapDeleted))
 		return nil
 	case common.RecallMultiSwapFunc:
 		outputCommandInfo("RecallMultiSwapFunc", "from", st.msg.From())

core/vm/runtime/runtime.go

@@ -52,7 +52,7 @@ type Config struct {
 func setDefaults(cfg *Config) {
 	if cfg.ChainConfig == nil {
 		cfg.ChainConfig = &params.ChainConfig{
-			ChainID:        big.NewInt(88664),
+			ChainID:        big.NewInt(32659),
 			HomesteadBlock: new(big.Int),
 			DAOForkBlock:   new(big.Int),
 			DAOForkSupport: false,

eth/config.go

@@ -43,7 +43,7 @@ var DefaultConfig = Config{
 		DatasetsInMem:  1,
 		DatasetsOnDisk: 2,
 	},
-	NetworkId:     55,
+	NetworkId:     32659,
 	LightPeers:    100,
 	DatabaseCache: 768,
 	TrieCache:     256,

genesis.json

@@ -1,6 +1,6 @@
 {
 	"config": {
-	  "chainId": 88664,
+	  "chainId": 32659,
 	  "homesteadBlock": 0,
 	  "daoForkBlock": 0,
 	  "daoForkSupport": false,
@@ -15,11 +15,11 @@
 	},
 	"ticketsCreate" : {
 			"owner" : "0xd2452651834e8f0c19c9d85e0bf09fe99283dabc",
-			"time"	:	1561463215,
+			"time"	:	1561852800,
 			"count" : 1
 	  },
 	"nonce": "0x0",
-	"timestamp": "0x5d1209af",
+	"timestamp": "0x5d17fb80",
 	"extraData": "0x00000000000000000000000000000000000000000000000000000000000000000000000000010000000001020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 	"gasLimit": "0x47b760",
 	"difficulty": "0x1",
@@ -31,7 +31,7 @@
 	"alloc": {
 		"0x8e6bDa71f3f0F49dDD29969De79aFCFac4457379" : { "balance" : "0x0000000000000000000000000000000000000000002f59bc6d43683a40400000" },
 
-		"0x0Ac469cf34C4d65515E4eF27eAF0F71F15C5A2fd" : { "balance" : "0x000000000000000000000000000000000000000000004633bc36cbc2dc000000" },
+		"0x0Ac469cf34C4d65515E4eF27eAF0F71F15C5A2fd" : { "balance" : "0x0000000000000000000000000000000000000000000004633bc36cbc2dc00000" },
 
 		"0xd2452651834e8f0c19c9d85e0bf09fe99283dabc" : { "balance" : "0x00000000000000000000000000000000000000000000021e19e0c9bab2400000" },
 		"0x7da669ea4234473e224a8f5a5f6257729e6f03cd" : { "balance" : "0x00000000000000000000000000000000000000000000021e19e0c9bab2400000" },

genesisMainnetAccountsDescription.txt

@@ -5,7 +5,6 @@
     TOTAL  100720 FSN to be deducted from 57344000 =  57243280
 
     Foundation will start with 57243280 FSN
-
 
 FusionMainnetTokens  0x8e6bDa71f3f0F49dDD29969De79aFCFac4457379 57243280 00000000000000000 0x2f59bc6d43683a40400000    // web3.toHex( web3.toWei( "57243280", "ether") )
 
@@ -21,15 +20,12 @@ Miner7  0xc4a9441afb052cb454240136cce71fb09316ea94    10000 00000000000000000000
 Miner8  0xfa37b7c3f21060458361ed5322be5af3740bce3c    10000 00000000000000000000 (0x21e19e0c9bab2400000)    //  web3.toHex( web3.toWei( "10000", "ether") )
 
 
--- THE USAN GENERATOR IS CREDIT WITH 110 000 TO GENERATE FOUNDATION USANs
+-- THE USAN GENERATOR IS CREDITED WITH 20720 TO GENERATE FOUNDATION USANs
 USAN GENERATOR   0x0Ac469cf34C4d65515E4eF27eAF0F71F15C5A2fd 20720 000000000000000000 0x4633bc36cbc2dc00000 web3.toHex( web3.toWei( "20720", "ether") )
         012345678912345678
 
        .103600000000000000   * 100000
  10360.0000000000000000000   * 2 just in case of error during run
  20720.0000000000000000000   Total for usan generator
 
-The foundation will need to move 100720 Ethereum FSN (ERC-20) to the reserve account of the foundation
-
-during devinternal genesis.json for generator will have an extra zero to increase balance to send supply to others
-day of launch this will be removed
+The foundation will need to move 100720 Ethereum FSN (ERC-20) to the SwapIn reserve account of the foundation on June 30th, launch of mainnet

p2p/discover/udp.go

@@ -56,7 +56,7 @@ const (
 
 // RPC packet types
 const (
-	pingPacket = iota + 50 // zero is 'reserved'
+	pingPacket = iota + 40 // zero is 'reserved'
 	pongPacket
 	findnodePacket
 	neighborsPacket

p2p/discv5/net.go

@@ -830,7 +830,7 @@ const (
 
 	// Packet type events.
 	// These correspond to packet types in the UDP protocol.
-	pingPacket = iota + 50
+	pingPacket = iota + 40
 	pongPacket
 	findnodePacket
 	neighborsPacket
@@ -842,7 +842,7 @@ const (
 	// Non-packet events.
 	// Event values in this category are allocated outside
 	// the packet type range (packet types are encoded as a single byte).
-	pongTimeout nodeEvent = iota + 106
+	pongTimeout nodeEvent = iota + 60
 	pingTimeout
 	neighboursTimeout
 )

params/config.go

@@ -33,7 +33,7 @@ var (
 var (
 	// MainnetChainConfig is the chain parameters to run a node on the main network.
 	MainnetChainConfig = &ChainConfig{
-		ChainID:             big.NewInt(88664),
+		ChainID:             big.NewInt(32659),
 		HomesteadBlock:      big.NewInt(0),
 		DAOForkBlock:        big.NewInt(0),
 		DAOForkSupport:      false,

params/version.go

@@ -29,9 +29,9 @@ const (
 	// and put its version into the hundreds place
 	// so 16001 means ethereum VersionPath=16
 	// efsn patch = 001
-	VersionPatch = 16014 // Patch version component of the current release
+	VersionPatch = 16015 // Patch version component of the current release
 
-	VersionMeta = "unstable" // Version metadata to append to the version string
+	VersionMeta = "stable" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.