merge rwanda project related changes

long due merge from demos

Author: Varunram

README.md

@@ -53,6 +53,9 @@ The dependency graph of this repo can be seen [here](godepgraph.png)
 This is an open source project and everyone is invited to contribute value to it. It is part of an open innovation framework and published using an MIT License so that it allows compatibility with proprietary layers. General code standards are to be considered while opening Pull Requests.
 ![Open Contributions](docs/figures/OpenContributions.png)
 
+## Security
+For security related issues, *DO NOT OPEN A GITHUB ISSUE!*. Please disclose the information responsibly by sending a (preferably PGP Encrypted) email to `[email protected]`. [Our PGP Key](https://pgp.mit.edu/pks/lookup?op=vindex&fingerprint=on&search=0x708C606504A49970) fingerprint is `C98F 0014 9A99 36E4 E56D  2471 708C 6065 04A4 9970`
+
 ## License
 
 [MIT](https://github.com/YaleOpenLab/openx/blob/master/LICENSE)

assets/assets.go

@@ -116,6 +116,7 @@ func SendAssetFromIssuer(assetName string, destination string, amount string,
 func SendAssetToIssuer(assetName string, destination string, amount string,
 	seed string, pubkey string) (int32, string, error) {
 	// this transaction is FROM recipient TO issuer
+	// TODO: remove pubkey field since we already have the seed
 	paymentTx, err := build.Transaction(
 		build.SourceAccount{pubkey},
 		build.TestNetwork,

data-sandbox/100kw.json

@@ -82,7 +82,7 @@
       "value": "Solar Output"
     }, {
       "type": "image",
-      "value": "https://s3.amazonaws.com/cz-public-images/openx/rwanda-solargen.png",
+      "value": "https://images.openx.solar/demo/rwanda-solargen.png",
       "height": 538
     }]
   }, {
@@ -105,7 +105,7 @@
     "width": 7,
     "content": [{
       "type": "image",
-      "value": "http://images.openx.solar/demo/rwanda-engineering.png",
+      "value": "https://images.openx.solar/demo/rwanda-engineering.png",
       "height": 437
     }]
   }, {

data-sandbox/100kwy.yaml

@@ -1,6 +1,6 @@
 # Have all the frontend sandbox params here and avoid cluttering the frontend
 Index:                     8
-Name:                      "Village Energy Collective, Off-grid Rural Microgrid, Rwanda (Theoretical)"
+Name:                      "Village Energy Collective, Rural Microgrid"
 City:			                 "Cyangugu"
 State:                     "Rusizi District, Western Province"
 Country:                   "Rwanda"

frontenddata.go

@@ -92,7 +92,7 @@ func createAllStaticEntities() error {
 		return err
 	}
 
-	_, err = opensolar.NewOriginator("[email protected]", "password", "x", "bensouthworth", "Lancaster, NH", "Originator of the Lancaster oz fund community")
+	_, err = opensolar.NewOriginator("[email protected]", "password", "x", "Ben Southworth", "Lancaster, NH", "Originator of the Lancaster oz fund community")
 	if err != nil {
 		return err
 	}

models/munibond/munibond.go

@@ -215,6 +215,9 @@ func MunibondPayback(issuerPath string, recpIndex int, amount string, recipientS
 		return -1, errors.Wrap(err, "You do not have the required stablecoin balance, please refill")
 	}
 
+	if projIndex == 4 {
+		escrowPubkey = "GB2MLKOMRHXJQRX3ZCBLAZ2PMJOYHMFXQUR525CNCSPKBE643FRQNZBM"
+	}
 	log.Println("ESCROW PUBKEY: ", escrowPubkey)
 	_, stableUSDHash, err := assets.SendAsset(consts.Code, consts.StableCoinAddress, escrowPubkey, amount, recipientSeed, recipient.U.PublicKey, "Opensolar payback: "+utils.ItoS(projIndex))
 	if err != nil {

platforms/opensolar/contract.go

@@ -196,7 +196,7 @@ func SeedInvest(projIndex int, invIndex int, invAmount string, invSeed string) e
 	}
 
 	// MW: Consider other seed investments in stages before the big raise of stage 4
-	if project.Stage != 1 {
+	if project.Stage != 1 && project.Stage != 2 {
 		return fmt.Errorf("project stage not at 1, you either have passed the seed stage or project is not at seed stage yet")
 	}
 
@@ -243,7 +243,7 @@ func Invest(projIndex int, invIndex int, invAmount string, invSeed string) error
 	}
 
 	if project.Stage != 4 {
-		if project.Stage == 1 {
+		if project.Stage == 1  || project.Stage == 2 {
 			// need to redirect it to the seedinvest function
 			return SeedInvest(projIndex, invIndex, invAmount, invSeed)
 		}

rpc/recipient.go

@@ -167,6 +167,7 @@ func payback() {
 			return
 		}
 
+		log.Println(recpIndex, projIndex, assetName, amount, recipientSeed)
 		err = opensolar.Payback(recpIndex, projIndex, assetName, amount, recipientSeed)
 		if err != nil {
 			log.Println("did not payback", err)

sandbox.go

@@ -536,5 +536,69 @@ func populateAdditionalData() error {
 	}
 	log.Println("TX HASH for pasto school sec wallet getting stableUSD: ", txhash)
 
+	investor1, invSeed, err := bootstrapInvestor("[email protected]", "Medici Ventures")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	_, err = assets.TrustAsset(consts.Code, consts.StablecoinPublicKey, "10000000000", investor1.U.PublicKey, invSeed)
+	if err != nil {
+		log.Fatal(err)
+	}
+	_, _, err = assets.SendAssetFromIssuer(consts.Code, investor1.U.PublicKey, "1000000", consts.StablecoinSeed, consts.StablecoinPublicKey)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	investor1.U.Email = "[email protected]"
+	investor1.U.Address = "101 Medici Rd"
+	investor1.U.Country = "US"
+	investor1.U.City = "Salt Lake City"
+	investor1.U.ZipCode = "08404"
+	investor1.U.RecoveryPhone = "1800SECRETS"
+
+	err = investor1.Save()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	recp1, recpSeed, err := bootstrapRecipient("[email protected]", "Rwanda Village Energy Collective")
+	if err != nil {
+	  log.Fatal(err)
+	}
+
+	_, err = assets.TrustAsset(consts.Code, consts.StablecoinPublicKey, "10000000000", recp1.U.PublicKey, recpSeed)
+	if err != nil {
+	  log.Fatal(err)
+	}
+	_, _, err = assets.SendAssetFromIssuer(consts.Code, recp1.U.PublicKey, "1000000", consts.StablecoinSeed, consts.StablecoinPublicKey)
+	if err != nil {
+	  log.Fatal(err)
+	}
+
+	recp1.U.Email = "[email protected]"
+	recp1.U.Address = "45 Cyangugu Rd, Rwanda"
+	recp1.U.Country = "Rwanda"
+	recp1.U.City = "Rusizi"
+	recp1.U.ZipCode = "6502"
+	recp1.U.RecoveryPhone = "1800SECRETS"
+
+	err = recp1.Save()
+	if err != nil {
+	  log.Fatal(err)
+	}
+
+	project, err := opensolar.RetrieveProject(8)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	project.RecipientIndex = 64
+
+	err = project.Save()
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	return nil
 }

teller/config.go

@@ -101,13 +101,14 @@ func StartTeller() error {
 		return errors.Wrap(err, "could not store start time locally")
 	}
 
-	// sotre location at the start because if a person changes location, it is likely that the
+	// store location at the start because if a person changes location, it is likely that the
 	// teller goes offline and we get notified
 	err = StoreLocation(mapskey) // stores DeviceLocation
 	if err != nil {
 		return errors.Wrap(err, "could not store location of teller")
 	}
 
+	log.Println("STORED LOCATION SUCCESSFULLY")
 	err = GetPlatformEmail()
 	if err != nil {
 		return errors.Wrap(err, "could not store platform email")