bringing back the user model

Author: gmbronco

schema.graphql

@@ -157,11 +157,15 @@ type PriceRateProvider @entity(immutable: false) {
 
 type PoolShare @entity(immutable: false) {
   id: ID!
-  userAddress: Bytes!
+  userAddress: User!
   poolId: Pool!
   balance: BigDecimal!
 }
 
+type User @entity(immutable: true) {
+  id: ID!
+}
+
 type AmpUpdate @entity(immutable: true) {
   id: ID!
   poolId: Pool!
@@ -182,7 +186,7 @@ type Swap @entity(immutable: true) {
   tokenAmountIn: BigDecimal!
   tokenAmountOut: BigDecimal!
   poolId: Pool!
-  userAddress: Bytes!
+  userAddress: User!
   timestamp: Int!
   block: BigInt
   tx: Bytes!
@@ -199,7 +203,7 @@ type JoinExit @entity(immutable: true) {
   sender: Bytes!
   amounts: [BigDecimal!]!
   pool: Pool!
-  user: Bytes!
+  user: User!
   timestamp: Int!
   tx: Bytes!
   block: BigInt

src/mappings/helpers/misc.ts

@@ -1,5 +1,5 @@
 import { BigDecimal, Address, BigInt, Bytes } from '@graphprotocol/graph-ts';
-import { Pool, PoolToken, PoolShare, PriceRateProvider, Token, FXOracle } from '../../types/schema';
+import { Pool, PoolToken, PoolShare, PriceRateProvider, Token, User, FXOracle } from '../../types/schema';
 import { ERC20 } from '../../types/Vault/ERC20';
 import { Vault } from '../../types/Vault/Vault';
 import { ONE_BD, SWAP_IN, SWAP_OUT, VAULT_ADDRESS, ZERO_ADDRESS, ZERO_BD } from './constants';
@@ -77,10 +77,12 @@ export function getPoolShare(poolId: string, lpAddress: Address): PoolShare {
 }
 
 export function createPoolShareEntity(poolId: string, lpAddress: Address): PoolShare {
+  createUserEntity(lpAddress);
+
   let id = getPoolShareId(getPoolAddress(poolId), lpAddress);
   let poolShare = new PoolShare(id);
 
-  poolShare.userAddress = lpAddress;
+  poolShare.userAddress = lpAddress.toHex();
   poolShare.poolId = poolId;
   poolShare.balance = ZERO_BD;
   poolShare.save();
@@ -200,6 +202,14 @@ export function getTokenPriceId(
     .concat(block.toString());
 }
 
+export function createUserEntity(address: Address): void {
+  let addressHex = address.toHex();
+  if (User.load(addressHex) == null) {
+    let user = new User(addressHex);
+    user.save();
+  }
+}
+
 export function createToken(tokenAddress: Address): Token {
   let erc20token = ERC20.bind(tokenAddress);
   let token = new Token(tokenAddress.toHexString());

src/mappings/vault.ts

@@ -10,6 +10,7 @@ import {
   updateTokenBalances,
   bytesToAddress,
   getPoolShare,
+  createUserEntity,
 } from './helpers/misc';
 import { updatePoolWeights } from './helpers/weighted';
 import { SWAP_IN, SWAP_OUT, VAULT_ADDRESS, ZERO, ZERO_ADDRESS, ZERO_BD } from './helpers/constants';
@@ -83,7 +84,7 @@ function handlePoolJoined(event: PoolBalanceChanged): void {
   join.type = 'Join';
   join.amounts = joinAmounts;
   join.pool = event.params.poolId.toHexString();
-  join.user = event.params.liquidityProvider;
+  join.user = event.params.liquidityProvider.toHexString();
   join.timestamp = blockTimestamp;
   join.tx = transactionHash;
   join.block = event.block.number;
@@ -183,7 +184,7 @@ function handlePoolExited(event: PoolBalanceChanged): void {
   exit.type = 'Exit';
   exit.amounts = exitAmounts;
   exit.pool = event.params.poolId.toHexString();
-  exit.user = event.params.liquidityProvider;
+  exit.user = event.params.liquidityProvider.toHexString();
   exit.timestamp = blockTimestamp;
   exit.tx = transactionHash;
   exit.block = event.block.number;
@@ -220,6 +221,7 @@ function handlePoolExited(event: PoolBalanceChanged): void {
  ************** SWAPS ***************
  ************************************/
 export function handleSwapEvent(event: SwapEvent): void {
+  createUserEntity(event.transaction.from);
   let poolId = event.params.poolId;
 
   let pool = Pool.load(poolId.toHexString());
@@ -336,7 +338,7 @@ export function handleSwapEvent(event: SwapEvent): void {
   swap.tokenAmountOut = tokenAmountOut;
 
   swap.caller = event.transaction.from;
-  swap.userAddress = event.transaction.from;
+  swap.userAddress = event.transaction.from.toHex();
   swap.poolId = poolId.toHex();
 
   swap.timestamp = blockTimestamp;