Merge pull request #88 from ava-labs/networks

Ledger Fix + Networks

Author: patrick-ogrady

.gitignore

@@ -54,4 +54,3 @@ genesis.json
 *.test
 
 dist/
-networks/

README.md

@@ -512,11 +512,13 @@ _Can use this to get the current fee rate._
 ## Running the VM
 To build the VM (and `spaces-cli`), run `./scripts/build.sh`.
 
-### Joining the public beta
+### Joining the Spaces Demo
 If you'd like to become a validator on the demo, reach out to @\_patrickogrady on Twitter
 after you've joined the network and synced to tip. Please send a screenshot
 indicating you've done this successfully.
 
+You can find the genesis used for the Spaces Demo in `networks/42`.
+
 ### Running a local network
 [`scripts/run.sh`](scripts/run.sh) automatically installs [avalanchego](https://github.com/ava-labs/avalanchego), sets up a local network,
 and creates a `spacesvm` genesis file. To build and run E2E tests, you need to set the variable `E2E` before it: `E2E=true ./scripts/run.sh 1.7.4`

chain/crypto.go

@@ -10,6 +10,7 @@ import (
 )
 
 const (
+	vOffset      = 64
 	legacySigAdj = 27
 )
 
@@ -18,7 +19,7 @@ func Sign(dh []byte, priv *ecdsa.PrivateKey) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	sig[64] += legacySigAdj
+	sig[vOffset] += legacySigAdj
 	return sig, nil
 }
 
@@ -29,6 +30,10 @@ func DeriveSender(dh []byte, sig []byte) (*ecdsa.PublicKey, error) {
 	// Avoid modifying the signature in place in case it is used elsewhere
 	sigcpy := make([]byte, crypto.SignatureLength)
 	copy(sigcpy, sig)
-	sigcpy[64] -= legacySigAdj
+
+	// Support signers that don't apply offset (ex: ledger)
+	if sigcpy[vOffset] >= legacySigAdj {
+		sigcpy[vOffset] -= legacySigAdj
+	}
 	return crypto.SigToPub(dh, sigcpy)
 }

networks/42/allocations-42.json

@@ -0,0 +1,3 @@
+[
+  {"address":"0x6f0f6DA1852857d7789f68a28bba866671f3880D", "balance":9223372036854775807}
+]

networks/42/genesis-42.json

@@ -0,0 +1 @@
+{"magic":42,"baseTxUnits":1,"valueUnitSize":1024,"maxValueSize":204800,"valueExpiryDiscount":10,"claimLoadMultiplier":5,"minClaimFee":100,"spaceDesirabilityMultiplier":5,"spaceRenewalDiscount":10,"claimReward":2654208000,"claimExpiryUnits":100,"lotteryRewardMultipler":50,"minPrice":1,"lookbackWindow":60,"targetBlockRate":1,"targetBlockSize":225,"maxBlockSize":246,"blockCostEnabled":true,"customAllocation":[{"address":"0x6f0f6da1852857d7789f68a28bba866671f3880d","balance":9223372036854775807}],"airdropHash":"0xccbf8e430b30d08b5b3342208781c40b373d1b5885c1903828f367230a2568da","airdropUnits":10000}