Merge branch 'main' into feat/disable-feerefunder-fee

Author: NeverHappened

README.md

@@ -105,6 +105,8 @@ START_BLOCK_HEIGHT - how many blocks we wait before start first test
 NO_DOCKER - do not start cosmopark for tests
 NO_PRINT_VERSIONS - do not print contract versions in console
 DEBUG_SUBMIT_TX - log submitted txs to stdout
+WALLETS_SIGN_METHOD - use 'secp256k1' to sign messages using direct sign, 'eip191' to sign using ethereum like signature,
+'random' to pick method randomly each time you request for a new wallet
 ```
 
 ## Config

package.json

@@ -51,13 +51,14 @@
     "@cosmjs/cosmwasm-stargate": "^0.32.4",
     "@cosmjs/stargate": "0.32.4",
     "@cosmjs/tendermint-rpc": "^0.32.4",
-    "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#b33eea8fbae746f2eb238fa1fb54c878d8d977c3",
-    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#8e5baa16dcaa0da2f9a4c9125b3b0ddde44634a4",
+    "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#b9cbc1f31621584219f46a49783704c51e2f2abc",
+    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#74d630354411fd7d838642d51bd3bdfe7f0e0298",
     "@types/lodash": "^4.14.182",
     "axios": "1.6.0",
     "commander": "^10.0.0",
     "cosmjs-types": "^0.9.0",
     "date-fns": "^2.16.1",
+    "ethers": "^6.13.5",
     "express": "^4.18.2",
     "jest-extended": "^4.0.2",
     "lodash": "^4.17.21",
@@ -96,4 +97,4 @@
   "engines": {
     "node": ">=20.0"
   }
-}
+}

setup/scripts/2_init_genesis.sh

@@ -20,6 +20,9 @@ DEMO_MNEMONIC_3="obscure canal because tomorrow tribe sibling describe satoshi k
 RLY_MNEMONIC_1="alley afraid soup fall idea toss can goose become valve initial strong forward bright dish figure check leopard decide warfare hub unusual join cart"
 RLY_MNEMONIC_2="record gift you once hip style during joke field prize dust unique length more pencil transfer quit train device arrive energy sort steak upset"
 
+ETH_DEMO_1_ADDRESS="neutron165cyjk6ujhjy3cyxkj2wdqw3fj3k69kqkaqnrm"
+ETH_DEMO_2_ADDRESS="neutron1lx5vlcwz78zp4g24qne4mrsutvkkh5ffj674q5"
+ETH_DEMO_3_ADDRESS="neutron1m2arw2gnr5n3n0g2yg40y6qzj0lclw9jxuth9e"
 
 MASTER_CHAIN_DIR="${CHAIN_DIR}/node-1"
 
@@ -33,12 +36,15 @@ echo "$DEMO_MNEMONIC_2" | $BINARY keys add demowallet2 --home "$MASTER_CHAIN_DIR
 echo "$DEMO_MNEMONIC_3" | $BINARY keys add demowallet3 --home "$MASTER_CHAIN_DIR" --recover --keyring-backend=test
 echo "$RLY_MNEMONIC_1" | $BINARY keys add rly1 --home "$MASTER_CHAIN_DIR" --recover --keyring-backend=test
 echo "$RLY_MNEMONIC_2" | $BINARY keys add rly2 --home "$MASTER_CHAIN_DIR" --recover --keyring-backend=test
-#$BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show val1 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show val1 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show val2 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show demowallet1 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show demowallet2 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show demowallet3 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
+# eth like demo1, demo2, demo3 accounts
+$BINARY $GENESIS_PREFIX add-genesis-account $ETH_DEMO_1_ADDRESS "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
+$BINARY $GENESIS_PREFIX add-genesis-account $ETH_DEMO_2_ADDRESS "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
+$BINARY $GENESIS_PREFIX add-genesis-account $ETH_DEMO_3_ADDRESS "100000000000000$STAKEDENOM,100000000000000$IBCATOMDENOM,100000000000000$IBCUSDCDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show rly1 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY $GENESIS_PREFIX add-genesis-account "$($BINARY --home "$MASTER_CHAIN_DIR" keys show rly2 --keyring-backend test -a --home "$MASTER_CHAIN_DIR")" "100000000000000$STAKEDENOM"  --home "$MASTER_CHAIN_DIR"
 $BINARY gentx val1 "100000000$STAKEDENOM" --home "$MASTER_CHAIN_DIR" --chain-id "$CHAINID" --keyring-backend test

setup/scripts/4_update-config.sh

@@ -40,4 +40,5 @@ for i in `seq 1 ${NODES}`; do
   sed -i -e 's/enabled-unsafe-cors = false/enabled-unsafe-cors = true/g' "${CHAIN_DIR}/node-${i}/config/app.toml"
   sed -i -e 's/persistent_peers = ""/persistent_peers = "'"$NODE1@$PERSISTENT_PEER:$P2PPORT"'"/g' "${CHAIN_DIR}/node-${i}/config/config.toml"
   sed -i -e 's/allow_duplicate_ip = false/allow_duplicate_ip = true/g' "${CHAIN_DIR}/node-${i}/config/config.toml"
+  sed -i -e 's#cors_allowed_origins = \[\]#cors_allowed_origins = ["*"]#g' "${CHAIN_DIR}/node-${i}/config/config.toml"
 done;

src/config.json

@@ -1,5 +1,6 @@
 {
   "VAL_MNEMONIC_1": "clock post desk civil pottery foster expand merit dash seminar song memory figure uniform spice circle try happy obvious trash crime hybrid hood cushion",
+  "VAL_MNEMONIC_2": "angry twist harsh drastic left brass behave host shove marriage fall update business leg direct reward object ugly security warm tuna model broccoli choice",
   "DEMO_MNEMONIC_1": "banner spread envelope side kite person disagree path silver will brother under couch edit food venture squirrel civil budget number acquire point work mass",
   "DEMO_MNEMONIC_2": "veteran try aware erosion drink dance decade comic dawn museum release episode original list ability owner size tuition surface ceiling depth seminar capable only",
   "DEMO_MNEMONIC_3": "obscure canal because tomorrow tribe sibling describe satoshi kiwi upgrade bless empty math trend erosion oblige donate label birth chronic hazard ensure wreck shine",

src/global_setup.ts

@@ -2,6 +2,7 @@ import { defaultRegistryTypes, SigningStargateClient } from '@cosmjs/stargate';
 import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
 import { generateMnemonic } from 'bip39';
 import { setup } from './helpers/setup';
+import { pathToString } from '@cosmjs/crypto';
 import { MsgMultiSend } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/tx';
 import { GlobalSetupContext } from 'vitest/node';
 import { Input, Output } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/bank';
@@ -13,13 +14,18 @@ import {
   NEUTRON_DENOM,
   NEUTRON_PREFIX,
   NEUTRON_RPC,
+  IBC_ATOM_DENOM,
+  IBC_USDC_DENOM,
 } from './helpers/constants';
 
 import config from './config.json';
+import { ethers } from 'ethers';
+import { ACC_PATH, ethToNeutronBechAddress } from './helpers/metamask_emulator';
+import { stringToPath } from '@cosmjs/crypto/build/slip10';
 
 let teardownHappened = false;
 
-const WALLET_COUNT = 1000;
+const MNEMONICS_COUNT = 1000;
 
 export default async function ({ provide }: GlobalSetupContext) {
   const host1 = process.env.NODE1_URL || 'http://localhost:1317';
@@ -28,15 +34,31 @@ export default async function ({ provide }: GlobalSetupContext) {
     await setup(host1, host2);
   }
 
+  // generate lots of mnemonics for test wallets
   const mnemonics: string[] = [];
-  for (let i = 0; i < WALLET_COUNT; i++) {
+  for (let i = 0; i < MNEMONICS_COUNT; i++) {
     mnemonics.push(generateMnemonic());
   }
 
-  // fund a lot or preallocated wallets for testing purposes
-  await fundWallets(mnemonics, NEUTRON_RPC, NEUTRON_PREFIX, NEUTRON_DENOM);
-  await fundWallets(mnemonics, GAIA_RPC, COSMOS_PREFIX, COSMOS_DENOM);
+  const denomsToFund = [NEUTRON_DENOM, IBC_ATOM_DENOM, IBC_USDC_DENOM];
+  for (let i = 0; i < denomsToFund.length; i++) {
+    await fundWallets(
+      mnemonics,
+      NEUTRON_RPC,
+      NEUTRON_PREFIX,
+      NEUTRON_DENOM,
+      denomsToFund[i],
+    );
+  }
+  await fundWallets(
+    mnemonics,
+    GAIA_RPC,
+    COSMOS_PREFIX,
+    COSMOS_DENOM,
+    COSMOS_DENOM,
+  );
 
+  // make mnemonics fetchable in test
   provide('mnemonics', mnemonics);
 
   return async () => {
@@ -52,25 +74,29 @@ export default async function ({ provide }: GlobalSetupContext) {
   };
 }
 
-// Funds a lots of new wallets from one wallet.
+// Funds lots of new wallets from one wallet.
 async function fundWallets(
   mnemonics: string[],
   rpc: string,
   prefix: string,
+  feeDenom: string,
   denom: string,
 ): Promise<void> {
-  const directwallet = await DirectSecp256k1HdWallet.fromMnemonic(
+  const richguyWallet = await DirectSecp256k1HdWallet.fromMnemonic(
     config.DEMO_MNEMONIC_1,
     { prefix: prefix },
   );
-  const client = await SigningStargateClient.connectWithSigner(
+  const richguy = await SigningStargateClient.connectWithSigner(
     rpc,
-    directwallet,
+    richguyWallet,
     { registry: new Registry(defaultRegistryTypes) },
   );
 
-  const richguy = (await directwallet.getAccounts())[0].address;
-  const pooramount = '10000000000';
+  const richguyAddress = (await richguyWallet.getAccounts())[0].address;
+  // amount to be transferred to each new wallet
+  const poorAmount = '10000000000';
+
+  let outputs: Output[];
   const values: Promise<Output>[] = mnemonics.map((mnemonic) =>
     DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
       prefix: prefix,
@@ -79,32 +105,54 @@ async function fundWallets(
       .then((accounts) => accounts[0])
       .then((account) => ({
         address: account.address,
-        coins: [{ denom: denom, amount: pooramount }],
+        coins: [{ denom: denom, amount: poorAmount }],
       })),
   );
-  const outputs: Output[] = await Promise.all(values);
+  outputs = await Promise.all(values);
+
+  if (prefix === NEUTRON_PREFIX) {
+    // fund both addresses derived from ethereum and cosmos-sdk for a given mnemonic.
+    // this will allow us to use either one in any test.
+    const cosmosHdPath = stringToPath(ACC_PATH);
+    const ethDerivedOutputs = mnemonics.map((mnemonic) => {
+      const hdNode = ethers.HDNodeWallet.fromMnemonic(
+        ethers.Mnemonic.fromPhrase(mnemonic),
+        pathToString(cosmosHdPath),
+      );
+      const wallet = new ethers.Wallet(hdNode.privateKey);
+      const neutronAddress = ethToNeutronBechAddress(wallet.address);
+      return {
+        address: neutronAddress,
+        coins: [{ denom: denom, amount: poorAmount }],
+      };
+    });
+    outputs = outputs.concat(ethDerivedOutputs);
+  }
+  const amount =
+    prefix === NEUTRON_PREFIX
+      ? +poorAmount * MNEMONICS_COUNT * 2
+      : +poorAmount * MNEMONICS_COUNT;
+
   const inputs: Input[] = [
     {
-      address: richguy,
-      coins: [
-        { denom: denom, amount: (+pooramount * WALLET_COUNT).toString() },
-      ],
+      address: richguyAddress,
+      coins: [{ denom: denom, amount: amount.toString() }],
     },
   ];
   const value: MsgMultiSend = {
-    inputs: inputs,
-    outputs: outputs,
+    inputs,
+    outputs,
   };
   const msg: any = {
     typeUrl: MsgMultiSend.typeUrl,
     value: value,
   };
   const fee = {
-    gas: '30000000',
-    amount: [{ denom: denom, amount: '75000' }],
+    gas: '50000000',
+    amount: [{ denom: feeDenom, amount: '125000' }],
   };
-  const result = await client.signAndBroadcast(richguy, [msg], fee, '');
-  const resultTx = await client.getTx(result.transactionHash);
+  const result = await richguy.signAndBroadcast(richguyAddress, [msg], fee, '');
+  const resultTx = await richguy.getTx(result.transactionHash);
   if (resultTx.code !== 0) {
     throw (
       'could not setup test wallets; rawLog = ' +

src/helpers/constants.ts

@@ -85,6 +85,7 @@ export const NEUTRON_REST = process.env.NODE1_URL || 'http://localhost:1317';
 export const GAIA_REST = process.env.NODE2_URL || 'http://localhost:1316';
 export const IBC_WEB_HOST = process.env.ICQ_WEB_HOST || 'http://localhost:9999';
 export const GAIA_CONNECTION = 'connection-0';
+export const WALLETS_SIGN_METHOD = process.env.WALLETS_SIGN_METHOD || 'random';
 
 export const STAKING_VAULT =
   'neutron1jarq7kgdyd7dcfu2ezeqvg4w4hqdt3m5lv364d8mztnp9pzmwwwqjw7fvg';

src/helpers/dao.ts

@@ -10,10 +10,10 @@ import { DaoContracts } from '@neutron-org/neutronjsplus/dist/dao_types';
 import { NEUTRON_DENOM, CONTRACTS } from './constants';
 import { waitBlocks } from '@neutron-org/neutronjsplus/dist/wait';
 import { addSubdaoProposal } from '@neutron-org/neutronjsplus/dist/proposal';
-import { SigningNeutronClient } from './signing_neutron_client';
+import { NeutronTestClient } from './neutron_test_client';
 
 export const deploySubdao = async (
-  client: SigningNeutronClient,
+  client: NeutronTestClient,
   mainDaoCoreAddress: string,
   overrulePreProposeAddress: string,
   securityDaoAddr: string,
@@ -152,7 +152,7 @@ export const deploySubdao = async (
 
 export const setupSubDaoTimelockSet = async (
   user: string,
-  client: SigningNeutronClient,
+  client: NeutronTestClient,
   mainDaoAddress: string,
   securityDaoAddr: string,
   mockMainDao: boolean,
@@ -180,7 +180,7 @@ export const setupSubDaoTimelockSet = async (
 
 export const deployNeutronDao = async (
   user: string,
-  client: SigningNeutronClient,
+  client: NeutronTestClient,
 ): Promise<DaoContracts> => {
   const coreCodeId = await client.upload(CONTRACTS.DAO_CORE);
   const proposeSingleCodeId = await client.upload(

src/helpers/fake_eip191_signer.ts

@@ -0,0 +1,42 @@
+import { AccountData } from '@cosmjs/proto-signing';
+import { MetaMaskEmulator } from './metamask_emulator';
+import { serializeSignDoc, StdSignDoc } from '@cosmjs/amino/build/signdoc';
+import { Buffer } from 'buffer';
+import { Eip191Signer } from '@neutron-org/neutronjsplus/dist/eip191_signer';
+
+/**
+ * Implementation of Eip191Signer that uses MetaMaskEmulator (ether.js inside) for signing
+ */
+export class FakeMetaMaskEip191Signer implements Eip191Signer {
+  constructor(private readonly metamaskEmulator: MetaMaskEmulator) {}
+
+  // Get accounts from the MetaMask emulator.
+  async getAccounts(): Promise<readonly AccountData[]> {
+    // Use the new method to get both addresses and public keys
+    return this.metamaskEmulator.getAccountsWithPubkeys();
+  }
+
+  // Sign a document using EIP-191 format.
+  // This implementation uses the personal_sign method from MetaMask.
+  async signEip191(
+    signerAddress: string,
+    signDoc: StdSignDoc,
+  ): Promise<{ signature: { signature: Buffer }; signed: any }> {
+    const messageToSign = serializeSignDoc(signDoc);
+
+    // Sign the message using the MetaMask emulator
+    const signature = await this.metamaskEmulator.personalSign(
+      messageToSign,
+      signerAddress,
+    );
+    const signatureHex = Buffer.from(signature.replace('0x', ''), 'hex');
+
+    // Return the signature and the original document
+    return {
+      signature: {
+        signature: signatureHex,
+      },
+      signed: signDoc,
+    };
+  }
+}