refactor: get smart contract address from Instantiated event

Author: AlexD10S

packages/api-contract/src/base/Blueprint.ts

@@ -71,23 +71,10 @@ export class Blueprint<ApiType extends ApiTypes> extends Base<ApiType> {
       this.abi.findConstructor(constructorOrId).toU8a(params),
       encodeSalt(salt)
     ).withResultTransform((result: ISubmittableResult) =>
-      new BlueprintSubmittableResult(result,
-        this._isRevive
-          ? (
-            (result.status.isInBlock || result.status.isFinalized)
-              ? new Contract<ApiType>(
-                this.api,
-                this.abi,
-                // your fixed address for revive deployments
-                this.registry.createType('AccountId', '0x'),
-                this._decorateMethod
-              )
-              : undefined
+      new BlueprintSubmittableResult(result, applyOnEvent(result, ['Instantiated'], ([record]: EventRecord[]) =>
+              new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod), this._isRevive
+            )
           )
-          : applyOnEvent(result, ['Instantiated'], ([record]: EventRecord[]) =>
-            new Contract<ApiType>(this.api, this.abi, record.event.data[1] as AccountId, this._decorateMethod), this._isRevive
-          )
-      )
     );
   };
 }

packages/api-contract/src/base/Code.ts

@@ -85,8 +85,24 @@ export class Code<ApiType extends ApiTypes> extends Base<ApiType> {
       ).withResultTransform((result: ISubmittableResult) =>
         new CodeSubmittableResult(
           result,
-          new Blueprint<ApiType>(this.api, this.abi, this.abi.info.source.hash, this._decorateMethod),
-          new Contract<ApiType>(this.api, this.abi, '0x', this._decorateMethod)
+          ...(applyOnEvent(result, ['Instantiated'], (records: EventRecord[]) =>
+            records.reduce<[Blueprint<ApiType> | undefined, Contract<ApiType> | undefined]>(
+              ([blueprint, contract], { event }) =>
+                this.api.events.revive['Instantiated'].is(event)
+                  ? [
+                    blueprint,
+                      new Contract<ApiType>(
+                        this.api,
+                        this.abi,
+                        (event as unknown as { data: [Codec, AccountId] }).data[1],
+                        this._decorateMethod
+                      )
+                    ]
+                  : [blueprint, contract],
+              [undefined, undefined]
+            ),
+            this._isRevive
+          ) || [undefined, undefined])
         )
       );
     }