From 83bbb7fd57239d031db00fdcdacb17bf70c617e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Torres?= <30977845+Torres-ssf@users.noreply.github.com> Date: Fri, 24 May 2024 09:18:53 -0300 Subject: [PATCH] chore: use dev-net chain config for local node (#2334) --- .changeset/shiny-camels-know.md | 5 + .fuel-core/configs/chainConfig.json | 154 +++++++++--------- .fuel-core/configs/stateConfig.json | 34 ++-- .../src/guide/contracts/add-transfer.test.ts | 6 +- .../interacting-with-contracts.test.ts | 2 +- .../cookbook/deposit-and-withdraw.test.ts | 4 +- .../cookbook/signing-transactions.test.ts | 2 +- .../predicate-with-configurable.test.ts | 4 +- ...nd-and-spend-funds-from-predicates.test.ts | 8 +- .../src/guide/provider/provider.test.ts | 3 +- .../guide/provider/querying-the-chain.test.ts | 2 +- .../transactions/transaction-policies.test.ts | 5 +- .../src/guide/wallets/signing.test.ts | 4 +- .../src/guide/wallets/test-wallets.test.ts | 2 +- .../guide/wallets/wallet-transferring.test.ts | 4 +- apps/docs-snippets/src/utils.ts | 2 +- .../forc-projects/liquidity-pool/src/main.sw | 8 +- packages/account/src/account.test.ts | 24 +-- .../account/src/providers/provider.test.ts | 15 +- packages/account/test/fixtures/chain.ts | 2 +- .../fuel-gauge/src/advanced-logging.test.ts | 4 +- packages/fuel-gauge/src/contract.test.ts | 20 +-- packages/fuel-gauge/src/doc-examples.test.ts | 2 +- .../src/dry-run-multiple-txs.test.ts | 10 +- .../src/funding-transaction.test.ts | 27 ++- packages/fuel-gauge/src/min-gas.test.ts | 15 +- packages/fuel-gauge/src/policies.test.ts | 10 +- .../src/predicate-conditional-inputs.test.ts | 12 +- .../src/predicate/predicate-arguments.test.ts | 2 +- .../predicate/predicate-configurables.test.ts | 4 +- .../predicate/predicate-estimations.test.ts | 2 +- .../predicate/predicate-input-data.test.ts | 2 +- .../predicate-populate-witness.test.ts | 29 ++-- .../predicate/predicate-with-script.test.ts | 10 +- .../predicate/utils/predicate/setupWallets.ts | 2 +- .../src/reentrant-contract-calls.test.ts | 2 +- .../src/transaction-summary.test.ts | 14 +- packages/fuel-gauge/src/utils.ts | 4 +- .../utils/defaultSnapshots/chainConfig.json | 154 +++++++++--------- .../utils/defaultSnapshots/stateConfig.json | 34 ++-- 40 files changed, 317 insertions(+), 332 deletions(-) create mode 100644 .changeset/shiny-camels-know.md diff --git a/.changeset/shiny-camels-know.md b/.changeset/shiny-camels-know.md new file mode 100644 index 0000000000..1fd37d5d57 --- /dev/null +++ b/.changeset/shiny-camels-know.md @@ -0,0 +1,5 @@ +--- +"@fuel-ts/utils": patch +--- + +chore: use dev-net chain config for local node diff --git a/.fuel-core/configs/chainConfig.json b/.fuel-core/configs/chainConfig.json index 81083c0945..ff86d200f6 100644 --- a/.fuel-core/configs/chainConfig.json +++ b/.fuel-core/configs/chainConfig.json @@ -7,8 +7,8 @@ "max_inputs": 255, "max_outputs": 255, "max_witnesses": 255, - "max_gas_per_tx": 30000000, - "max_size": 112640, + "max_gas_per_tx": 100000000, + "max_size": 262144, "max_bytecode_subsections": 256 } }, @@ -17,7 +17,7 @@ "max_predicate_length": 102400, "max_predicate_data_length": 102400, "max_message_data_length": 102400, - "max_gas_per_predicate": 30000000 + "max_gas_per_predicate": 100000000 } }, "script_params": { @@ -28,7 +28,7 @@ }, "contract_params": { "V1": { - "contract_max_size": 102400, + "contract_max_size": 262144, "max_storage_slots": 1760 } }, @@ -43,53 +43,53 @@ "V1": { "add": 2, "addi": 2, - "aloc": 1, + "aloc": 2, "and": 2, "andi": 2, - "bal": 366, + "bal": 86, "bhei": 2, "bhsh": 2, - "burn": 33949, + "burn": 25770, "cb": 2, "cfei": 2, "cfsi": 2, "div": 2, "divi": 2, - "eck1": 3347, - "ecr1": 46165, - "ed19": 4210, + "eck1": 3114, + "ecr1": 42270, + "ed19": 2878, "eq": 2, "exp": 2, "expi": 2, "flag": 1, "gm": 2, "gt": 2, - "gtf": 16, + "gtf": 12, "ji": 2, "jmp": 2, "jne": 2, "jnei": 2, "jnzi": 2, - "jmpf": 2, - "jmpb": 2, - "jnzf": 2, - "jnzb": 2, - "jnef": 2, - "jneb": 2, + "jmpf": 1, + "jmpb": 1, + "jnzf": 1, + "jnzb": 1, + "jnef": 1, + "jneb": 1, "lb": 2, - "log": 754, + "log": 165, "lt": 2, "lw": 2, - "mint": 35718, + "mint": 29024, "mlog": 2, - "mod": 2, + "mod_op": 2, "modi": 2, - "move": 2, + "move_op": 2, "movi": 2, - "mroo": 5, + "mroo": 4, "mul": 2, "muli": 2, - "mldv": 4, + "mldv": 3, "noop": 1, "not": 2, "or": 2, @@ -98,168 +98,168 @@ "popl": 3, "pshh": 4, "pshl": 4, - "ret_contract": 733, - "rvrt_contract": 722, + "ret": 134, + "rvrt": 153, "sb": 2, "sll": 2, "slli": 2, "srl": 2, "srli": 2, - "srw": 253, + "srw": 209, "sub": 2, "subi": 2, "sw": 2, - "sww": 29053, - "time": 79, - "tr": 46242, - "tro": 33251, - "wdcm": 3, + "sww": 22501, + "time": 50, + "tr": 33912, + "tro": 24294, + "wdcm": 2, "wqcm": 3, "wdop": 3, "wqop": 3, "wdml": 3, "wqml": 4, "wddv": 5, - "wqdv": 7, - "wdmd": 11, - "wqmd": 18, + "wqdv": 6, + "wdmd": 10, + "wqmd": 17, "wdam": 9, - "wqam": 12, - "wdmm": 11, - "wqmm": 11, + "wqam": 11, + "wdmm": 10, + "wqmm": 10, "xor": 2, "xori": 2, "call": { "LightOperation": { - "base": 21687, - "units_per_gas": 4 + "base": 18190, + "units_per_gas": 5 } }, "ccp": { "LightOperation": { - "base": 59, - "units_per_gas": 20 + "base": 48, + "units_per_gas": 22 } }, "croo": { "LightOperation": { - "base": 1, - "units_per_gas": 1 + "base": 131, + "units_per_gas": 2 } }, "csiz": { "LightOperation": { - "base": 59, - "units_per_gas": 195 + "base": 45, + "units_per_gas": 237 } }, "k256": { "LightOperation": { - "base": 282, + "base": 37, "units_per_gas": 3 } }, "ldc": { "LightOperation": { - "base": 45, - "units_per_gas": 65 + "base": 39, + "units_per_gas": 68 } }, "logd": { "LightOperation": { - "base": 1134, + "base": 565, "units_per_gas": 2 } }, "mcl": { "LightOperation": { "base": 3, - "units_per_gas": 523 + "units_per_gas": 564 } }, "mcli": { "LightOperation": { "base": 3, - "units_per_gas": 526 + "units_per_gas": 560 } }, "mcp": { "LightOperation": { - "base": 3, - "units_per_gas": 448 + "base": 4, + "units_per_gas": 185 } }, "mcpi": { "LightOperation": { - "base": 7, - "units_per_gas": 585 + "base": 9, + "units_per_gas": 455 } }, "meq": { "LightOperation": { - "base": 11, - "units_per_gas": 1097 + "base": 3, + "units_per_gas": 766 } }, - "retd_contract": { + "retd": { "LightOperation": { - "base": 1086, - "units_per_gas": 2 + "base": 485, + "units_per_gas": 3 } }, "s256": { "LightOperation": { - "base": 45, + "base": 42, "units_per_gas": 3 } }, "scwq": { "HeavyOperation": { - "base": 30375, - "gas_per_unit": 28628 + "base": 21672, + "gas_per_unit": 22146 } }, "smo": { "LightOperation": { - "base": 64196, + "base": 44437, "units_per_gas": 1 } }, "srwq": { "HeavyOperation": { - "base": 262, - "gas_per_unit": 249 + "base": 239, + "gas_per_unit": 234 } }, "swwq": { "HeavyOperation": { - "base": 28484, - "gas_per_unit": 26613 + "base": 22724, + "gas_per_unit": 21231 } }, "contract_root": { "LightOperation": { - "base": 45, - "units_per_gas": 1 + "base": 42, + "units_per_gas": 2 } }, "state_root": { "HeavyOperation": { - "base": 350, - "gas_per_unit": 176 + "base": 323, + "gas_per_unit": 169 } }, "new_storage_per_byte": 63, "vm_initialization": { - "LightOperation": { - "base": 1645, - "units_per_gas": 14 + "HeavyOperation": { + "base": 5254820, + "gas_per_unit": 0 } } } }, - "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000", - "block_gas_limit": 30000000, + "base_asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07", + "block_gas_limit": 100000000, "privileged_address": "0000000000000000000000000000000000000000000000000000000000000000" } }, diff --git a/.fuel-core/configs/stateConfig.json b/.fuel-core/configs/stateConfig.json index 647e563991..3decf7905a 100644 --- a/.fuel-core/configs/stateConfig.json +++ b/.fuel-core/configs/stateConfig.json @@ -7,7 +7,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x94ffcc53b892684acefaebc8a3d4a595e528a8cf664eeb3ef36f1020b0809d0d", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x2a757c2317236f7883ac9bbbf7d402f034e0b725c544ef1c8725b1d2bd960f8c690f", @@ -16,7 +16,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x09c0b2d1a486c439a87bcba6b46a7a1a23f3897cc83a94521a96da5c23bc58db", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x634ef6cda00bac63992bbde80c6d694d484d58025a5ca0c9c848f0d35a5a3eee74b2", @@ -43,7 +43,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x5d99ee966b42cd8fc7bdd1364b389153a9e78b42b7d4a691470674e817888d4e", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xc197cb09b1d89a7862b238e9500631bd43f291aadb7ff55c8129335349634e9fde3f", @@ -70,7 +70,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbdaad6a89e073e177895b3e5a9ccd15806749eda134a6438dae32fc5b6601f3f", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x1b9bdaa290518373eb905e45ce7fcb89acedd24341ca7749ad47a938e4bf3ca9b7ce", @@ -97,7 +97,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x95a7aa6cc32743f8706c40ef49a7423b47da763bb4bbc055b1f07254dc729036", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xf8f00a234cf3fbab86befc3fd9346d7fd1ac085233c9cb58c7447f30c75cbf87ed38", @@ -124,7 +124,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xcee104acd38b940c8f1c62c6d7ea00a0ad2241d6dee0509a4bf27297508870d3", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xfeb4f2388fa22e6613ff85cf4e655f58acdfaa6299eba7f93b812cd1f0d7bbac48f0", @@ -151,7 +151,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x7e3626e306588eba79cafab73f0709e55ab8f4bdfe8c8b75034a430fc56ece89", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x28131b9acc90c2058ee14f4094a474146ba5b779cb9021867164b3d41abad3d047a7", @@ -178,7 +178,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x1c31df52b6df56407dd95f83082e8beb9cfc9532ac111d5bd8491651d95ba775", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x447a7c37aee972dcba72f05255c5145dd63125f0fc46ef98c216f775ee0421e23d2b", @@ -205,7 +205,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x09dd7a49174d6fcc9f4c6f7942c18060a935ddd03ee69b594189b8c3581276ea", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x0a6e3585881ef2edf3f7727762799089dc0b5923e8b3718b49044dd9ddcb33b68459", @@ -232,7 +232,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x86604282dc604481b809845be49667607c470644f6822fc01eb0d22f167e08cf", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xbf2305d284ea95227040df4cc727156cccc2ca6aa3b92ed86fea4db1c37e5905f926", @@ -259,7 +259,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbca334a06d19db5041c78fe2f465b07be5bec828f38b7796b2877e7d1542c950", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x978d5b6be047ffbf1474dc376a6baa33264629b809e4a8210d11aaa805ec6451585d", @@ -286,7 +286,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbd9a1dc8d3ec3521c43f6c2c01611b4d0204c7610204ff0178488c8738a30bd2", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xb353fbcd94abba347f3ba25e17744e98da26e608ebccbbbd2e9d004997644bdf993c", @@ -313,7 +313,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xb32197cf75efe05bf453c26178139f09b391582065549c1422bc92555ecffb64", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xa952c0487eefac5dda612011c4c82554c8660834461b9b815c6ae257b56b68005235", @@ -340,7 +340,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x3b24509ed4ab3c7959f5c9391c1445c59290cdb5f13d6f780922f376b7029f30", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x508871600ef68c4f1e021dd0db219c733107151338aa95de530bd10dc61f6a69c144", @@ -367,7 +367,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x77c6f40b7da70d885f68efaad7c661327482a63ea10dcb4271de819438254ae1", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x9ddea761afc31516307e1553647ac6cc26d4a82fed9a9e6a03b994cdbf2293b3e3b6", @@ -394,7 +394,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x6a2c4691c547c43924650dbd30620b184b5fe3fb6dbe5c4446110b08f6f405bf", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x708ee45d18f94ab06458712745c92c7b9b6049ba345219d6697eae5208ec0328aeaf", @@ -421,7 +421,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x49075a7538e2c88ebe1926ce4d898198a2a4e790d14512943a9864bc536b3c82", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xfa82dbdd72252d1e6c76ee818bbac0441c3a705aff447f041c8b9fc3cb03f9ccd7e2", diff --git a/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts b/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts index edbc77cba4..4959bf18da 100644 --- a/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts +++ b/apps/docs-snippets/src/guide/contracts/add-transfer.test.ts @@ -19,9 +19,9 @@ describe(__filename, () => { provider = contract.provider; baseAssetId = provider.getBaseAssetId(); wallet = await getTestWallet([ - [5000, baseAssetId], - [5000, ASSET_A], - [5000, ASSET_B], + [500_000, baseAssetId], + [500_000, ASSET_A], + [500_000, ASSET_B], ]); contract.account = wallet; diff --git a/apps/docs-snippets/src/guide/contracts/interacting-with-contracts.test.ts b/apps/docs-snippets/src/guide/contracts/interacting-with-contracts.test.ts index d413cfe528..d76685a578 100644 --- a/apps/docs-snippets/src/guide/contracts/interacting-with-contracts.test.ts +++ b/apps/docs-snippets/src/guide/contracts/interacting-with-contracts.test.ts @@ -44,7 +44,7 @@ describe(__filename, () => { it('should successfully use "simulate" to validate if wallet can pay for transaction', async () => { const { id: contractId, interface: abi } = counterContract; - const fundedWallet = await getTestWallet([[10_000, baseAssetId]]); + const fundedWallet = await getTestWallet([[200_000, baseAssetId]]); // #region interacting-with-contracts-3 const contract = new Contract(contractId, abi, fundedWallet); diff --git a/apps/docs-snippets/src/guide/cookbook/deposit-and-withdraw.test.ts b/apps/docs-snippets/src/guide/cookbook/deposit-and-withdraw.test.ts index e84275bce6..43a8a4f956 100644 --- a/apps/docs-snippets/src/guide/cookbook/deposit-and-withdraw.test.ts +++ b/apps/docs-snippets/src/guide/cookbook/deposit-and-withdraw.test.ts @@ -25,7 +25,9 @@ describe(__filename, () => { provider = sender.provider; baseAssetId = provider.getBaseAssetId(); const factory = new ContractFactory(binHexlified, abiContents, sender); - liquidityPoolContract = await factory.deployContract(); + liquidityPoolContract = await factory.deployContract({ + configurableConstants: { TOKEN: { bits: baseAssetId } }, + }); }); it('deposit and withdraw cookbook guide', async () => { diff --git a/apps/docs-snippets/src/guide/cookbook/signing-transactions.test.ts b/apps/docs-snippets/src/guide/cookbook/signing-transactions.test.ts index 43ad68fbd8..6b3a7fb68f 100644 --- a/apps/docs-snippets/src/guide/cookbook/signing-transactions.test.ts +++ b/apps/docs-snippets/src/guide/cookbook/signing-transactions.test.ts @@ -80,7 +80,7 @@ describe('Signing transactions', () => { provider, inputData: [signer.address.toB256()], }); - const tx1 = await sender.transfer(predicate.address, 100_000, baseAssetId); + const tx1 = await sender.transfer(predicate.address, 200_000, baseAssetId); await tx1.waitForResult(); // Create the transaction request diff --git a/apps/docs-snippets/src/guide/predicates/predicate-with-configurable.test.ts b/apps/docs-snippets/src/guide/predicates/predicate-with-configurable.test.ts index 61a4844cba..2877984756 100644 --- a/apps/docs-snippets/src/guide/predicates/predicate-with-configurable.test.ts +++ b/apps/docs-snippets/src/guide/predicates/predicate-with-configurable.test.ts @@ -38,7 +38,7 @@ describe(__filename, () => { }); // transferring funds to the predicate - const tx1 = await wallet.transfer(predicate.address, 1000, baseAssetId, { + const tx1 = await wallet.transfer(predicate.address, 200_000, baseAssetId, { gasLimit: 1000, }); @@ -73,7 +73,7 @@ describe(__filename, () => { }); // transferring funds to the predicate - const tx1 = await wallet.transfer(predicate.address, 1000, baseAssetId, { + const tx1 = await wallet.transfer(predicate.address, 200_000, baseAssetId, { gasLimit: 1000, }); diff --git a/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts b/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts index 76f9a1eb17..bd0d26c7b0 100644 --- a/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts +++ b/apps/docs-snippets/src/guide/predicates/send-and-spend-funds-from-predicates.test.ts @@ -30,7 +30,7 @@ describe(__filename, () => { inputData: [inputAddress], }); baseAssetId = provider.getBaseAssetId(); - await seedTestWallet(predicate, [[100_000, baseAssetId]]); + await seedTestWallet(predicate, [[500_000, baseAssetId]]); }); it('should successfully use predicate to spend assets', async () => { @@ -201,7 +201,7 @@ describe(__filename, () => { inputData: [inputAddress], }); - const amountToPredicate = 10_000; + const amountToPredicate = 300_000; const tx = await walletWithFunds.transfer(predicate.address, amountToPredicate, baseAssetId, { gasLimit: 1_000, @@ -213,11 +213,13 @@ describe(__filename, () => { provider, }); + const transferAmount = 1000; + // #region predicates-prestage-transaction // Prepare the transaction const preparedTx = await predicate.createTransfer( receiverWallet.address, - amountToPredicate, + transferAmount, baseAssetId ); diff --git a/apps/docs-snippets/src/guide/provider/provider.test.ts b/apps/docs-snippets/src/guide/provider/provider.test.ts index 6a083c3989..dcb7a9f9f5 100644 --- a/apps/docs-snippets/src/guide/provider/provider.test.ts +++ b/apps/docs-snippets/src/guide/provider/provider.test.ts @@ -2,7 +2,6 @@ import { FUEL_NETWORK_URL, Provider, ScriptTransactionRequest, - ZeroBytes32, sleep, WalletUnlocked, Address, @@ -125,7 +124,7 @@ describe('Provider', () => { transactionRequest.addCoinOutput(recipientAddress, 100, baseAssetId); // #endregion provider-getBaseAssetId - expect(baseAssetId).toBe(ZeroBytes32); + expect(baseAssetId).toBeDefined(); }); it('using operations', async () => { diff --git a/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts b/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts index dad14a9f7c..14839c794a 100644 --- a/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts +++ b/apps/docs-snippets/src/guide/provider/querying-the-chain.test.ts @@ -69,8 +69,8 @@ describe('querying the chain', () => { // #endregion wallet-get-balances expect(walletBalances).toEqual([ - { assetId: baseAssetId, amount: bn(42) }, { assetId: assetIdA, amount: bn(100) }, + { assetId: baseAssetId, amount: bn(42) }, ]); }); it('get spendable resources', async () => { diff --git a/apps/docs-snippets/src/guide/transactions/transaction-policies.test.ts b/apps/docs-snippets/src/guide/transactions/transaction-policies.test.ts index 12b24324bc..ae0b3fa190 100644 --- a/apps/docs-snippets/src/guide/transactions/transaction-policies.test.ts +++ b/apps/docs-snippets/src/guide/transactions/transaction-policies.test.ts @@ -12,7 +12,7 @@ import { getTestWallet } from '../../utils'; */ describe('Transaction Policies', () => { let wallet: WalletUnlocked; - const baseAssetId = '0x'; + let baseAssetId: string; const { abiContents: scriptAbi, binHexlified: scriptBytecode } = getDocsSnippetsForcProject( DocSnippetProjectsEnum.SUM_SCRIPT @@ -20,6 +20,7 @@ describe('Transaction Policies', () => { beforeAll(async () => { wallet = await getTestWallet(); + baseAssetId = wallet.provider.getBaseAssetId(); }); it('sets policies', () => { @@ -62,7 +63,7 @@ describe('Transaction Policies', () => { maturity: 2, tip: bn(3), witnessLimit: 900, - maxFee: bn(10_000), + maxFee: bn(60_000), }); // Set the script main function arguments diff --git a/apps/docs-snippets/src/guide/wallets/signing.test.ts b/apps/docs-snippets/src/guide/wallets/signing.test.ts index 05a4d332bb..41837094ea 100644 --- a/apps/docs-snippets/src/guide/wallets/signing.test.ts +++ b/apps/docs-snippets/src/guide/wallets/signing.test.ts @@ -45,7 +45,7 @@ describe(__filename, () => { it('should sign a transaction using wallet instance [DETAILED]', async () => { const wallet = WalletUnlocked.generate({ provider }); - await seedTestWallet(wallet, [[10_000, baseAssetId]]); + await seedTestWallet(wallet, [[100_000, baseAssetId]]); // #region signing-2 const request = new ScriptTransactionRequest({ @@ -77,7 +77,7 @@ describe(__filename, () => { it('should sign a transaction using wallet instance [SIMPLIFIED]', async () => { const wallet = WalletUnlocked.generate({ provider }); - await seedTestWallet(wallet, [[10_000, baseAssetId]]); + await seedTestWallet(wallet, [[100_000, baseAssetId]]); const request = new ScriptTransactionRequest({ gasLimit: 10000, diff --git a/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts b/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts index b3a83a345c..7a7e99cc8b 100644 --- a/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts +++ b/apps/docs-snippets/src/guide/wallets/test-wallets.test.ts @@ -37,9 +37,9 @@ describe(__filename, () => { expect(walletABalances).toEqual([{ assetId: baseAssetId, amount: bn(42) }]); expect(walletBBalances).toEqual([ - { assetId: baseAssetId, amount: bn(30) }, { assetId: assetIdA, amount: bn(100) }, { assetId: assetIdB, amount: bn(200) }, + { assetId: baseAssetId, amount: bn(30) }, ]); expect(walletCBalances).toEqual([]); // #endregion wallet-setup diff --git a/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts b/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts index 7f4c838223..2c75bc97ff 100644 --- a/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts +++ b/apps/docs-snippets/src/guide/wallets/wallet-transferring.test.ts @@ -19,8 +19,8 @@ describe(__filename, () => { provider = await Provider.create(FUEL_NETWORK_URL); baseAssetId = provider.getBaseAssetId(); const wallet = await generateTestWallet(provider, [ - [200_000, baseAssetId], - [200_000, ASSET_A], + [1_000_000, baseAssetId], + [1_000_000, ASSET_A], ]); contract = await createAndDeployContractFromProject(DocSnippetProjectsEnum.COUNTER); privateKey = wallet.privateKey; diff --git a/apps/docs-snippets/src/utils.ts b/apps/docs-snippets/src/utils.ts index e39a6c52bd..0ec3dec55c 100644 --- a/apps/docs-snippets/src/utils.ts +++ b/apps/docs-snippets/src/utils.ts @@ -29,7 +29,7 @@ export const getTestWallet = async (seedQuantities?: CoinQuantityLike[]) => { const request = new ScriptTransactionRequest(); // add the transaction outputs (coins to be sent to the test wallet) - (seedQuantities || [[1_000_000, baseAssetId]]) + (seedQuantities || [[100_000_000_000, baseAssetId]]) .map(coinQuantityfy) .forEach(({ amount, assetId }) => request.addCoinOutput(testWallet.address, amount, assetId)); diff --git a/apps/docs-snippets/test/fixtures/forc-projects/liquidity-pool/src/main.sw b/apps/docs-snippets/test/fixtures/forc-projects/liquidity-pool/src/main.sw index 2bb61b1f5c..497a0061b9 100644 --- a/apps/docs-snippets/test/fixtures/forc-projects/liquidity-pool/src/main.sw +++ b/apps/docs-snippets/test/fixtures/forc-projects/liquidity-pool/src/main.sw @@ -11,12 +11,14 @@ abi LiquidityPool { fn withdraw(recipient: Address); } -const BASE_TOKEN: AssetId = AssetId::from(0x0000000000000000000000000000000000000000000000000000000000000000); +configurable { + TOKEN: AssetId = AssetId::from(0x0000000000000000000000000000000000000000000000000000000000000000), +} impl LiquidityPool for Contract { #[payable] fn deposit(recipient: Address) { - assert(BASE_TOKEN == msg_asset_id()); + assert(TOKEN == msg_asset_id()); assert(0 < msg_amount()); // Mint two times the amount. @@ -34,7 +36,7 @@ impl LiquidityPool for Contract { let amount_to_transfer = msg_amount() / 2; // Transfer base token to recipient. - transfer(Identity::Address(recipient), BASE_TOKEN, amount_to_transfer); + transfer(Identity::Address(recipient), TOKEN, amount_to_transfer); } } // #endregion deposit-and-withdraw-cookbook-1 diff --git a/packages/account/src/account.test.ts b/packages/account/src/account.test.ts index 8b827b4edf..a77ca0db12 100644 --- a/packages/account/src/account.test.ts +++ b/packages/account/src/account.test.ts @@ -1,5 +1,4 @@ import { Address } from '@fuel-ts/address'; -import { ZeroBytes32 } from '@fuel-ts/address/configs'; import { ErrorCode, FuelError } from '@fuel-ts/errors'; import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils'; import { bn } from '@fuel-ts/math'; @@ -20,13 +19,14 @@ import { Wallet } from './wallet'; */ describe('Account', () => { - const assets = [ASSET_A, ASSET_B, ZeroBytes32]; + const assets = [ASSET_A, ASSET_B]; let provider: Provider; let baseAssetId: string; beforeAll(async () => { provider = await Provider.create(FUEL_NETWORK_URL); baseAssetId = provider.getBaseAssetId(); + assets.push(baseAssetId); }); afterEach(() => { @@ -388,7 +388,7 @@ describe('Account', () => { const senderBalances = await sender.getBalances(); const receiverBalances = await receiver.getBalances(); - const expectedRemaining = 499118; + const expectedRemaining = 442069; expect(senderBalances).toEqual([{ assetId: baseAssetId, amount: bn(expectedRemaining) }]); expect(receiverBalances).toEqual([{ assetId: baseAssetId, amount: bn(1) }]); }); @@ -478,7 +478,7 @@ describe('Account', () => { const senderBalances = await sender.getBalances(); const receiverBalances = await receiver.getBalances(); - const expectedRemaining = 499118; + const expectedRemaining = 442069; expect(senderBalances).toEqual([{ assetId: baseAssetId, amount: bn(expectedRemaining) }]); expect(receiverBalances).toEqual([{ assetId: baseAssetId, amount: bn(1) }]); }); @@ -488,7 +488,7 @@ describe('Account', () => { const receiver = Address.fromRandom(); const gasLimit = 30_000; - const maxFee = 15_000; + const maxFee = 60_000; const request = await sender.createTransfer(receiver, 1, baseAssetId, { gasLimit, @@ -506,7 +506,7 @@ describe('Account', () => { }); it('can transfer with custom TX Params', async () => { - const sender = await generateTestWallet(provider, [[50_000, baseAssetId]]); + const sender = await generateTestWallet(provider, [[200_000, baseAssetId]]); const receiver = Wallet.generate({ provider }); const tx = await sender.transfer(receiver.address, 1, baseAssetId, { @@ -606,7 +606,7 @@ describe('Account', () => { expect(amount.toString()).toEqual(messageOutReceipt.amount.toString()); const senderBalances = await sender.getBalances(); - const expectedRemaining = 498433; + const expectedRemaining = 441598; expect(senderBalances).toEqual([{ assetId: baseAssetId, amount: bn(expectedRemaining) }]); }); @@ -679,7 +679,7 @@ describe('Account', () => { const senderBalances = await sender.getBalances(); - const expectedRemaining = 1498333; + const expectedRemaining = 1441498; expect(senderBalances).toEqual([{ assetId: baseAssetId, amount: bn(expectedRemaining) }]); }); @@ -694,7 +694,7 @@ describe('Account', () => { const amount = 110; const gasLimit = 100_000; - const maxFee = 50_000; + const maxFee = 80_000; const tx = await sender.withdrawToBaseLayer(recipient, amount, { gasLimit, maxFee }); const { transaction } = await tx.wait(); @@ -707,15 +707,15 @@ describe('Account', () => { }); it('should ensure gas price and gas limit are validated when transfering amounts', async () => { - const sender = await generateTestWallet(provider, [[1000, baseAssetId]]); + const sender = await generateTestWallet(provider, [[100_000, baseAssetId]]); const receiver = Wallet.generate({ provider }); await expect(async () => { const result = await sender.transfer(receiver.address, 1, baseAssetId, { - gasLimit: 1, + gasLimit: 0, }); await result.wait(); - }).rejects.toThrowError(/Gas limit '1' is lower than the required: ./); + }).rejects.toThrowError(/Gas limit '0' is lower than the required: ./); }); it('should ensure gas limit and price are validated when withdraw an amount of base asset', async () => { diff --git a/packages/account/src/providers/provider.test.ts b/packages/account/src/providers/provider.test.ts index f49cb9781a..f25f424076 100644 --- a/packages/account/src/providers/provider.test.ts +++ b/packages/account/src/providers/provider.test.ts @@ -76,14 +76,14 @@ describe('Provider', () => { owner: baseAssetId, assetId: baseAssetId, txPointer: '0x00000000000000000000000000000000', - amount: 1000, + amount: 500_000, witnessIndex: 0, }, ]; const transactionRequest = new ScriptTransactionRequest({ tip: 0, - gasLimit: 500, - maxFee: 1000, + gasLimit: 100_000, + maxFee: 120_000, script: /* Opcode::ADDI(0x10, REG_ZERO, 0xCA) @@ -97,11 +97,6 @@ describe('Provider', () => { witnesses: ['0x'], }); - const { maxFee, gasUsed } = await provider.getTransactionCost(transactionRequest); - - transactionRequest.maxFee = maxFee; - transactionRequest.gasLimit = gasUsed; - const callResult = await provider.call(transactionRequest); const expectedReceipts: Receipt[] = [ @@ -125,7 +120,7 @@ describe('Provider', () => { { type: ReceiptType.ScriptResult, result: bn(0), - gasUsed: bn(0x5d3), + gasUsed: bn(170), }, ]; @@ -229,7 +224,7 @@ describe('Provider', () => { const provider = await Provider.create(FUEL_NETWORK_URL); const baseAssetId = provider.getBaseAssetId(); - expect(baseAssetId).toBe('0x0000000000000000000000000000000000000000000000000000000000000000'); + expect(baseAssetId).toBeDefined(); }); it('can change the provider url of the current instance', async () => { diff --git a/packages/account/test/fixtures/chain.ts b/packages/account/test/fixtures/chain.ts index ad56724774..9eee0d862b 100644 --- a/packages/account/test/fixtures/chain.ts +++ b/packages/account/test/fixtures/chain.ts @@ -19,7 +19,7 @@ export const MOCK_CHAIN: GqlChainInfoFragment = { maxInputs: '255', maxOutputs: '255', maxWitnesses: '255', - maxGasPerTx: '500000000', + maxGasPerTx: '5000000000', maxSize: '17825792', maxBytecodeSubsections: '255', }, diff --git a/packages/fuel-gauge/src/advanced-logging.test.ts b/packages/fuel-gauge/src/advanced-logging.test.ts index 5982cd00e8..cab2a8490a 100644 --- a/packages/fuel-gauge/src/advanced-logging.test.ts +++ b/packages/fuel-gauge/src/advanced-logging.test.ts @@ -150,7 +150,7 @@ describe('Advanced Logging', () => { ]; beforeAll(async () => { - wallet = await generateTestWallet(provider, [[100_000, baseAssetId]]); + wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); }); it('when using InvacationScope', async () => { @@ -233,7 +233,7 @@ describe('Advanced Logging', () => { ]; beforeAll(async () => { - wallet = await generateTestWallet(provider, [[100_000, baseAssetId]]); + wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); }); it('when using InvocationScope', async () => { diff --git a/packages/fuel-gauge/src/contract.test.ts b/packages/fuel-gauge/src/contract.test.ts index 231c4fdf3e..d4dfc09da7 100644 --- a/packages/fuel-gauge/src/contract.test.ts +++ b/packages/fuel-gauge/src/contract.test.ts @@ -845,7 +845,7 @@ describe('Contract', () => { const amountToContract = 5_000; const gasLimit = 80_000; - const maxFee = 40_000; + const maxFee = 70_000; const tx = await wallet.transferToContract(contract.id, amountToContract, baseAssetId, { gasLimit, @@ -951,7 +951,7 @@ describe('Contract', () => { FuelGaugeProjectsEnum.CALL_TEST_CONTRACT ); - const wallet = await generateTestWallet(provider, [[100_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); const factory = new ContractFactory(binHexlified, abiContents, wallet); @@ -980,9 +980,9 @@ describe('Contract', () => { ); const wallet = await generateTestWallet(provider, [ - [50_000, baseAssetId], - [50_000, ASSET_A], - [50_000, ASSET_B], + [300_000, baseAssetId], + [300_000, ASSET_A], + [300_000, ASSET_B], ]); const factory = new ContractFactory(binHexlified, abiContents, wallet); @@ -1020,9 +1020,9 @@ describe('Contract', () => { ); const wallet = await generateTestWallet(provider, [ - [50_000, baseAssetId], - [50_000, ASSET_A], - [50_000, ASSET_B], + [300_000, baseAssetId], + [300_000, ASSET_A], + [300_000, ASSET_B], ]); const factory = new ContractFactory(binHexlified, abiContents, wallet); @@ -1151,7 +1151,7 @@ describe('Contract', () => { FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT ); - const wallet = await generateTestWallet(provider, [[50_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[200_000, baseAssetId]]); const factory = new ContractFactory(binHexlified, abiContents, wallet); @@ -1181,7 +1181,7 @@ describe('Contract', () => { FuelGaugeProjectsEnum.STORAGE_TEST_CONTRACT ); - const wallet = await generateTestWallet(provider, [[150_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[350_000, baseAssetId]]); const factory = new ContractFactory(binHexlified, abiContents, wallet); const storageContract = await factory.deployContract(); diff --git a/packages/fuel-gauge/src/doc-examples.test.ts b/packages/fuel-gauge/src/doc-examples.test.ts index 4c4fbbfc68..8349290309 100644 --- a/packages/fuel-gauge/src/doc-examples.test.ts +++ b/packages/fuel-gauge/src/doc-examples.test.ts @@ -231,9 +231,9 @@ describe('Doc Examples', () => { // validate balances expect(walletABalances).toEqual([{ assetId: baseAssetId, amount: bn(42) }]); expect(walletBBalances).toEqual([ - { assetId: baseAssetId, amount: bn(30) }, { assetId: assetIdA, amount: bn(100) }, { assetId: assetIdB, amount: bn(200) }, + { assetId: baseAssetId, amount: bn(30) }, ]); expect(walletCBalances).toEqual([]); }); diff --git a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts index 977de15a5f..4a691576bf 100644 --- a/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts +++ b/packages/fuel-gauge/src/dry-run-multiple-txs.test.ts @@ -48,24 +48,24 @@ describe('dry-run-multiple-txs', () => { const revertFactory = new ContractFactory(binRevert, abiRevert, wallet); const revertContract = await revertFactory.deployContract({ - maxFee: 15000, + maxFee: 70_000, }); const multiTokenFactory = new ContractFactory(binMultiToken, abiMultiToken, wallet); const multiTokenContract = await multiTokenFactory.deployContract({ - maxFee: 15000, + maxFee: 70_000, }); const logFactory = new ContractFactory(binLog, abiLog, wallet); const logContract = await logFactory.deployContract({ - maxFee: 15000, + maxFee: 70_000, }); const logOtherFactory = new ContractFactory(binLogOther, abiLogOther, wallet); const logOtherContract = await logOtherFactory.deployContract({ - maxFee: 15000, + maxFee: 70_000, }); return { revertContract, multiTokenContract, logContract, logOtherContract }; @@ -75,7 +75,7 @@ describe('dry-run-multiple-txs', () => { const revertFactory = new ContractFactory(binRevert, abiRevert, wallet); const revertContract = await revertFactory.deployContract({ - maxFee: 15000, + maxFee: 70_000, }); const resources = await wallet.getResourcesToSpend([[500_000, baseAssetId]]); diff --git a/packages/fuel-gauge/src/funding-transaction.test.ts b/packages/fuel-gauge/src/funding-transaction.test.ts index b920fe7937..d702b750df 100644 --- a/packages/fuel-gauge/src/funding-transaction.test.ts +++ b/packages/fuel-gauge/src/funding-transaction.test.ts @@ -19,7 +19,7 @@ describe(__filename, () => { provider = await Provider.create(FUEL_NETWORK_URL); baseAssetId = provider.getBaseAssetId(); mainWallet = Wallet.generate({ provider }); - await seedTestWallet(mainWallet, [[500_000, baseAssetId]]); + await seedTestWallet(mainWallet, [[200_000_000, baseAssetId]]); }); const fundingTxWithMultipleUTXOs = async ({ @@ -58,7 +58,7 @@ describe(__filename, () => { // 1500 splitted in 5 = 5 UTXOs of 300 each await fundingTxWithMultipleUTXOs({ account: sender, - totalAmount: 10_000, + totalAmount: 400_000, splitIn: 5, }); @@ -98,16 +98,16 @@ describe(__filename, () => { // 2000 splitted in 2 = 2 UTXOs of 1000 each await fundingTxWithMultipleUTXOs({ account: sender, - totalAmount: 2000, + totalAmount: 400_000, splitIn: 2, }); - // sender has 2 UTXOs for 1000 each, so it has enough resources to spend 1000 of baseAssetId + // sender has 2 UTXOs for 200_000 each, so it has enough resources to spend 1000 of baseAssetId const enoughtResources = await sender.getResourcesToSpend([[100, baseAssetId]]); // confirm we only fetched 1 UTXO from the expected amount expect(enoughtResources.length).toBe(1); - expect(enoughtResources[0].amount.toNumber()).toBe(1000); + expect(enoughtResources[0].amount.toNumber()).toBe(200_000); const request = new ScriptTransactionRequest({ gasLimit: 1_000, @@ -122,8 +122,8 @@ describe(__filename, () => { // TX request already carries enough resources, it does not need to be funded expect(request.inputs.length).toBe(1); - expect(bn((request.inputs[0]).amount).toNumber()).toBe(1000); - expect(txCost.maxFee.lt(1000)).toBeTruthy(); + expect(bn((request.inputs[0]).amount).toNumber()).toBe(200_000); + expect(txCost.maxFee.lt(200_000)).toBeTruthy(); const getResourcesToSpendSpy = vi.spyOn(sender, 'getResourcesToSpend'); @@ -148,10 +148,9 @@ describe(__filename, () => { const sender = Wallet.generate({ provider }); const receiver = Wallet.generate({ provider }); - // 5000 splitted in 10 = 10 UTXOs of 500 each await fundingTxWithMultipleUTXOs({ account: sender, - totalAmount: 10_000, + totalAmount: 200_000, splitIn: 1, }); @@ -243,8 +242,8 @@ describe(__filename, () => { const wallet2 = Wallet.generate({ provider }); // Define funding requirements and allocations - const totalInBaseAsset = 15_000; - const totalInAssetA = 20_000; + const totalInBaseAsset = 200_000; + const totalInAssetA = 50_000; const partiallyInAssetA = totalInAssetA / 2; /** @@ -314,9 +313,9 @@ describe(__filename, () => { // Funding the wallet with sufficient amounts for base and additional assets await seedTestWallet(fundedWallet, [ - [15_000, baseAssetId], - [15_000, assetA], - [15_000, assetB], + [300_000, baseAssetId], + [80_000, assetA], + [80_000, assetB], ]); let transactionRequest = new ScriptTransactionRequest(); diff --git a/packages/fuel-gauge/src/min-gas.test.ts b/packages/fuel-gauge/src/min-gas.test.ts index aaccb3bfc2..3896123799 100644 --- a/packages/fuel-gauge/src/min-gas.test.ts +++ b/packages/fuel-gauge/src/min-gas.test.ts @@ -29,10 +29,7 @@ describe(__filename, () => { }); it('sets gas requirements (contract)', async () => { - const wallet = Wallet.fromPrivateKey( - '0x0f44a619bf8c19f3eb903be38d1d26d36d08a10341e1a4282ffa87214da0cea8', - provider - ); + const wallet = Wallet.generate({ provider }); await seedTestWallet(wallet, [[500_000, baseAssetId]]); /** @@ -72,10 +69,7 @@ describe(__filename, () => { }); it('sets gas requirements (script)', async () => { - const sender = Wallet.fromPrivateKey( - '0x0f44a619bf8c19f3eb903be38d1d26d36d08a10341e1a4282ffa87214da0cea8', - provider - ); + const sender = Wallet.generate({ provider }); await seedTestWallet(sender, [[500_000, baseAssetId]]); /** @@ -160,10 +154,7 @@ describe(__filename, () => { /** * Setup account */ - const wallet = Wallet.fromPrivateKey( - '0x0f44a619bf8c19f3eb903be38d1d26d36d08a10341e1a4282ffa87214da0cea8', - provider - ); + const wallet = Wallet.generate({ provider }); await seedTestWallet(wallet, [[500_000, baseAssetId]]); /** diff --git a/packages/fuel-gauge/src/policies.test.ts b/packages/fuel-gauge/src/policies.test.ts index ceea2e6717..1bdf44bec1 100644 --- a/packages/fuel-gauge/src/policies.test.ts +++ b/packages/fuel-gauge/src/policies.test.ts @@ -171,7 +171,7 @@ describe('Policies', () => { tip: 11, witnessLimit: 2000, maturity: await randomMaturity(), - maxFee: 5000, + maxFee: 70_000, }; const { transactionRequest: txRequest } = factory.createTransactionRequest(txParams); @@ -207,7 +207,7 @@ describe('Policies', () => { tip: 5, maturity: await randomMaturity(), witnessLimit: randomNumber(800, 900), - maxFee: 3000, + maxFee: 70_000, }); const txRequest = await callScope.getTransactionRequest(); @@ -237,7 +237,7 @@ describe('Policies', () => { tip: 2, maturity: await randomMaturity(), witnessLimit: randomNumber(800, 900), - maxFee: 3000, + maxFee: 70_000, }); const txRequest = await callScope.getTransactionRequest(); @@ -259,7 +259,7 @@ describe('Policies', () => { tip: 4, maturity: await randomMaturity(), witnessLimit: randomNumber(800, 900), - maxFee: 3000, + maxFee: 70_000, }; const pendingTx = await wallet.transfer(receiver.address, 500, baseAssetId, txParams); @@ -287,7 +287,7 @@ describe('Policies', () => { tip: 1, maturity: await randomMaturity(), witnessLimit: randomNumber(800, 900), - maxFee: 3000, + maxFee: 70_000, }; const pendingTx = await wallet.transferToContract(contract.id, 500, baseAssetId, txParams); diff --git a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts index 73b4fd108e..0ea0510b70 100644 --- a/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts +++ b/packages/fuel-gauge/src/predicate-conditional-inputs.test.ts @@ -29,8 +29,8 @@ describe('PredicateConditionalInputs', () => { const amountToTransfer = 1000; const adminWallet = await generateTestWallet(provider, [ - [500_000, baseAssetId], - [500_000, ASSET_A], + [800_000, baseAssetId], + [800_000, ASSET_A], ]); const predicate = new Predicate({ @@ -41,12 +41,12 @@ describe('PredicateConditionalInputs', () => { }); // transfer asset A to predicate so it can transfer to alice - const tx1 = await adminWallet.transfer(predicate.address, 10_000, ASSET_A); + const tx1 = await adminWallet.transfer(predicate.address, 200_000, ASSET_A); await tx1.waitForResult(); // transfer base asset to Alice so she can pay the fees - const tx2 = await adminWallet.transfer(aliceWallet.address, 2105, baseAssetId); + const tx2 = await adminWallet.transfer(aliceWallet.address, 200_000, baseAssetId); await tx2.waitForResult(); @@ -119,12 +119,12 @@ describe('PredicateConditionalInputs', () => { }); // transfer asset A to predicate so it can transfer to alice - const tx1 = await adminWallet.transfer(predicate.address, 10_000, ASSET_A); + const tx1 = await adminWallet.transfer(predicate.address, 200_000, ASSET_A); await tx1.waitForResult(); // transfer base asset to predicate so it can pay the fees - const tx2 = await adminWallet.transfer(predicate.address, 10_000, baseAssetId); + const tx2 = await adminWallet.transfer(predicate.address, 200_000, baseAssetId); await tx2.waitForResult(); diff --git a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts index fc37b8c602..b7dbf67154 100644 --- a/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-arguments.test.ts @@ -31,7 +31,7 @@ describe('Predicate', () => { let provider: Provider; let baseAssetId: string; const amountToReceiver = 50; - const amountToPredicate = 4000; + const amountToPredicate = 300_000; beforeAll(async () => { provider = await Provider.create(FUEL_NETWORK_URL); diff --git a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts index 9e0cfbeaa0..9b20a5fb78 100644 --- a/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-configurables.test.ts @@ -18,7 +18,7 @@ describe('Predicate', () => { describe('Configurables', () => { let wallet: WalletUnlocked; - const amountToPredicate = 2000; + const amountToPredicate = 300_000; let baseAssetId: string; const defaultValues = { @@ -32,7 +32,7 @@ describe('Predicate', () => { const quantities: CoinQuantityLike[] = [ { - amount: 1_000_000, + amount: 100_000_000, assetId: baseAssetId, }, ]; diff --git a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts index 759d9632a8..1198941607 100644 --- a/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-estimations.test.ts @@ -173,7 +173,7 @@ describe('Predicate', () => { FuelGaugeProjectsEnum.PREDICATE_VALIDATE_TRANSFER ); - const amountToPredicate = 10_000; + const amountToPredicate = 200_000; const predicate = new Predicate<[BN]>({ bytecode: binHexlified, diff --git a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts index 041539144f..13318c277a 100644 --- a/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-input-data.test.ts @@ -27,7 +27,7 @@ describe('Predicate', () => { }); it('throws invalid transaction when input_predicate_data is required for predicate validation', async () => { - const amountToPredicate = 1000; + const amountToPredicate = 200_000; const amountToReceiver = 50; predicate = new Predicate({ bytecode: binHexlified, diff --git a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts index 38695c2ff3..134f485199 100644 --- a/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-populate-witness.test.ts @@ -77,13 +77,13 @@ describe('Predicate', () => { await seedTestWallet( [wallet1, wallet2, wallet3, predicate1, predicate2], - [[120_000, baseAssetId]], + [[500_000_000, baseAssetId]], UTXOS_AMOUNT ); }); it('should properly populate predicate data and remove placeholder witness [CASE 1]', async () => { - let transactionRequest = new ScriptTransactionRequest({ gasLimit: 2000, maxFee: bn(0) }); + let transactionRequest = new ScriptTransactionRequest(); transactionRequest.addCoinOutput(receiver.address, 100, baseAssetId); const predicate1WrongResources = await provider.getResourcesToSpend( @@ -103,10 +103,8 @@ describe('Predicate', () => { // The predicate resource witness placeholder was removed expect(transactionRequest.witnesses.length).toBe(0); - const { gasLimit, maxFee } = await provider.estimateTxGasAndFee({ transactionRequest }); - - transactionRequest.gasLimit = gasLimit; - transactionRequest.maxFee = maxFee; + transactionRequest.gasLimit = bn(100_000); + transactionRequest.maxFee = bn(120_000); const tx = await provider.sendTransaction(transactionRequest); @@ -137,11 +135,8 @@ describe('Predicate', () => { transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); - const { gasLimit, maxFee } = await provider.estimateTxGasAndFee({ transactionRequest }); - - transactionRequest.gasLimit = gasLimit; - transactionRequest.maxFee = maxFee; - + transactionRequest.gasLimit = bn(100_000); + transactionRequest.maxFee = bn(120_000); // The predicate resource witness placeholder was removed expect(transactionRequest.witnesses.length).toBe(1); @@ -185,10 +180,8 @@ describe('Predicate', () => { transactionRequest = predicate1.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); - const { gasLimit, maxFee } = await provider.estimateTxGasAndFee({ transactionRequest }); - - transactionRequest.gasLimit = gasLimit; - transactionRequest.maxFee = maxFee; + transactionRequest.gasLimit = bn(160_000); + transactionRequest.maxFee = bn(180_000); // The predicate resource witness placeholder was removed expect(transactionRequest.witnesses.length).toBe(2); @@ -248,10 +241,8 @@ describe('Predicate', () => { transactionRequest = predicate2.populateTransactionPredicateData(transactionRequest); transactionRequest = await provider.estimatePredicates(transactionRequest); - const { gasLimit, maxFee } = await provider.estimateTxGasAndFee({ transactionRequest }); - - transactionRequest.gasLimit = gasLimit; - transactionRequest.maxFee = maxFee; + transactionRequest.gasLimit = bn(250_000); + transactionRequest.maxFee = bn(270_000); // The predicate resource witness placeholder was removed expect(transactionRequest.witnesses.length).toBe(3); diff --git a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts index 0840fcc357..2038a63bc7 100644 --- a/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts +++ b/packages/fuel-gauge/src/predicate/predicate-with-script.test.ts @@ -1,12 +1,10 @@ -import { generateTestWallet } from '@fuel-ts/account/test-utils'; +import { generateTestWallet, seedTestWallet } from '@fuel-ts/account/test-utils'; import type { BigNumberish, WalletUnlocked } from 'fuels'; import { toNumber, Script, Provider, Predicate, FUEL_NETWORK_URL } from 'fuels'; import { FuelGaugeProjectsEnum, getFuelGaugeForcProject } from '../../test/fixtures'; import type { Validation } from '../types/predicate'; -import { fundPredicate } from './utils/predicate'; - /** * @group node */ @@ -48,8 +46,8 @@ describe('Predicate', () => { ); // setup predicate - const amountToPredicate = 10_000; - const amountToReceiver = 2000; + const amountToPredicate = 900_000; + const amountToReceiver = 100_000; const predicate = new Predicate<[Validation]>({ bytecode: predicateBytesStruct, provider, @@ -62,7 +60,7 @@ describe('Predicate', () => { ], }); - await fundPredicate(wallet, predicate, amountToPredicate); + await seedTestWallet(predicate, [[amountToPredicate, baseAssetId]], 3); // executing predicate to transfer resources to receiver const tx = await predicate.transfer(receiver.address, amountToReceiver, baseAssetId, { diff --git a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts b/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts index 6a1fd2098b..79961b7c77 100644 --- a/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts +++ b/packages/fuel-gauge/src/predicate/utils/predicate/setupWallets.ts @@ -5,7 +5,7 @@ import { Address, FUEL_NETWORK_URL, Provider } from 'fuels'; export const setupWallets = async () => { const provider = await Provider.create(FUEL_NETWORK_URL); const baseAssetId = provider.getBaseAssetId(); - const wallet = await generateTestWallet(provider, [[5_000_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[100_000_000_000, baseAssetId]]); const receiver = Wallet.fromAddress(Address.fromRandom(), provider); return [wallet, receiver] as const; }; diff --git a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts index afa6a277b0..9665fd8df1 100644 --- a/packages/fuel-gauge/src/reentrant-contract-calls.test.ts +++ b/packages/fuel-gauge/src/reentrant-contract-calls.test.ts @@ -20,7 +20,7 @@ describe('Reentrant Contract Calls', () => { beforeAll(async () => { const provider = await Provider.create(FUEL_NETWORK_URL); baseAssetId = provider.getBaseAssetId(); - wallet = await generateTestWallet(provider, [[200_000, baseAssetId]]); + wallet = await generateTestWallet(provider, [[500_000, baseAssetId]]); const factoryBar = new ContractFactory(bar.binHexlified, bar.abiContents, wallet); barContract = await factoryBar.deployContract(); diff --git a/packages/fuel-gauge/src/transaction-summary.test.ts b/packages/fuel-gauge/src/transaction-summary.test.ts index 1b0e4c2cf4..4ca4af7b3a 100644 --- a/packages/fuel-gauge/src/transaction-summary.test.ts +++ b/packages/fuel-gauge/src/transaction-summary.test.ts @@ -202,7 +202,7 @@ describe('TransactionSummary', () => { }; it('should ensure transfer operation is assembled (ACCOUNT TRANSFER)', async () => { - const wallet = await generateTestWallet(provider, [[50_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); const recipient = Wallet.generate({ provider }); @@ -227,7 +227,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operation is assembled (ACCOUNT TRANSFER TO CONTRACT)', async () => { const wallet = await generateTestWallet(provider, [ - [50_000, baseAssetId], + [300_000, baseAssetId], [10_000, ASSET_A], ]); @@ -251,7 +251,7 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO ACCOUNT)', async () => { - const wallet = await generateTestWallet(provider, [[50_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); const contract = await setupContract(); contract.account = wallet; @@ -282,7 +282,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operations are assembled (CONTRACT TRANSFER TO ACCOUNTS)', async () => { const wallet = await generateTestWallet(provider, [ - [50_000, baseAssetId], + [300_000, baseAssetId], [50_000, ASSET_A], [50_000, ASSET_B], ]); @@ -342,7 +342,7 @@ describe('TransactionSummary', () => { }); it('should ensure transfer operation is assembled (CONTRACT TRANSFER TO CONTRACT)', async () => { - const wallet = await generateTestWallet(provider, [[50_000, baseAssetId]]); + const wallet = await generateTestWallet(provider, [[300_000, baseAssetId]]); const contractSender = await setupContract({ cache: false }); contractSender.account = wallet; @@ -376,7 +376,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operations are assembled (CONTRACT TRANSFER TO CONTRACTS)', async () => { const wallet = await generateTestWallet(provider, [ - [60_000, baseAssetId], + [300_000, baseAssetId], [60_000, ASSET_A], [60_000, ASSET_B], ]); @@ -440,7 +440,7 @@ describe('TransactionSummary', () => { it('should ensure transfer operations are assembled (CUSTOM SCRIPT TRANSFER)', async () => { const wallet = await generateTestWallet(provider, [ - [50_000, baseAssetId], + [200_000, baseAssetId], [10_000, ASSET_A], [10_000, ASSET_B], ]); diff --git a/packages/fuel-gauge/src/utils.ts b/packages/fuel-gauge/src/utils.ts index 855cbaf6d4..ecf09da712 100644 --- a/packages/fuel-gauge/src/utils.ts +++ b/packages/fuel-gauge/src/utils.ts @@ -26,8 +26,8 @@ export const createWallet = async () => { const provider = await Provider.create(FUEL_NETWORK_URL); const baseAssetId = provider.getBaseAssetId(); walletInstance = await generateTestWallet(provider, [ - [5_000_000, baseAssetId], - [5_000_000, ASSET_A], + [500_000_000, baseAssetId], + [500_000_000, ASSET_A], ]); return walletInstance; }; diff --git a/packages/utils/src/utils/defaultSnapshots/chainConfig.json b/packages/utils/src/utils/defaultSnapshots/chainConfig.json index 81083c0945..ff86d200f6 100644 --- a/packages/utils/src/utils/defaultSnapshots/chainConfig.json +++ b/packages/utils/src/utils/defaultSnapshots/chainConfig.json @@ -7,8 +7,8 @@ "max_inputs": 255, "max_outputs": 255, "max_witnesses": 255, - "max_gas_per_tx": 30000000, - "max_size": 112640, + "max_gas_per_tx": 100000000, + "max_size": 262144, "max_bytecode_subsections": 256 } }, @@ -17,7 +17,7 @@ "max_predicate_length": 102400, "max_predicate_data_length": 102400, "max_message_data_length": 102400, - "max_gas_per_predicate": 30000000 + "max_gas_per_predicate": 100000000 } }, "script_params": { @@ -28,7 +28,7 @@ }, "contract_params": { "V1": { - "contract_max_size": 102400, + "contract_max_size": 262144, "max_storage_slots": 1760 } }, @@ -43,53 +43,53 @@ "V1": { "add": 2, "addi": 2, - "aloc": 1, + "aloc": 2, "and": 2, "andi": 2, - "bal": 366, + "bal": 86, "bhei": 2, "bhsh": 2, - "burn": 33949, + "burn": 25770, "cb": 2, "cfei": 2, "cfsi": 2, "div": 2, "divi": 2, - "eck1": 3347, - "ecr1": 46165, - "ed19": 4210, + "eck1": 3114, + "ecr1": 42270, + "ed19": 2878, "eq": 2, "exp": 2, "expi": 2, "flag": 1, "gm": 2, "gt": 2, - "gtf": 16, + "gtf": 12, "ji": 2, "jmp": 2, "jne": 2, "jnei": 2, "jnzi": 2, - "jmpf": 2, - "jmpb": 2, - "jnzf": 2, - "jnzb": 2, - "jnef": 2, - "jneb": 2, + "jmpf": 1, + "jmpb": 1, + "jnzf": 1, + "jnzb": 1, + "jnef": 1, + "jneb": 1, "lb": 2, - "log": 754, + "log": 165, "lt": 2, "lw": 2, - "mint": 35718, + "mint": 29024, "mlog": 2, - "mod": 2, + "mod_op": 2, "modi": 2, - "move": 2, + "move_op": 2, "movi": 2, - "mroo": 5, + "mroo": 4, "mul": 2, "muli": 2, - "mldv": 4, + "mldv": 3, "noop": 1, "not": 2, "or": 2, @@ -98,168 +98,168 @@ "popl": 3, "pshh": 4, "pshl": 4, - "ret_contract": 733, - "rvrt_contract": 722, + "ret": 134, + "rvrt": 153, "sb": 2, "sll": 2, "slli": 2, "srl": 2, "srli": 2, - "srw": 253, + "srw": 209, "sub": 2, "subi": 2, "sw": 2, - "sww": 29053, - "time": 79, - "tr": 46242, - "tro": 33251, - "wdcm": 3, + "sww": 22501, + "time": 50, + "tr": 33912, + "tro": 24294, + "wdcm": 2, "wqcm": 3, "wdop": 3, "wqop": 3, "wdml": 3, "wqml": 4, "wddv": 5, - "wqdv": 7, - "wdmd": 11, - "wqmd": 18, + "wqdv": 6, + "wdmd": 10, + "wqmd": 17, "wdam": 9, - "wqam": 12, - "wdmm": 11, - "wqmm": 11, + "wqam": 11, + "wdmm": 10, + "wqmm": 10, "xor": 2, "xori": 2, "call": { "LightOperation": { - "base": 21687, - "units_per_gas": 4 + "base": 18190, + "units_per_gas": 5 } }, "ccp": { "LightOperation": { - "base": 59, - "units_per_gas": 20 + "base": 48, + "units_per_gas": 22 } }, "croo": { "LightOperation": { - "base": 1, - "units_per_gas": 1 + "base": 131, + "units_per_gas": 2 } }, "csiz": { "LightOperation": { - "base": 59, - "units_per_gas": 195 + "base": 45, + "units_per_gas": 237 } }, "k256": { "LightOperation": { - "base": 282, + "base": 37, "units_per_gas": 3 } }, "ldc": { "LightOperation": { - "base": 45, - "units_per_gas": 65 + "base": 39, + "units_per_gas": 68 } }, "logd": { "LightOperation": { - "base": 1134, + "base": 565, "units_per_gas": 2 } }, "mcl": { "LightOperation": { "base": 3, - "units_per_gas": 523 + "units_per_gas": 564 } }, "mcli": { "LightOperation": { "base": 3, - "units_per_gas": 526 + "units_per_gas": 560 } }, "mcp": { "LightOperation": { - "base": 3, - "units_per_gas": 448 + "base": 4, + "units_per_gas": 185 } }, "mcpi": { "LightOperation": { - "base": 7, - "units_per_gas": 585 + "base": 9, + "units_per_gas": 455 } }, "meq": { "LightOperation": { - "base": 11, - "units_per_gas": 1097 + "base": 3, + "units_per_gas": 766 } }, - "retd_contract": { + "retd": { "LightOperation": { - "base": 1086, - "units_per_gas": 2 + "base": 485, + "units_per_gas": 3 } }, "s256": { "LightOperation": { - "base": 45, + "base": 42, "units_per_gas": 3 } }, "scwq": { "HeavyOperation": { - "base": 30375, - "gas_per_unit": 28628 + "base": 21672, + "gas_per_unit": 22146 } }, "smo": { "LightOperation": { - "base": 64196, + "base": 44437, "units_per_gas": 1 } }, "srwq": { "HeavyOperation": { - "base": 262, - "gas_per_unit": 249 + "base": 239, + "gas_per_unit": 234 } }, "swwq": { "HeavyOperation": { - "base": 28484, - "gas_per_unit": 26613 + "base": 22724, + "gas_per_unit": 21231 } }, "contract_root": { "LightOperation": { - "base": 45, - "units_per_gas": 1 + "base": 42, + "units_per_gas": 2 } }, "state_root": { "HeavyOperation": { - "base": 350, - "gas_per_unit": 176 + "base": 323, + "gas_per_unit": 169 } }, "new_storage_per_byte": 63, "vm_initialization": { - "LightOperation": { - "base": 1645, - "units_per_gas": 14 + "HeavyOperation": { + "base": 5254820, + "gas_per_unit": 0 } } } }, - "base_asset_id": "0000000000000000000000000000000000000000000000000000000000000000", - "block_gas_limit": 30000000, + "base_asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07", + "block_gas_limit": 100000000, "privileged_address": "0000000000000000000000000000000000000000000000000000000000000000" } }, diff --git a/packages/utils/src/utils/defaultSnapshots/stateConfig.json b/packages/utils/src/utils/defaultSnapshots/stateConfig.json index 647e563991..3decf7905a 100644 --- a/packages/utils/src/utils/defaultSnapshots/stateConfig.json +++ b/packages/utils/src/utils/defaultSnapshots/stateConfig.json @@ -7,7 +7,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x94ffcc53b892684acefaebc8a3d4a595e528a8cf664eeb3ef36f1020b0809d0d", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x2a757c2317236f7883ac9bbbf7d402f034e0b725c544ef1c8725b1d2bd960f8c690f", @@ -16,7 +16,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x09c0b2d1a486c439a87bcba6b46a7a1a23f3897cc83a94521a96da5c23bc58db", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x634ef6cda00bac63992bbde80c6d694d484d58025a5ca0c9c848f0d35a5a3eee74b2", @@ -43,7 +43,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x5d99ee966b42cd8fc7bdd1364b389153a9e78b42b7d4a691470674e817888d4e", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xc197cb09b1d89a7862b238e9500631bd43f291aadb7ff55c8129335349634e9fde3f", @@ -70,7 +70,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbdaad6a89e073e177895b3e5a9ccd15806749eda134a6438dae32fc5b6601f3f", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x1b9bdaa290518373eb905e45ce7fcb89acedd24341ca7749ad47a938e4bf3ca9b7ce", @@ -97,7 +97,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x95a7aa6cc32743f8706c40ef49a7423b47da763bb4bbc055b1f07254dc729036", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xf8f00a234cf3fbab86befc3fd9346d7fd1ac085233c9cb58c7447f30c75cbf87ed38", @@ -124,7 +124,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xcee104acd38b940c8f1c62c6d7ea00a0ad2241d6dee0509a4bf27297508870d3", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xfeb4f2388fa22e6613ff85cf4e655f58acdfaa6299eba7f93b812cd1f0d7bbac48f0", @@ -151,7 +151,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x7e3626e306588eba79cafab73f0709e55ab8f4bdfe8c8b75034a430fc56ece89", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x28131b9acc90c2058ee14f4094a474146ba5b779cb9021867164b3d41abad3d047a7", @@ -178,7 +178,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x1c31df52b6df56407dd95f83082e8beb9cfc9532ac111d5bd8491651d95ba775", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x447a7c37aee972dcba72f05255c5145dd63125f0fc46ef98c216f775ee0421e23d2b", @@ -205,7 +205,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x09dd7a49174d6fcc9f4c6f7942c18060a935ddd03ee69b594189b8c3581276ea", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x0a6e3585881ef2edf3f7727762799089dc0b5923e8b3718b49044dd9ddcb33b68459", @@ -232,7 +232,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x86604282dc604481b809845be49667607c470644f6822fc01eb0d22f167e08cf", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xbf2305d284ea95227040df4cc727156cccc2ca6aa3b92ed86fea4db1c37e5905f926", @@ -259,7 +259,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbca334a06d19db5041c78fe2f465b07be5bec828f38b7796b2877e7d1542c950", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x978d5b6be047ffbf1474dc376a6baa33264629b809e4a8210d11aaa805ec6451585d", @@ -286,7 +286,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xbd9a1dc8d3ec3521c43f6c2c01611b4d0204c7610204ff0178488c8738a30bd2", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xb353fbcd94abba347f3ba25e17744e98da26e608ebccbbbd2e9d004997644bdf993c", @@ -313,7 +313,7 @@ "tx_pointer_tx_idx": 0, "owner": "0xb32197cf75efe05bf453c26178139f09b391582065549c1422bc92555ecffb64", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xa952c0487eefac5dda612011c4c82554c8660834461b9b815c6ae257b56b68005235", @@ -340,7 +340,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x3b24509ed4ab3c7959f5c9391c1445c59290cdb5f13d6f780922f376b7029f30", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x508871600ef68c4f1e021dd0db219c733107151338aa95de530bd10dc61f6a69c144", @@ -367,7 +367,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x77c6f40b7da70d885f68efaad7c661327482a63ea10dcb4271de819438254ae1", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x9ddea761afc31516307e1553647ac6cc26d4a82fed9a9e6a03b994cdbf2293b3e3b6", @@ -394,7 +394,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x6a2c4691c547c43924650dbd30620b184b5fe3fb6dbe5c4446110b08f6f405bf", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0x708ee45d18f94ab06458712745c92c7b9b6049ba345219d6697eae5208ec0328aeaf", @@ -421,7 +421,7 @@ "tx_pointer_tx_idx": 0, "owner": "0x49075a7538e2c88ebe1926ce4d898198a2a4e790d14512943a9864bc536b3c82", "amount": 18446744073709551615, - "asset_id": "0x0000000000000000000000000000000000000000000000000000000000000000" + "asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07" }, { "tx_id": "0xfa82dbdd72252d1e6c76ee818bbac0441c3a705aff447f041c8b9fc3cb03f9ccd7e2",