woggioni-opencode-agent/bee-dashboard
1
0
Fork 0
Code Actions Packages Releases Activity

fix: all wallet flows to use ethers (#395)

Browse Source 
* fix: all wallet flows to use only ethers libraries

* feat: remove ethereumjs-wallet

* fix: remove the buggy `/wallet` bee call and use provider
This commit is contained in:
Vojtech Simetka
2022-06-18 21:50:51 +02:00
committed by GitHub
parent caea5ae309
commit 80d684c1e5
15 changed files with 121 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/identity.ts
+9 -26
View File
@@ -1,14 +1,10 @@
import { BatchId, Bee, BeeDebug, Reference } from '@ethersphere/bee-js'
import Wallet from 'ethereumjs-wallet'
import { Wallet } from 'ethers'
import { uuidV4, waitUntilStampUsable } from '.'
import { Identity, IdentityType } from '../providers/Feeds'
export function generateWallet(): Wallet {
const buffer = new Uint8Array(32)
crypto.getRandomValues(buffer)
const wallet = new Wallet(Buffer.from(buffer))
return wallet
return Wallet.createRandom()
}
export function persistIdentity(identities: Identity[], identity: Identity): void {
@@ -35,14 +31,13 @@ export async function convertWalletToIdentity(
throw Error('V3 passwords require password')
}
const identityString =
type === 'PRIVATE_KEY' ? identity.getPrivateKeyString() : await identity.toV3String(password as string)
const identityString = type === 'PRIVATE_KEY' ? identity.privateKey : await identity.encrypt(password as string)
return {
uuid: uuidV4(),
name,
type: password ? 'V3' : 'PRIVATE_KEY',
address: identity.getAddressString(),
address: identity.address,
identity: identityString,
}
}
@@ -56,14 +51,14 @@ export async function importIdentity(name: string, data: string): Promise<Identi
name,
type: 'PRIVATE_KEY',
identity: data,
address: wallet.getAddressString(),
address: wallet.address,
}
}
if (data.length === 66 && data.toLowerCase().startsWith('0x')) {
const wallet = await getWallet('PRIVATE_KEY', data.slice(2))
return { uuid: uuidV4(), name, type: 'PRIVATE_KEY', identity: data, address: wallet.getAddressString() }
return { uuid: uuidV4(), name, type: 'PRIVATE_KEY', identity: data, address: wallet.address }
}
try {
const { address } = JSON.parse(data)
@@ -79,11 +74,7 @@ function getWalletFromIdentity(identity: Identity, password?: string): Promise<W
}
async function getWallet(type: IdentityType, data: string, password?: string): Promise<Wallet> {
return type === 'PRIVATE_KEY' ? getWalletFromPrivateKeyString(data) : await Wallet.fromV3(data, password as string)
}
export function getWalletFromPrivateKeyString(privateKey: string): Wallet {
return Wallet.fromPrivateKey(Buffer.from(trimHexString(privateKey), 'hex'))
return type === 'PRIVATE_KEY' ? new Wallet(data) : await Wallet.fromEncryptedJson(data, password as string)
}
export async function updateFeed(
@@ -97,21 +88,13 @@ export async function updateFeed(
const wallet = await getWalletFromIdentity(identity, password)
if (!identity.feedHash) {
identity.feedHash = await beeApi.createFeedManifest(stamp, 'sequence', '00'.repeat(32), wallet.getAddressString())
identity.feedHash = await beeApi.createFeedManifest(stamp, 'sequence', '00'.repeat(32), wallet.address)
}
const writer = beeApi.makeFeedWriter('sequence', '00'.repeat(32), wallet.getPrivateKeyString())
const writer = beeApi.makeFeedWriter('sequence', '00'.repeat(32), wallet.privateKey)
if (beeDebugApi) {
await waitUntilStampUsable(stamp as BatchId, beeDebugApi)
}
await writer.upload(stamp, hash as Reference)
}
function trimHexString(string: string): string {
if (string.toLowerCase().startsWith('0x')) {
return string.slice(2)
}
return string
}
src/utils/rpc.ts
+7 -33
View File
@@ -1,45 +1,20 @@
import { debounce } from '@material-ui/core'
import axios from 'axios'
import { Contract, providers, Wallet } from 'ethers'
import { bzzContractInterface } from './bzz-contract-interface'
export const JSON_RPC_PROVIDER = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7'
async function eth_getBalance(address: string): Promise<string> {
async function eth_getBalance(address: string, provider: providers.JsonRpcProvider): Promise<string> {
if (!address.startsWith('0x')) {
address = `0x${address}`
}
const response = await axios(JSON_RPC_PROVIDER, {
method: 'POST',
headers: {
'content-type': 'application/json',
},
data: {
jsonrpc: '2.0',
method: 'eth_getBalance',
params: [address, 'latest'],
id: 1,
},
})
const balance = await provider.getBalance(address)
return response.data.result
return balance.toString()
}
async function eth_getBlockByNumber(provider = JSON_RPC_PROVIDER): Promise<string> {
const response = await axios(provider, {
method: 'POST',
headers: {
'content-type': 'application/json',
},
data: {
jsonrpc: '2.0',
method: 'eth_getBlockByNumber',
params: ['latest', false],
id: 1,
},
})
async function eth_getBlockByNumber(provider: providers.JsonRpcProvider): Promise<string> {
const blockNumber = await provider.getBlockNumber()
return response.data.result
return blockNumber.toString()
}
const partialERC20tokenABI = [
@@ -63,10 +38,9 @@ const partialERC20tokenABI = [
},
]
const provider = new providers.JsonRpcProvider(JSON_RPC_PROVIDER)
async function eth_getBalanceERC20(
address: string,
provider: providers.JsonRpcProvider,
tokenAddress = '0xdbf3ea6f5bee45c02255b2c26a16f300502f68da',
): Promise<string> {
if (!address.startsWith('0x')) {
src/utils/wallet.ts
+30 -24
View File
@@ -1,23 +1,27 @@
import Wallet from 'ethereumjs-wallet'
import { providers, Wallet } from 'ethers'
import { sleepMs } from '.'
import { BzzToken } from '../models/BzzToken'
import { DaiToken } from '../models/DaiToken'
import { getWalletFromPrivateKeyString } from './identity'
import { Rpc } from './rpc'
export class WalletAddress {
private constructor(public address: string, public bzz: BzzToken, public dai: DaiToken) {}
private constructor(
public address: string,
public bzz: BzzToken,
public dai: DaiToken,
public provider: providers.JsonRpcProvider,
) {}
static async make(address: string): Promise<WalletAddress> {
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address))
const dai = new DaiToken(await Rpc._eth_getBalance(address))
static async make(address: string, provider: providers.JsonRpcProvider): Promise<WalletAddress> {
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address, provider))
const dai = new DaiToken(await Rpc._eth_getBalance(address, provider))
return new WalletAddress(address, bzz, dai)
return new WalletAddress(address, bzz, dai, provider)
}
public async refresh(): Promise<WalletAddress> {
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address))
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address))
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address, this.provider))
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address, this.provider))
return this
}
@@ -27,32 +31,34 @@ export class ResolvedWallet {
public address: string
public privateKey: string
private constructor(public wallet: Wallet, public bzz: BzzToken, public dai: DaiToken) {
this.address = wallet.getAddressString()
this.privateKey = wallet.getPrivateKeyString()
private constructor(
public wallet: Wallet,
public bzz: BzzToken,
public dai: DaiToken,
public provider: providers.JsonRpcProvider,
) {
this.address = wallet.address
this.privateKey = wallet.privateKey
}
static async make(privateKeyOrWallet: string | Wallet): Promise<ResolvedWallet> {
static async make(privateKeyOrWallet: string | Wallet, provider: providers.JsonRpcProvider): Promise<ResolvedWallet> {
const wallet =
typeof privateKeyOrWallet === 'string' ? getWalletFromPrivateKeyString(privateKeyOrWallet) : privateKeyOrWallet
const address = wallet.getAddressString()
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address))
const dai = new DaiToken(await Rpc._eth_getBalance(address))
typeof privateKeyOrWallet === 'string' ? new Wallet(privateKeyOrWallet, provider) : privateKeyOrWallet
const address = wallet.address
const bzz = new BzzToken(await Rpc._eth_getBalanceERC20(address, provider))
const dai = new DaiToken(await Rpc._eth_getBalance(address, provider))
return new ResolvedWallet(wallet, bzz, dai)
return new ResolvedWallet(wallet, bzz, dai, provider)
}
public async refresh(): Promise<ResolvedWallet> {
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address))
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address))
this.bzz = new BzzToken(await Rpc._eth_getBalanceERC20(this.address, this.provider))
this.dai = new DaiToken(await Rpc._eth_getBalance(this.address, this.provider))
return this
}
public async transfer(
destination: string,
jsonRpcProvider = 'https://gno.getblock.io/mainnet/?api_key=d7b92d96-9784-49a8-a800-b3edd1647fc7',
): Promise<void> {
public async transfer(destination: string, jsonRpcProvider: string): Promise<void> {
const DUMMY_GAS_PRICE = '300000000000000'
if (this.bzz.toDecimal.gt(0.1)) {