Merge pull request #30 from sadoci/mainnet-no-dag

Metadium: set mainnet avocado block to 59,860,000

Author: jsong1230

Makefile

@@ -118,6 +118,7 @@ gmet-linux: etcd
 		docker build -t meta/builder:local			\
 			-f Dockerfile.metadium . &&			\
 		docker run -e HOME=/tmp --rm -v $(shell pwd):/data	\
+			-u $(shell id -u):$(shell id -g)		\
 			-w /data meta/builder:local			\
 			make USE_ROCKSDB=$(USE_ROCKSDB);		\
 	fi
@@ -127,7 +128,7 @@ rocksdb:
 else
 rocksdb:
 	@[ ! -e rocksdb/.git ] && git submodule update --init rocksdb;	\
-	cd $(ROCKSDB_DIR) && make -j8 static_lib;
+	cd $(ROCKSDB_DIR) && PORTABLE=1 make -j8 static_lib;
 endif
 
 etcd:

core/metadium_genesis.go

@@ -12298,7 +12298,8 @@ var (
     "constantinopleBlock": 11441000,
     "istanbulBlock": 11441000,
     "londonBlock": 51960000,
-    "muirGlacierBlock": 11441000 
+    "muirGlacierBlock": 11441000,
+    "avocadoBlock": 59860000
   },
   "difficulty": "0x1",
   "extraData": "0x4f757220766973696f6e20697320746f206372656174652061206672656520776f726c64207468726f7567682073656c662d736f7665726569676e206964656e746974792e202f205768656e204920646973636f7665722077686f204920616d2c2049276c6c20626520667265652e202d2d2052616c706820456c6c69736f6e2c20496e76697369626c65204d616e0a30783165633236316462636533636530303232366237393765333030626135363836336666363563313338323633623938313435646364393762346561336134633761386432303431346537613031383566333263633730386430633163393935613837376536633738373666353061626331336637373430623961633330376266",

params/config.go

@@ -156,7 +156,7 @@ var (
 		MuirGlacierBlock:    big.NewInt(11441000),
 		BerlinBlock:         big.NewInt(51960000),
 		LondonBlock:         big.NewInt(51960000),
-		AvocadoBlock:        big.NewInt(1_000_000_000_000),
+		AvocadoBlock:        big.NewInt(59_860_000),
 		Ethash:              new(EthashConfig),
 	}