npm - dequanto - Versions diffs - 0.1.68 → 0.1.71 - Mend

dequanto 0.1.68 → 0.1.71

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/lib/cjs/contracts/deploy/Deployments.js +4 -2
package/lib/cjs/contracts/deploy/Deployments.js.map +1 -1
package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js +8 -2
package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
package/lib/cjs/evm/OpcodesWalker.js +2 -2
package/lib/cjs/evm/OpcodesWalker.js.map +1 -1
package/lib/cjs/evm/utils/$bytecode.js +19 -8
package/lib/cjs/evm/utils/$bytecode.js.map +1 -1
package/lib/esm/contracts/deploy/Deployments.js.map +1 -1
package/lib/esm/contracts/deploy/Deployments.mjs +4 -2
package/lib/esm/contracts/deploy/proxy/ProxyDeployment.js.map +1 -1
package/lib/esm/contracts/deploy/proxy/ProxyDeployment.mjs +8 -2
package/lib/esm/evm/OpcodesWalker.js.map +1 -1
package/lib/esm/evm/OpcodesWalker.mjs +2 -2
package/lib/esm/evm/utils/$bytecode.js.map +1 -1
package/lib/esm/evm/utils/$bytecode.mjs +19 -8
package/package.json +1 -1
package/src/contracts/deploy/Deployments.ts +4 -2
package/src/contracts/deploy/proxy/ProxyDeployment.ts +10 -2
package/src/evm/OpcodesWalker.ts +2 -2
package/src/evm/utils/$bytecode.ts +23 -9

package/lib/cjs/contracts/deploy/Deployments.js CHANGED Viewed

@@ -29,11 +29,13 @@ class Deployments {
         });
         this._hh = new HardhatProvider_1.HardhatProvider();
         this._config = {
-            TransparentProxy: {}
+            TransparentProxy: {},
+            Beacon: {}
         };
         this._config.TransparentProxy.Proxy = opts?.Proxy;
         this._config.TransparentProxy.ProxyAdmin = opts?.ProxyAdmin;
-        this._config.Beacon = opts?.Beacon;
+        this._config.Beacon.Beacon = opts?.Beacon?.Beacon;
+        this._config.Beacon.BeaconProxy = opts?.Beacon?.BeaconProxy;
         this.store = new DeploymentsStorage_1.DeploymentsStorage(client, deployer, opts);
         this._proxyDeployment = new ProxyDeployment_1.ProxyDeployment(this.store, this._config);
         if (opts?.fork) {

package/lib/cjs/contracts/deploy/Deployments.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}

package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js CHANGED Viewed

