Apply updates from core

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@initia/initia.js",
-  "version": "0.2.24",
+  "version": "0.2.25",
   "description": "The JavaScript SDK for Initia",
   "license": "Apache-2.0",
   "author": "Initia Foundation",
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
-    "@initia/initia.proto": "^0.2.4",
+    "@initia/initia.proto": "^0.2.5",
     "@initia/opinit.proto": "^0.0.11",
     "@ledgerhq/hw-transport": "^6.31.4",
     "@ledgerhq/hw-transport-webhid": "^6.29.4",

src/client/rest/api/EvmAPI.ts

@@ -55,6 +55,17 @@ export class EvmAPI extends BaseAPI {
       .then((d) => d.address)
   }
 
+  /**
+   * Query the ERC20Wrapper contract address.
+   */
+  public async erc20Wrapper(params: APIParams = {}): Promise<string> {
+    return this.c
+      .get<{
+        address: string
+      }>(`/minievm/evm/v1/contracts/erc20_wrapper`, params)
+      .then((d) => d.address)
+  }
+
   /**
    * Query the contract address by denom.
    * @param denom denom to look up

src/client/rest/api/TxAPI.ts

@@ -11,6 +11,8 @@ import {
   num,
   TxLog,
   Event,
+  Denom,
+  Coin,
 } from '../../../core'
 import { hashToHex } from '../../../util'
 import { RESTClient } from '../RESTClient'
@@ -609,4 +611,24 @@ export class TxAPI extends BaseAPI {
 
     return targetEvents
   }
+
+  /**
+   * Query the gas prices for the network.
+   */
+  public async gasPrices(params: APIParams = {}): Promise<Coins> {
+    return this.c
+      .get<{ gas_prices: Coins.Data }>(`/initia/tx/v1/gas_prices`, params)
+      .then((d) => Coins.fromData(d.gas_prices))
+  }
+
+  /**
+   * Query the gas price of a denom for the network.
+   */
+  public async gasPrice(denom: Denom, params: APIParams = {}): Promise<Coin> {
+    return this.c
+      .get<{
+        gas_price: Coin.Data
+      }>(`/initia/tx/v1/gas_prices/${denom}`, params)
+      .then((d) => Coin.fromData(d.gas_price))
+  }
 }

src/core/evm/AccessTuple.ts

@@ -0,0 +1,69 @@
+import { JSONSerializable } from '../../util/json'
+import { AccAddress } from '../bech32'
+import { AccessTuple as AccessTuple_pb } from '@initia/initia.proto/minievm/evm/v1/types'
+
+/**
+ * AccessTuple is the tuple for address and storage keys.
+ */
+export class AccessTuple extends JSONSerializable<
+  AccessTuple.Amino,
+  AccessTuple.Data,
+  AccessTuple.Proto
+> {
+  /**
+   * @param address address of the contract that will be accessed during the transaction execution
+   * @param storage_keys list of storage keys that the transaction will interact with within the specified contract
+   */
+  constructor(
+    public address: AccAddress,
+    public storage_keys: string[]
+  ) {
+    super()
+  }
+
+  public static fromAmino(data: AccessTuple.Amino): AccessTuple {
+    const { address, storage_keys } = data
+    return new AccessTuple(address, storage_keys)
+  }
+
+  public toAmino(): AccessTuple.Amino {
+    const { address, storage_keys } = this
+    return { address, storage_keys }
+  }
+
+  public static fromData(data: AccessTuple.Data): AccessTuple {
+    const { address, storage_keys } = data
+    return new AccessTuple(address, storage_keys)
+  }
+
+  public toData(): AccessTuple.Data {
+    const { address, storage_keys } = this
+    return { address, storage_keys }
+  }
+
+  public static fromProto(data: AccessTuple.Proto): AccessTuple {
+    return new AccessTuple(data.address, data.storageKeys)
+  }
+
+  public toProto(): AccessTuple.Proto {
+    const { address, storage_keys } = this
+    return AccessTuple_pb.fromPartial({
+      address,
+      storageKeys: storage_keys,
+    })
+  }
+}
+
+export namespace AccessTuple {
+  export interface Amino {
+    address: AccAddress
+    storage_keys: string[]
+  }
+
+  export interface Data {
+    address: AccAddress
+    storage_keys: string[]
+  }
+
+  export type Proto = AccessTuple_pb
+}

