Merge pull request #1851 from aeternity/feature/fix-fallback-account

fix(contract): use fallback account if `onAccount` not provided
aeternity · Jul 4, 2023 · 2e5e20e · 2e5e20e
2 parents 4e70e21 + 9033cd7
commit 2e5e20e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/contract/Contract.ts b/src/contract/Contract.ts
@@ -324,6 +324,7 @@ class Contract<M extends ContractMethodsBase> {
       const useFallbackAccount = callStatic === true && (
         (error instanceof TypeError && error.message === 'Account should be an address (ak-prefixed string), or instance of AccountBase, got undefined instead')
         || (error instanceof NoWalletConnectedError)
+        || (error instanceof InternalError && error.message === 'Use fallback account')
       );
       if (!useFallbackAccount) throw error;
       callerId = DRY_RUN_ACCOUNT.pub;

diff --git a/test/integration/contract-aci.ts b/test/integration/contract-aci.ts
@@ -269,6 +269,14 @@ describe('Contract instance', () => {
     expect(res.tx.fee).to.be.equal('182000000000000');
   });
 
+  it('calls with fallback account if onAccount is not provided', async () => {
+    const account = testContract.$options.onAccount;
+    delete testContract.$options.onAccount;
+    const res = await testContract.intFn(2);
+    expect(res.decodedResult).to.be.equal(2n);
+    testContract.$options.onAccount = account;
+  });
+
   it('calls on chain', async () => {
     const res = await testContract.intFn(2, { callStatic: false });
     expect(res.decodedResult).to.be.equal(2n);