@@ -120,7 +120,7 @@ class ProxyDeployment {
         const deps = {
             TransparentUpgradeableProxy: `@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol`,
             ProxyAdmin: `@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol`,
-            Beacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
+            UpgradeableBeacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
             BeaconProxy: `@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol`,
         };
         const paths = {
@@ -137,7 +137,8 @@ class ProxyDeployment {
                 source: `${baseSource}/beacon/UpgradeableBeacon.sol`,
                 output: `${baseOutput}/Beacon.sol`,
                 template: `
-                    import \"${deps.Beacon}\";
+                    import \"${deps.UpgradeableBeacon}\";
+                    import \"${deps.BeaconProxy}\";
                 `,
                 //install: `UpgradeableBeacon,BeaconProxy`,
                 contracts: [`UpgradeableBeacon`, `BeaconProxy`],
@@ -180,6 +181,11 @@ class ProxyDeployment {
         let { client } = deployments;
         let { address: implAddress, initData } = ctx.implementation;
         let { Beacon, BeaconProxy, } = ctx.Beacon ?? this.opts.Beacon;
+        if (Beacon == null) {
+            let internal = await this.getOpenzeppelinUpgradable({ beacon: true, proxy: false });
+            BeaconProxy = internal.BeaconProxy;
+            Beacon = internal.UpgradeableBeacon;
+        }
         _require_1.$require.notNull(Beacon, 'Beacon is required');
         _require_1.$require.notNull(BeaconProxy, 'BeaconProxy is required');
         let ozVersion = this.getOzVersionByBeacon(Beacon);

package/lib/cjs/contracts/deploy/proxy/ProxyDeployment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}

package/lib/cjs/evm/OpcodesWalker.js CHANGED Viewed

@@ -106,8 +106,8 @@ class OpcodesWalker {
             if (typeof dest === 'number') {
                 let opcode = this.opcodes.find(x => x.pc === dest);
                 if (opcode == null) {
-                    console.log(this.opcodes.map(x => `${x.pc.toString(16)} ${x.name}`).join('\n'));
-                    throw new Error(`No OPCODE found at ${dest.toString(16)}`);
+                    console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
+                    throw new Error(`No OPCODE found at ${dest}`);
                 }
                 this.current = opcode;
                 this.evm.pc = this.current.pc;

package/lib/cjs/evm/OpcodesWalker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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~~CAAC,QAAQ,CAAC,EAAE,CAAC,~~IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;~~oBAChF~~,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,~~CAAC,QAAQ,CAAC,~~EAAE,CAAC,~~EAAE,~~CAAC~~,CAAC~~;~~iBAC9D~~;gBACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;gBACtB,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;aACvB;SACJ;QACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAjID,sCAiIC;AAED,IAAiB,QAAQ,CAkBxB;AAlBD,WAAiB,QAAQ;IACrB,SAAgB,MAAM,CAAE,MAAe,EAAE,IAAwB;QAC7D,IAAI,MAAM,IAAI,IAAI,EAAE;YAChB,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAChC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IATe,eAAM,SASrB,CAAA;IAED,MAAM,KAAK,GAAG;QACV,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,WAAW;QACnB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,WAAW;KACxB,CAAC;AACN,CAAC,EAlBgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAkBxB"}
1	+ {"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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"}

package/lib/cjs/evm/utils/$bytecode.js CHANGED Viewed

@@ -11,9 +11,11 @@ var $bytecode;
      * remove the constructor code, leave the runtime bytecode only
      */
     function trimConstructorCode(code) {
-        let initCode = code.indexOf('60806040', 4);
-        if (initCode > -1) {
-            code = `0x${code.substring(initCode)}`;
+        let rgx = /6080(\d\d)?6040/g;
+        rgx.lastIndex = 4;
+        let initCode = rgx.exec(code);
+        if (initCode != null) {
+            code = `0x${code.substring(initCode.index)}`;
         }
         return code;
     }
@@ -39,8 +41,9 @@ var $bytecode;
          */
         // match 60806040 the beginning of the contract code
         let ctorCodeIdx = indexOf(opcodes, [
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x40,
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
+            { match: (op) => op.opcode === 0x80, optional: true },
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
         ], 2);
         let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
         if (codeSizeIdx === -1 || codeSizeIdx > ctorCodeIdx) {
@@ -48,6 +51,9 @@ var $bytecode;
             return { arguments: null };
         }
         let prev = opcodes[codeSizeIdx - 1];
+        if (/PUSH/.test(prev.name) === false) {
+            prev = opcodes[codeSizeIdx - 2];
+        }
         _require_1.$require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
         let codeSizeValue = _buffer_1.$buffer.toBigInt(prev.pushData) * 2n;
         return {
@@ -57,11 +63,16 @@ var $bytecode;
     $bytecode.parseContractCreation = parseContractCreation;
     function indexOf(opcodes, matchers, startIdx = 0) {
         outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
-            for (let j = 0; j < matchers.length; j++) {
-                let op = opcodes[i + j];
-                if (matchers[j](op, i + j) === false) {
+            let cursor = 0;
+            inner: for (let j = 0; j < matchers.length; j++) {
+                let op = opcodes[i + cursor];
+                if (matchers[j].match(op, i + cursor) === false) {
+                    if (matchers[j].optional) {
+                        continue inner;
+                    }
                     continue outer;
                 }
+                cursor++;
             }
             return i;
         }

package/lib/cjs/evm/utils/$bytecode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":";;;AAEA,gDAA6C;AAC7C,uDAAoD;AACpD,qDAAkD;AAClD,+CAA4C;AAE5C,IAAiB,SAAS,~~CAoEzB~~;~~AApED~~,WAAiB,SAAS;IAEtB;;OAEG;IACH,SAAgB,mBAAmB,CAAE,IAAc;QAC/C,IAAI,~~QAAQ~~,GAAG,~~IAAI~~,CAAC,~~OAAO~~,CAAC,~~UAAU~~,~~EAAE~~,CAAC,CAAC~~,CAAC~~;~~QAC3C~~,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE;~~YACf~~,IAAI,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;~~SAC1C~~;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;~~IANe~~,6BAAmB,~~sBAMlC~~,CAAA;IAED,SAAgB,eAAe,CAAE,IAAc;QAC3C,IAAI,SAAS,GAAG,WAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,kBAAkB,GAAG,SAAS,GAAG,CAAC,CAAC;QACvC,IAAI,YAAY,GAAG,WAAI,CAAC,SAAS,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,WAAW,GAAG,WAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,kBAAkB,GAAG,YAAY,CAAC,CAAC;QAC5E,IAAI,WAAW,GAAG,WAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,GAAG,YAAY,EAAE,YAAY,CAAC,CAAC;QACvF,OAAO;YACH,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,WAAW;SACxB,CAAC;IACN,CAAC;IAVe,yBAAe,kBAU9B,CAAA;IAED,SAAgB,qBAAqB,CAAC,KAAe;QAEjD,IAAI,GAAG,GAAG,IAAI,yBAAW,CAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,IAAI,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QAE/B;;;WAGG;QAEH,oDAAoD;QACpD,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE;YAC/B,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;YACrD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;~~SACxD~~,EAAE,CAAC,CAAC,CAAC;QAEN,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAChE,IAAI,WAAW,KAAK,CAAC,CAAC,IAAI,WAAW,GAAG,WAAW,EAAE;YACjD,mEAAmE;YACnE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;SAC7B;QAED,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;QACpC,mBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,yBAAyB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,IAAI,aAAa,GAAG,iBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzD,OAAO;YACH,SAAS,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAa;SACpF,CAAC;IACN,CAAC;~~IA7Be~~,+BAAqB,~~wBA6BpC~~,CAAA;IAED,SAAS,OAAO,CAAC,OAAkB,EAAE,~~QAAkD~~,EAAE,WAAmB,CAAC;~~QACzG~~,KAAK,EAAE,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;~~gBACtC~~,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,~~CAAC~~,CAAC,CAAC;~~gBACxB~~,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,~~CAAC~~,CAAC,KAAK,KAAK,EAAE;~~oBAClC~~,SAAS,KAAK,CAAC;iBAClB;~~aACJ~~;YACD,OAAO,CAAC,CAAC;SACZ;QACD,OAAO,CAAC,CAAC,CAAC;IACd,CAAC;AACL,CAAC,~~EApEgB~~,SAAS,GAAT,iBAAS,KAAT,iBAAS,~~QAoEzB~~"}
1	+ {"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/deploy/Deployments.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"Deployments.js","sourceRoot":"","sources":["../../../../src/contracts/deploy/Deployments.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/deploy/Deployments.mjs CHANGED Viewed

@@ -23,11 +23,13 @@ export class Deployments {
         });
         this._hh = new HardhatProvider();
         this._config = {
-            TransparentProxy: {}
+            TransparentProxy: {},
+            Beacon: {}
         };
         this._config.TransparentProxy.Proxy = opts?.Proxy;
         this._config.TransparentProxy.ProxyAdmin = opts?.ProxyAdmin;
-        this._config.Beacon = opts?.Beacon;
+        this._config.Beacon.Beacon = opts?.Beacon?.Beacon;
+        this._config.Beacon.BeaconProxy = opts?.Beacon?.BeaconProxy;
         this.store = new DeploymentsStorage(client, deployer, opts);
         this._proxyDeployment = new ProxyDeployment(this.store, this._config);
         if (opts?.fork) {

package/lib/esm/contracts/deploy/proxy/ProxyDeployment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ProxyDeployment.js","sourceRoot":"","sources":["../../../../../src/contracts/deploy/proxy/ProxyDeployment.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/deploy/proxy/ProxyDeployment.mjs CHANGED Viewed

@@ -114,7 +114,7 @@ export class ProxyDeployment {
         const deps = {
             TransparentUpgradeableProxy: `@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol`,
             ProxyAdmin: `@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol`,
-            Beacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
+            UpgradeableBeacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
             BeaconProxy: `@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol`,
         };
         const paths = {
@@ -131,7 +131,8 @@ export class ProxyDeployment {
                 source: `${baseSource}/beacon/UpgradeableBeacon.sol`,
                 output: `${baseOutput}/Beacon.sol`,
                 template: `
-                    import \"${deps.Beacon}\";
+                    import \"${deps.UpgradeableBeacon}\";
+                    import \"${deps.BeaconProxy}\";
                 `,
                 //install: `UpgradeableBeacon,BeaconProxy`,
                 contracts: [`UpgradeableBeacon`, `BeaconProxy`],
@@ -174,6 +175,11 @@ export class ProxyDeployment {
         let { client } = deployments;
         let { address: implAddress, initData } = ctx.implementation;
         let { Beacon, BeaconProxy, } = ctx.Beacon ?? this.opts.Beacon;
+        if (Beacon == null) {
+            let internal = await this.getOpenzeppelinUpgradable({ beacon: true, proxy: false });
+            BeaconProxy = internal.BeaconProxy;
+            Beacon = internal.UpgradeableBeacon;
+        }
         $require.notNull(Beacon, 'Beacon is required');
         $require.notNull(BeaconProxy, 'BeaconProxy is required');
         let ozVersion = this.getOzVersionByBeacon(Beacon);

package/lib/esm/evm/OpcodesWalker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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~~CAAC,QAAQ,CAAC,EAAE,CAAC,~~IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;~~oBAChF~~,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,~~CAAC,QAAQ,CAAC,~~EAAE,CAAC,~~EAAE,~~CAAC~~,CAAC~~;~~iBAC9D~~;gBACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;gBACtB,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;aACvB;SACJ;QACD,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE3C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AAjID,sCAiIC;AAED,IAAiB,QAAQ,CAkBxB;AAlBD,WAAiB,QAAQ;IACrB,SAAgB,MAAM,CAAE,MAAe,EAAE,IAAwB;QAC7D,IAAI,MAAM,IAAI,IAAI,EAAE;YAChB,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAChC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IATe,eAAM,SASrB,CAAA;IAED,MAAM,KAAK,GAAG;QACV,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,WAAW;QACnB,UAAU,EAAE,aAAa;QACzB,QAAQ,EAAE,WAAW;KACxB,CAAC;AACN,CAAC,EAlBgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAkBxB"}
1	+ {"version":3,"file":"OpcodesWalker.js","sourceRoot":"","sources":["../../../src/evm/OpcodesWalker.ts"],"names":[],"mappings":"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"}

package/lib/esm/evm/OpcodesWalker.mjs CHANGED Viewed

@@ -100,8 +100,8 @@ export class OpcodesWalker {
             if (typeof dest === 'number') {
                 let opcode = this.opcodes.find(x => x.pc === dest);
                 if (opcode == null) {
-                    console.log(this.opcodes.map(x => `${x.pc.toString(16)} ${x.name}`).join('\n'));
-                    throw new Error(`No OPCODE found at ${dest.toString(16)}`);
+                    console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
+                    throw new Error(`No OPCODE found at ${dest}`);
                 }
                 this.current = opcode;
                 this.evm.pc = this.current.pc;

package/lib/esm/evm/utils/$bytecode.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":";;;AAEA,gDAA6C;AAC7C,uDAAoD;AACpD,qDAAkD;AAClD,+CAA4C;AAE5C,IAAiB,SAAS,~~CAoEzB~~;~~AApED~~,WAAiB,SAAS;IAEtB;;OAEG;IACH,SAAgB,mBAAmB,CAAE,IAAc;QAC/C,IAAI,~~QAAQ~~,GAAG,~~IAAI~~,CAAC,~~OAAO~~,CAAC,~~UAAU~~,~~EAAE~~,CAAC,CAAC~~,CAAC~~;~~QAC3C~~,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE;~~YACf~~,IAAI,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;~~SAC1C~~;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;~~IANe~~,6BAAmB,~~sBAMlC~~,CAAA;IAED,SAAgB,eAAe,CAAE,IAAc;QAC3C,IAAI,SAAS,GAAG,WAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,kBAAkB,GAAG,SAAS,GAAG,CAAC,CAAC;QACvC,IAAI,YAAY,GAAG,WAAI,CAAC,SAAS,CAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,WAAW,GAAG,WAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,kBAAkB,GAAG,YAAY,CAAC,CAAC;QAC5E,IAAI,WAAW,GAAG,WAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,GAAG,YAAY,EAAE,YAAY,CAAC,CAAC;QACvF,OAAO;YACH,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,WAAW;SACxB,CAAC;IACN,CAAC;IAVe,yBAAe,kBAU9B,CAAA;IAED,SAAgB,qBAAqB,CAAC,KAAe;QAEjD,IAAI,GAAG,GAAG,IAAI,yBAAW,CAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,IAAI,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QAE/B;;;WAGG;QAEH,oDAAoD;QACpD,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE;YAC/B,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;YACrD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI;~~SACxD~~,EAAE,CAAC,CAAC,CAAC;QAEN,IAAI,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAChE,IAAI,WAAW,KAAK,CAAC,CAAC,IAAI,WAAW,GAAG,WAAW,EAAE;YACjD,mEAAmE;YACnE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;SAC7B;QAED,IAAI,IAAI,GAAG,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;QACpC,mBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,yBAAyB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,IAAI,aAAa,GAAG,iBAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzD,OAAO;YACH,SAAS,EAAE,CAAC,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAa;SACpF,CAAC;IACN,CAAC;~~IA7Be~~,+BAAqB,~~wBA6BpC~~,CAAA;IAED,SAAS,OAAO,CAAC,OAAkB,EAAE,~~QAAkD~~,EAAE,WAAmB,CAAC;~~QACzG~~,KAAK,EAAE,KAAK,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;~~gBACtC~~,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,~~CAAC~~,CAAC,CAAC;~~gBACxB~~,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,~~CAAC~~,CAAC,KAAK,KAAK,EAAE;~~oBAClC~~,SAAS,KAAK,CAAC;iBAClB;~~aACJ~~;YACD,OAAO,CAAC,CAAC;SACZ;QACD,OAAO,CAAC,CAAC,CAAC;IACd,CAAC;AACL,CAAC,~~EApEgB~~,SAAS,GAAT,iBAAS,KAAT,iBAAS,~~QAoEzB~~"}
1	+ {"version":3,"file":"$bytecode.js","sourceRoot":"","sources":["../../../../src/evm/utils/$bytecode.ts"],"names":[],"mappings":"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"}

package/lib/esm/evm/utils/$bytecode.mjs CHANGED Viewed

@@ -8,9 +8,11 @@ export var $bytecode;
      * remove the constructor code, leave the runtime bytecode only
      */
     function trimConstructorCode(code) {
-        let initCode = code.indexOf('60806040', 4);
-        if (initCode > -1) {
-            code = `0x${code.substring(initCode)}`;
+        let rgx = /6080(\d\d)?6040/g;
+        rgx.lastIndex = 4;
+        let initCode = rgx.exec(code);
+        if (initCode != null) {
+            code = `0x${code.substring(initCode.index)}`;
         }
         return code;
     }
@@ -36,8 +38,9 @@ export var $bytecode;
          */
         // match 60806040 the beginning of the contract code
         let ctorCodeIdx = indexOf(opcodes, [
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x40,
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
+            { match: (op) => op.opcode === 0x80, optional: true },
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
         ], 2);
         let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
         if (codeSizeIdx === -1 || codeSizeIdx > ctorCodeIdx) {
@@ -45,6 +48,9 @@ export var $bytecode;
             return { arguments: null };
         }
         let prev = opcodes[codeSizeIdx - 1];
+        if (/PUSH/.test(prev.name) === false) {
+            prev = opcodes[codeSizeIdx - 2];
+        }
         $require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
         let codeSizeValue = $buffer.toBigInt(prev.pushData) * 2n;
         return {
@@ -54,11 +60,16 @@ export var $bytecode;
     $bytecode.parseContractCreation = parseContractCreation;
     function indexOf(opcodes, matchers, startIdx = 0) {
         outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
-            for (let j = 0; j < matchers.length; j++) {
-                let op = opcodes[i + j];
-                if (matchers[j](op, i + j) === false) {
+            let cursor = 0;
+            inner: for (let j = 0; j < matchers.length; j++) {
+                let op = opcodes[i + cursor];
+                if (matchers[j].match(op, i + cursor) === false) {
+                    if (matchers[j].optional) {
+                        continue inner;
+                    }
                     continue outer;
                 }
+                cursor++;
             }
             return i;
         }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "dequanto",
-    "version": "0.1.68",
+    "version": "0.1.71",
     "author": {
         "name": "Alex Kit",
         "email": "alex.kit@atmajs.com"

package/src/contracts/deploy/Deployments.ts CHANGED Viewed

@@ -62,7 +62,8 @@ export class Deployments {
             BeaconProxy?: Constructor<IBeaconProxy>
         }
     } = {
-            TransparentProxy: {}
+            TransparentProxy: {},
+            Beacon: {}
         }
     constructor(public client: Web3Client, public deployer: IAccount, public opts: {
@@ -84,7 +85,8 @@ export class Deployments {
     } = {}) {
         this._config.TransparentProxy.Proxy = opts?.Proxy;
         this._config.TransparentProxy.ProxyAdmin = opts?.ProxyAdmin;
-        this._config.Beacon = opts?.Beacon;
+        this._config.Beacon.Beacon = opts?.Beacon?.Beacon;
+        this._config.Beacon.BeaconProxy = opts?.Beacon?.BeaconProxy;
         this.store = new DeploymentsStorage(client, deployer, opts);
         this._proxyDeployment = new ProxyDeployment(this.store, this._config);

package/src/contracts/deploy/proxy/ProxyDeployment.ts CHANGED Viewed

@@ -233,7 +233,7 @@ export class ProxyDeployment {
         const deps = {
             TransparentUpgradeableProxy: `@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol`,
             ProxyAdmin: `@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol`,
-            Beacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
+            UpgradeableBeacon: `@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol`,
             BeaconProxy: `@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol`,
         };
         const paths = {
@@ -250,7 +250,8 @@ export class ProxyDeployment {
                 source: `${baseSource}/beacon/UpgradeableBeacon.sol`,
                 output: `${baseOutput}/Beacon.sol`,
                 template: `
-                    import \"${deps.Beacon}\";
+                    import \"${deps.UpgradeableBeacon}\";
+                    import \"${deps.BeaconProxy}\";
                 `,
                 //install: `UpgradeableBeacon,BeaconProxy`,
                 contracts: [`UpgradeableBeacon`,`BeaconProxy`],
@@ -316,6 +317,13 @@ export class ProxyDeployment {
             Beacon,
             BeaconProxy,
         } = ctx.Beacon ?? this.opts.Beacon;
+        if (Beacon == null) {
+            let internal = await this.getOpenzeppelinUpgradable({ beacon: true, proxy: false });
+            BeaconProxy = internal.BeaconProxy as Constructor<IBeaconProxy>;
+            Beacon = internal.UpgradeableBeacon as Constructor<IBeacon>;
+        }
         $require.notNull(Beacon, 'Beacon is required');
         $require.notNull(BeaconProxy, 'BeaconProxy is required');

package/src/evm/OpcodesWalker.ts CHANGED Viewed

@@ -119,8 +119,8 @@ export class OpcodesWalker {
             if (typeof dest === 'number') {
                 let opcode = this.opcodes.find(x => x.pc === dest);
                 if (opcode == null) {
-                    console.log(this.opcodes.map(x => `${x.pc.toString(16)} ${x.name}`).join('\n'));
-                    throw new Error(`No OPCODE found at ${dest.toString(16)}`);
+                    console.log(this.opcodes.map(x => `${x.pc} ${x.name}`).join('\n'));
+                    throw new Error(`No OPCODE found at ${dest}`);
                 }
                 this.current = opcode;
                 this.evm.pc = this.current.pc;

package/src/evm/utils/$bytecode.ts CHANGED Viewed

@@ -11,9 +11,11 @@ export namespace $bytecode {
      * remove the constructor code, leave the runtime bytecode only
      */
     export function trimConstructorCode (code: TEth.Hex) {
-        let initCode = code.indexOf('60806040', 4);
-        if (initCode > -1) {
-            code = `0x${code.substring(initCode)}`;
+        let rgx = /6080(\d\d)?6040/g;
+        rgx.lastIndex = 4;
+        let initCode = rgx.exec(code);
+        if (initCode != null) {
+            code = `0x${code.substring(initCode.index)}`;
         }
         return code;
     }
@@ -42,8 +44,9 @@ export namespace $bytecode {
         // match 60806040 the beginning of the contract code
         let ctorCodeIdx = indexOf(opcodes, [
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x80,
-            (op) => op.opcode === 0x60 && op.pushData[0] === 0x40,
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x80 },
+            { match: (op) => op.opcode === 0x80, optional: true },
+            { match: (op) => op.opcode === 0x60 && op.pushData[0] === 0x40 },
         ], 2);
         let codeSizeIdx = opcodes.findIndex(x => x.name === 'CODESIZE');
@@ -53,6 +56,9 @@ export namespace $bytecode {
         }
         let prev = opcodes[codeSizeIdx - 1];
+        if (/PUSH/.test(prev.name) === false) {
+            prev = opcodes[codeSizeIdx - 2];
+        }
         $require.True(/PUSH/.test(prev.name), `PUSH expected but got ${prev.name}`);
         let codeSizeValue = $buffer.toBigInt(prev.pushData) * 2n;
@@ -61,13 +67,21 @@ export namespace $bytecode {
         };
     }
-    function indexOf(opcodes: IOpcode[], matchers: ((op: IOpcode, i?: number) => boolean)[], startIdx: number = 0) {
+    function indexOf(opcodes: IOpcode[], matchers: {
+        match: ((op: IOpcode, i?: number) => boolean),
+        optional?: boolean
+    }[], startIdx: number = 0) {
         outer: for (let i = startIdx; i < opcodes.length - matchers.length; i++) {
-            for (let j = 0; j < matchers.length; j++) {
-                let op = opcodes[i + j];
-                if (matchers[j](op, i + j) === false) {
+            let cursor = 0;
+            inner: for (let j = 0; j < matchers.length; j++) {
+                let op = opcodes[i + cursor];
+                if (matchers[j].match(op, i + cursor) === false) {
+                    if (matchers[j].optional) {
+                        continue inner;
+                    }
                     continue outer;
                 }
+                cursor++;
             }
             return i;
         }