src/core/evm/EvmParams.ts

@@ -15,13 +15,17 @@ export class EvmParams extends JSONSerializable<
    * @param allow_custom_erc20 whether the chain allows custom erc20 tokens to be registered on cosmos bank interface
    * @param allowed_custom_erc20s
    * @param fee_denom the fee denom for the evm transactions
+   * @param gas_refund_ratio the gas refund ratio for the evm transactions; 0 to disable
+   * @param num_retain_block_hashes the number of block hashes to retain for the evm opcode `BLOCKHASH`; minimum 256 and 0 to disable
    */
   constructor(
     public extra_eips: number[],
     public allowed_publishers: string[],
     public allow_custom_erc20: boolean,
     public allowed_custom_erc20s: string[],
-    public fee_denom: string
+    public fee_denom: string,
+    public gas_refund_ratio: string,
+    public num_retain_block_hashes: number
   ) {
     super()
   }
@@ -33,13 +37,18 @@ export class EvmParams extends JSONSerializable<
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes,
     } = data
+
     return new EvmParams(
       extra_eips.map(parseInt),
       allowed_publishers,
       allow_custom_erc20,
       allowed_custom_erc20s,
-      fee_denom
+      fee_denom,
+      gas_refund_ratio,
+      parseInt(num_retain_block_hashes)
     )
   }
 
@@ -50,13 +59,18 @@ export class EvmParams extends JSONSerializable<
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes,
     } = this
+
     return {
       extra_eips: extra_eips.map((eip) => eip.toFixed()),
       allowed_publishers,
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes: num_retain_block_hashes.toFixed(),
     }
   }
 
@@ -67,13 +81,18 @@ export class EvmParams extends JSONSerializable<
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes,
     } = data
+
     return new EvmParams(
       extra_eips.map(parseInt),
       allowed_publishers,
       allow_custom_erc20,
       allowed_custom_erc20s,
-      fee_denom
+      fee_denom,
+      gas_refund_ratio,
+      parseInt(num_retain_block_hashes)
     )
   }
 
@@ -84,13 +103,18 @@ export class EvmParams extends JSONSerializable<
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes,
     } = this
+
     return {
       extra_eips: extra_eips.map((eip) => eip.toFixed()),
       allowed_publishers,
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes: num_retain_block_hashes.toFixed(),
     }
   }
 
@@ -100,7 +124,9 @@ export class EvmParams extends JSONSerializable<
       proto.allowedPublishers,
       proto.allowCustomErc20,
       proto.allowedCustomErc20s,
-      proto.feeDenom
+      proto.feeDenom,
+      proto.gasRefundRatio,
+      Number(proto.numRetainBlockHashes)
     )
   }
 
@@ -111,13 +137,18 @@ export class EvmParams extends JSONSerializable<
       allow_custom_erc20,
       allowed_custom_erc20s,
       fee_denom,
+      gas_refund_ratio,
+      num_retain_block_hashes,
     } = this
+
     return Params_pb.fromPartial({
       extraEips: extra_eips.map((eip) => BigInt(eip)),
       allowedPublishers: allowed_publishers,
       allowCustomErc20: allow_custom_erc20,
       allowedCustomErc20s: allowed_custom_erc20s,
       feeDenom: fee_denom,
+      gasRefundRatio: gas_refund_ratio,
+      numRetainBlockHashes: BigInt(num_retain_block_hashes),
     })
   }
 }
@@ -129,6 +160,8 @@ export namespace EvmParams {
     allow_custom_erc20: boolean
     allowed_custom_erc20s: string[]
     fee_denom: string
+    gas_refund_ratio: string
+    num_retain_block_hashes: string
   }
 
   export interface Data {
@@ -137,6 +170,8 @@ export namespace EvmParams {
     allow_custom_erc20: boolean
     allowed_custom_erc20s: string[]
     fee_denom: string
+    gas_refund_ratio: string
+    num_retain_block_hashes: string
   }
 
   export type Proto = Params_pb

src/core/evm/index.ts

@@ -1,2 +1,3 @@
 export * from './msgs'
 export * from './EvmParams'
+export * from './AccessTuple'