@paulstinchcombe/gasless-nft-tx 0.0.32 → 0.0.34
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleAccountDeployer.d.ts","sourceRoot":"","sources":["../src/SimpleAccountDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAuE,MAAM,MAAM,CAAC;AAEzG,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ1C;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"SimpleAccountDeployer.d.ts","sourceRoot":"","sources":["../src/SimpleAccountDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,GAAG,EAAuE,MAAM,MAAM,CAAC;AAEzG,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQ1C;;;;;;GAMG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAuDxI;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACxC,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,OAAO,EACvB,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,EACZ,kBAAkB,EAAE,GAAG,GACrB,OAAO,CAAC,OAAO,CAAC,CA2FlB;AAED;;;;;;GAMG;AACH,wBAAgB,kCAAkC,CAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjH;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAOhH"}
|
|
@@ -42,6 +42,18 @@ async function deploySimpleAccountFactory(client, deployerPrivateKey, entryPoint
|
|
|
42
42
|
}
|
|
43
43
|
console.log('SimpleAccountFactory deployed successfully!');
|
|
44
44
|
console.log('Factory Address:', factoryAddress);
|
|
45
|
+
// Wait a moment for bytecode to be available
|
|
46
|
+
await new Promise((resolve) => setTimeout(resolve, 2000));
|
|
47
|
+
// Verify the factory has code
|
|
48
|
+
const factoryCode = await client.publicClient.getBytecode({ address: factoryAddress });
|
|
49
|
+
if (!factoryCode || factoryCode === '0x') {
|
|
50
|
+
console.warn(`⚠️ Warning: Factory at ${factoryAddress} has no bytecode yet`);
|
|
51
|
+
console.warn(`This might indicate deployment failure or timing issue`);
|
|
52
|
+
// Don't throw - let's try to continue anyway
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
console.log(`✓ Factory verified with ${factoryCode.length} bytes of bytecode`);
|
|
56
|
+
}
|
|
45
57
|
return factoryAddress;
|
|
46
58
|
}
|
|
47
59
|
catch (error) {
|
|
@@ -65,12 +77,27 @@ async function createSimpleAccount(client, factoryAddress, owner, salt, deployer
|
|
|
65
77
|
console.log(`Salt: ${salt}`);
|
|
66
78
|
// First, get the expected address from the factory
|
|
67
79
|
console.log('Getting expected account address from factory...');
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
80
|
+
// First verify factory is deployed
|
|
81
|
+
const factoryCode = await client.publicClient.getBytecode({ address: factoryAddress });
|
|
82
|
+
if (!factoryCode || factoryCode === '0x') {
|
|
83
|
+
throw new Error(`Factory at ${factoryAddress} has no code - deployment may have failed`);
|
|
84
|
+
}
|
|
85
|
+
// Try to get the address from factory
|
|
86
|
+
let accountAddress;
|
|
87
|
+
try {
|
|
88
|
+
accountAddress = (await client.publicClient.readContract({
|
|
89
|
+
address: factoryAddress,
|
|
90
|
+
abi: SimpleAccount_1.SIMPLE_ACCOUNT_FACTORY_ABI,
|
|
91
|
+
functionName: 'getAddress',
|
|
92
|
+
args: [owner, salt],
|
|
93
|
+
}));
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
// If getAddress fails, compute it ourselves using CREATE2
|
|
97
|
+
console.log('⚠️ Factory getAddress failed, computing address using CREATE2...');
|
|
98
|
+
accountAddress = (0, SimpleAccount_1.getSimpleAccountAddress)(owner, salt, factoryAddress);
|
|
99
|
+
console.log(`Computed address: ${accountAddress}`);
|
|
100
|
+
}
|
|
74
101
|
console.log(`Expected account address: ${accountAddress}`);
|
|
75
102
|
// Check if already deployed
|
|
76
103
|
const existingCode = await client.publicClient.getBytecode({ address: accountAddress });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleAccountDeployer.js","sourceRoot":"","sources":["../src/SimpleAccountDeployer.ts"],"names":[],"mappings":";;AAiBA,
|
|
1
|
+
{"version":3,"file":"SimpleAccountDeployer.js","sourceRoot":"","sources":["../src/SimpleAccountDeployer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED