Ja/fix typo (#66)

* Fix typo

* use types from npm barrentenberg

* fix element yield

* add missing provider

Author: Joe Andrews

package.json

@@ -30,7 +30,7 @@
     "rootDir": "./src"
   },
   "name": "@aztec/bridge-clients",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "description": "This repo contains the solidity files and typescript helper class for all of the Aztec Connect Bridge Contracts",
   "repository": "[email protected]:AztecProtocol/aztec-connect-bridges.git",
   "license": "MIT",

src/client/aztec/provider/web3_provider.ts

@@ -1,4 +1,4 @@
 import { Web3Provider } from '@ethersproject/providers';
-import { EthereumProvider } from './ethereum_provider';
+import { EthereumProvider } from '@aztec/barretenberg/blockchain';
 
 export const createWeb3Provider = (ethereumProvider: EthereumProvider) => new Web3Provider(ethereumProvider);

src/client/element/element-bridge-data.test.ts

@@ -221,13 +221,13 @@ describe('element bridge data', () => {
     expect(expiration).toBe(BigInt(endDate));
   });
 
-  it('should return the correct yearly output of the tranche', async () => {
+  it('should return the correct yield of the tranche', async () => {
     const now = Math.floor(Date.now() / 1000);
     const expiry = BigInt(now + 86400 * 30);
     const trancheAddress = '0x90ca5cef5b29342b229fb8ae2db5d8f4f894d652';
     const poolId = '0x90ca5cef5b29342b229fb8ae2db5d8f4f894d6520002000000000000000000b5';
-    const interest = 100000n;
-    const inputValue = 10e18,
+    const interest = BigInt(1e16);
+    const inputValue = BigInt(10e18),
       elementBridge = {
         hashAssetAndExpiry: jest.fn().mockResolvedValue('0xa'),
         pools: jest.fn().mockResolvedValue([trancheAddress, '', poolId]),
@@ -240,9 +240,7 @@ describe('element bridge data', () => {
     balancerContract = {
       ...balancerContract,
       queryBatchSwap: jest.fn().mockImplementation((...args) => {
-        const amount = args[1][0].amount;
-
-        return Promise.resolve([BigNumber.from(BigInt(amount)), BigNumber.from(-BigInt(BigInt(amount) + interest))]);
+        return Promise.resolve([BigNumber.from(inputValue), BigNumber.from(-BigInt(inputValue + interest))]);
       }),
     };
 
@@ -279,8 +277,11 @@ describe('element bridge data', () => {
     const timeToExpiration = expiry - BigInt(now);
     const scaledOut = (BigInt(interest) * elementBridgeData.scalingFactor) / timeToExpiration;
     const yearlyOut = (scaledOut * BigInt(YEAR)) / elementBridgeData.scalingFactor;
+    const scaledPercentage = (yearlyOut * elementBridgeData.scalingFactor) / inputValue;
+    const percentage2sf = scaledPercentage / (elementBridgeData.scalingFactor / 10000n);
+    const percent = Number(percentage2sf) / 100;
 
-    expect(output[0]).toBe(Number((BigInt(inputValue) / (yearlyOut + BigInt(inputValue))) * 100n));
+    expect(output[0]).toBe(percent);
   });
 
   it('should return the correct market size for a given tranche', async () => {

src/client/element/element-bridge-data.ts

@@ -318,8 +318,10 @@ export class ElementBridgeData implements BridgeDataFieldGetters {
     const interest = -outputAssetAValue.toBigInt() - precision;
     const scaledOutput = divide(interest, timeToExpiration, this.scalingFactor);
     const yearlyOutput = (scaledOutput * YEAR) / this.scalingFactor;
+    const percentageScaled = divide(yearlyOutput, precision, this.scalingFactor);
+    const percentage2sf = (percentageScaled * 10000n) / this.scalingFactor;
 
-    return [Number((precision * this.scalingFactor) / (yearlyOutput + precision) / this.scalingFactor / 10000n) / 100];
+    return [Number(percentage2sf) / 100];
   }
 
   async getMarketSize(