Upgrades proof-of-possession to use Ethereum address

.circleci/config.yml

@@ -6,7 +6,7 @@ geth-defaults: &geth-defaults
 
 rust-defaults: &rust-defaults
   docker:
-    - image: circleci/rust:1.36.0
+    - image: circleci/rust:1.37.0
 
 end-to-end-defaults: &end-to-end-defaults
   docker:
@@ -46,8 +46,8 @@ jobs:
           name: Setup Rust language
           command: |
             set -euo pipefail
-            rustup install 1.36.0
-            rustup default 1.36.0
+            rustup install 1.37.0
+            rustup default 1.37.0
       - run:
           name: Compile bls-zexe
           command: |
@@ -69,7 +69,7 @@ jobs:
           command: |
             set -euo pipefail
             export CELO_MONOREPO_DIR="$PWD"
-            git clone --depth 1 https://github.com/celo-org/celo-monorepo.git ${CELO_MONOREPO_DIR} -b master
+            git clone --depth 1 https://github.com/celo-org/celo-monorepo.git ${CELO_MONOREPO_DIR} -b kobigurk/pop_eth_address
             yarn install || yarn install
             # separate build to avoid ENOMEM in CI :(
             yarn build --scope @celo/utils

Dockerfile

@@ -16,7 +16,7 @@ FROM ubuntu:16.04 as rustbuilder
 RUN apt update && apt install -y curl musl-tools
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH=$PATH:~/.cargo/bin
-RUN $HOME/.cargo/bin/rustup install 1.36.0 && $HOME/.cargo/bin/rustup default 1.36.0 && $HOME/.cargo/bin/rustup target add x86_64-unknown-linux-musl
+RUN $HOME/.cargo/bin/rustup install 1.37.0 && $HOME/.cargo/bin/rustup default 1.37.0 && $HOME/.cargo/bin/rustup target add x86_64-unknown-linux-musl
 ADD ./vendor /go-ethereum/vendor
 RUN cd /go-ethereum/vendor/github.com/celo-org/bls-zexe/bls && $HOME/.cargo/bin/cargo build --target x86_64-unknown-linux-musl --release
 

Dockerfile.alltools

@@ -1,7 +1,7 @@
 FROM ubuntu:16.04 as rustbuilder
 RUN apt update && apt install -y curl musl-tools
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-RUN $HOME/.cargo/bin/rustup install 1.36.0 && $HOME/.cargo/bin/rustup default 1.36.0 && $HOME/.cargo/bin/rustup target add x86_64-unknown-linux-musl
+RUN $HOME/.cargo/bin/rustup install 1.37.0 && $HOME/.cargo/bin/rustup default 1.37.0 && $HOME/.cargo/bin/rustup target add x86_64-unknown-linux-musl
 ADD ./vendor /go-ethereum/vendor
 RUN cd /go-ethereum/vendor/github.com/celo-org/bls-zexe/bls && $HOME/.cargo/bin/cargo build --target x86_64-unknown-linux-musl --release
 

Dockerfile.android

@@ -26,8 +26,8 @@ ENV GOPATH=$HOME/go
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH=$PATH:$HOME/.cargo/bin
-RUN rustup install 1.36.0
-RUN rustup default 1.36.0
+RUN rustup install 1.37.0
+RUN rustup default 1.37.0
 RUN rustup target add aarch64-linux-android
 RUN rustup target add armv7-linux-androideabi
 RUN rustup target add i686-linux-android

Dockerfile.arm64

@@ -1,6 +1,6 @@
 # celohq/android-client
 
-FROM circleci/rust:1.36.0-buster
+FROM circleci/rust:1.37.0-buster
 
 USER root
 

accounts/keystore/keystore.go

@@ -374,7 +374,7 @@ func (ks *KeyStore) GenerateProofOfPossession(a accounts.Account) ([]byte, error
 	}
 	defer privateKey.Destroy()
 
-	signature, err := privateKey.SignPoP()
+	signature, err := privateKey.SignPoP(a.Address.Bytes())
 	if err != nil {
 		return nil, err
 	}

core/vm/contracts.go

@@ -601,25 +601,26 @@ func (c *proofOfPossession) Run(input []byte, caller common.Address, evm *EVM, g
 	//   publicKey: 48 bytes, representing the public key (defined as a const in bls package)
 	//   signature: 96 bytes, representing the signature (defined as a const in bls package)
 	// the total length of input required is the sum of these constants
-	if len(input) < blscrypto.PUBLICKEYBYTES+blscrypto.SIGNATUREBYTES {
+	if len(input) != common.AddressLength+blscrypto.PUBLICKEYBYTES+blscrypto.SIGNATUREBYTES {
 		return nil, gas, ErrInputLength
 	}
+	addressBytes := input[:common.AddressLength]
 
-	publicKeyBytes := input[:blscrypto.PUBLICKEYBYTES]
+	publicKeyBytes := input[common.AddressLength : common.AddressLength+blscrypto.PUBLICKEYBYTES]
 	publicKey, err := bls.DeserializePublicKey(publicKeyBytes)
 	if err != nil {
 		return nil, gas, err
 	}
 	defer publicKey.Destroy()
 
-	signatureBytes := input[blscrypto.PUBLICKEYBYTES : blscrypto.PUBLICKEYBYTES+blscrypto.SIGNATUREBYTES]
+	signatureBytes := input[common.AddressLength+blscrypto.PUBLICKEYBYTES : common.AddressLength+blscrypto.PUBLICKEYBYTES+blscrypto.SIGNATUREBYTES]
 	signature, err := bls.DeserializeSignature(signatureBytes)
 	if err != nil {
 		return nil, gas, err
 	}
 	defer signature.Destroy()
 
-	err = publicKey.VerifyPoP(signature)
+	err = publicKey.VerifyPoP(addressBytes, signature)
 	if err != nil {
 		return nil, gas, err
 	}

crypto/bls/bls_test.go

@@ -1,6 +1,7 @@
 package blscrypto
 
 import (
+	"encoding/hex"
 	"testing"
 
 	"github.com/celo-org/bls-zexe/go"
@@ -16,7 +17,8 @@ func TestECDSAToBLS(t *testing.T) {
 	publicKeyBLSBytes, _ := publicKeyBLS.Serialize()
 	t.Logf("public key: %x", publicKeyBLSBytes)
 
-	pop, _ := privateKeyBLS.SignPoP()
+	address, _ := hex.DecodeString("4f837096cd8578c1f14c9644692c444bbb614262")
+	pop, _ := privateKeyBLS.SignPoP(address)
 	popBytes, _ := pop.Serialize()
 	t.Logf("pop: %x", popBytes)
 }